From 89abbb19f56f80585c8b48c477b238ce0a12bf9b Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 20:41:49 +0100
Subject: [PATCH 01/18] trying to fix docs

---
 docs/requirements.txt                           | 4 ++--
 python/examples/experiments/autoregressive-cats | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 4ca71000e..1e681cee1 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
-sphinx==3.1.0
+sphinx==4.0.2
 recommonmark==0.6.0
-sphinx_rtd_theme==0.4.3
+sphinx_rtd_theme==0.5.2
 sphinxcontrib-images==0.9.2
 sphinx-copybutton==0.3.1
\ No newline at end of file
diff --git a/python/examples/experiments/autoregressive-cats b/python/examples/experiments/autoregressive-cats
index d2143f8f8..6a04d167e 160000
--- a/python/examples/experiments/autoregressive-cats
+++ b/python/examples/experiments/autoregressive-cats
@@ -1 +1 @@
-Subproject commit d2143f8f844fe30f60dc458b5d7286e36db0d54f
+Subproject commit 6a04d167ed47587e972520628c2c6fd0d876fce0

From 72a4965393bd48674bf4b7c4153b7b42c494224d Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 20:45:36 +0100
Subject: [PATCH 02/18] fixing readthedocs name

---
 readthedocs.yml => .readthedocs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename readthedocs.yml => .readthedocs.yaml (97%)

diff --git a/readthedocs.yml b/.readthedocs.yaml
similarity index 97%
rename from readthedocs.yml
rename to .readthedocs.yaml
index 21a38194e..1608c0e2a 100644
--- a/readthedocs.yml
+++ b/.readthedocs.yaml
@@ -19,6 +19,6 @@ formats:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
+  version: 3.8
   install:
     - requirements: docs/requirements.txt
\ No newline at end of file

From 6ce82ec3dd47b90540cc8c7d1f4733a24c0c47a2 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 20:50:24 +0100
Subject: [PATCH 03/18] more fixing

---
 .readthedocs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 1608c0e2a..060ad8bd4 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -11,7 +11,7 @@ sphinx:
 
 # Build documentation with MkDocs
 #mkdocs:
-#  configuration: mkdocs.yml
+#  configuration: mkdocs.yml 
 
 # Optionally build your docs in additional formats such as PDF
 formats:

From 3de270cae4708353f1725d6d3e88e85b8fde86ab Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 20:59:18 +0100
Subject: [PATCH 04/18] fixing copy button

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 1e681cee1..4ef3f775b 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
 sphinx==4.0.2
 recommonmark==0.6.0
 sphinx_rtd_theme==0.5.2
-sphinxcontrib-images==0.9.2
+sphinxcontrib-images==0.9.3
 sphinx-copybutton==0.3.1
\ No newline at end of file

From 21e8c2786ca75b3224852c524a5e44cf9150f9d6 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 21:12:10 +0100
Subject: [PATCH 05/18] trying to fix static docs

---
 docs/conf.py                                                 | 2 +-
 docs/getting-started/procedural content generation/index.rst | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 06239da28..a3a2535d5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -63,7 +63,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = '_static'
 
 master_doc = 'index'
 
diff --git a/docs/getting-started/procedural content generation/index.rst b/docs/getting-started/procedural content generation/index.rst
index f4669e043..006d8e962 100644
--- a/docs/getting-started/procedural content generation/index.rst	
+++ b/docs/getting-started/procedural content generation/index.rst	
@@ -41,14 +41,15 @@ This is a basic example and generating levels for this environment might not be
 Clusters Level Generator
 ************************
 
-A much more complicated example would be to use the `Clusters<doc_clusters>` game and generate new levels. The aim of the Clusters game is for the agent to push coloured blocks together to form "clusters", whilst avoiding spikes.
+A much more complicated example would be to use the :ref:`Clusters <doc_clusters>` game and generate new levels. The aim of the Clusters game is for the agent to push coloured blocks together to form "clusters", whilst avoiding spikes.
 The game is fully deterministic and there are only 5 levels supplied in the original GDY file. This makes it a perfect candidate for building new levels and testing if Reinforcement Learning can still solve these levels!
 
 
 Level Generator Class
 =====================
 
-Here's an example of a level generator for the cluster's game. 
+Here's an example of a level generator for the cluster's game. Levels are generated with simple configurable heuristics such as maximum number of each coloured boxes and maximum numbers of spikes. 
+The boxes and spikes are randomly placed in the grid to create the initial game layout. The agent is also added to the grid in a random position.
 
 The ``LevelGenerator`` class can be used as a base class. Only the ``generate`` function needs to be implemented.
 

From 9312c57c87bcde6a452931e5f00779e762923f90 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 21:23:38 +0100
Subject: [PATCH 06/18] fixing video in docs

---
 docs/getting-started/action spaces/index.rst | 2 +-
 docs/rllib/rts/index.rst                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started/action spaces/index.rst b/docs/getting-started/action spaces/index.rst
index 6353a4dce..84bb9af84 100644
--- a/docs/getting-started/action spaces/index.rst	
+++ b/docs/getting-started/action spaces/index.rst	
@@ -94,7 +94,7 @@ In order to easily support games with large action spaces such as RTS games, sev
 
   If ``mask_type == 'full'`` then a mask of dimensions (grid_height, grid_width) is returned. This mask can be used in the case where a one-hot representation of the entire grid is used for location selection. 
 
-  If ``mask_type == 'reduced'`` then two masks are returned. One for ``grid_height`` and one for ``grid_width``. This mask can be used when two seperate one-hot representations are used for ``x`` and ``y`` selection.
+  If ``mask_type == 'reduced'`` then two masks are returned. One for ``grid_height`` and one for ``grid_width``. This mask can be used when two separate one-hot representations are used for ``x`` and ``y`` selection.
 
 .. warning:: player_id=0 is reserved for NPCs and internal actions
 
diff --git a/docs/rllib/rts/index.rst b/docs/rllib/rts/index.rst
index 9abd34afb..1a909c371 100644
--- a/docs/rllib/rts/index.rst
+++ b/docs/rllib/rts/index.rst
@@ -26,7 +26,7 @@ Full Example
     <div class="figure align-center" id="vid1">
         <video onloadeddata="this.play();" playsinline loop muted width="50%">
 
-            <source src="/_static/video/griddly_rts.mp4"
+            <source src="_static/video/griddly_rts.mp4"
                     type="video/mp4">
 
             Sorry, your browser doesn't support embedded videos.

From 453785ae518f5846dbb83b9a10f46818dc2000d9 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 22:09:04 +0100
Subject: [PATCH 07/18] trying to fix video again

---
 docs/rllib/rts/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/rllib/rts/index.rst b/docs/rllib/rts/index.rst
index 1a909c371..7c513205a 100644
--- a/docs/rllib/rts/index.rst
+++ b/docs/rllib/rts/index.rst
@@ -26,7 +26,7 @@ Full Example
     <div class="figure align-center" id="vid1">
         <video onloadeddata="this.play();" playsinline loop muted width="50%">
 
-            <source src="_static/video/griddly_rts.mp4"
+            <source src="../../_static/video/griddly_rts.mp4"
                     type="video/mp4">
 
             Sorry, your browser doesn't support embedded videos.

From 4e110c87eea5efce1e5f19c84bd9af9deb313c85 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 4 Jun 2021 22:16:40 +0100
Subject: [PATCH 08/18] html_static_path should be a list

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index a3a2535d5..06239da28 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -63,7 +63,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = '_static'
+html_static_path = ['_static']
 
 master_doc = 'index'
 

From d8b007ca63c456739dca29dadbd63fdac245064b Mon Sep 17 00:00:00 2001
From: DavidSlayback <68602513+DavidSlayback@users.noreply.github.com>
Date: Tue, 15 Jun 2021 13:18:28 -0400
Subject: [PATCH 09/18] Update setup.py

Bug: pyyaml dependency string was not valid, updated from ">-5.3.1" to ">=5.3.1".

Was causing issues on exporting a conda environment I was using
---
 python/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/setup.py b/python/setup.py
index 196653b60..907305c37 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -82,7 +82,7 @@ def griddly_package_data(config='Debug'):
     install_requires=[
         "numpy>=1.20.3",
         "gym>=0.17.3",
-        "pyyaml>-5.3.1",
+        "pyyaml>=5.3.1",
         "imageio>=2.9.0"
     ],
     cmdclass={

From f2fba23d273cd4a9836b93b29e699d70c76b6dff Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Tue, 22 Jun 2021 15:25:41 +0100
Subject: [PATCH 10/18] some small docs updates

---
 python/examples/experiments/autoregressive-cats | 2 +-
 python/examples/experiments/rts-self-play       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/examples/experiments/autoregressive-cats b/python/examples/experiments/autoregressive-cats
index 6a04d167e..3082d3c00 160000
--- a/python/examples/experiments/autoregressive-cats
+++ b/python/examples/experiments/autoregressive-cats
@@ -1 +1 @@
-Subproject commit 6a04d167ed47587e972520628c2c6fd0d876fce0
+Subproject commit 3082d3c00764ee59bf5d248054f10b56122d1450
diff --git a/python/examples/experiments/rts-self-play b/python/examples/experiments/rts-self-play
index c057f0233..44a548664 160000
--- a/python/examples/experiments/rts-self-play
+++ b/python/examples/experiments/rts-self-play
@@ -1 +1 @@
-Subproject commit c057f0233241feaddb58f4f1a29dd6b42202b418
+Subproject commit 44a548664c53a6e31771c0d59f65b01597307619

From fa2c17029dbacdf756461f99d90d9dc6116ea034 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Wed, 23 Jun 2021 17:55:11 +0100
Subject: [PATCH 11/18] starting to make this work

---
 python/griddly/GymWrapper.py                  | 12 ++-
 .../util/environment_generator_generator.py   | 87 +++++++++++++++++++
 2 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 python/griddly/util/environment_generator_generator.py

diff --git a/python/griddly/GymWrapper.py b/python/griddly/GymWrapper.py
index 314597dd1..30d7f6a9d 100644
--- a/python/griddly/GymWrapper.py
+++ b/python/griddly/GymWrapper.py
@@ -11,7 +11,7 @@
 class GymWrapper(gym.Env):
     metadata = {'render.modes': ['human', 'rgb_array']}
 
-    def __init__(self, yaml_file=None, level=0, global_observer_type=gd.ObserverType.VECTOR,
+    def __init__(self, yaml_file=None, yaml_string=None, level=0, global_observer_type=gd.ObserverType.VECTOR,
                  player_observer_type=gd.ObserverType.VECTOR, max_steps=None, gdy_path=None, image_path=None,
                  shader_path=None,
                  gdy=None, game=None, **kwargs):
@@ -29,10 +29,14 @@ def __init__(self, yaml_file=None, level=0, global_observer_type=gd.ObserverType
         self._renderWindow = {}
 
         # If we are loading a yaml file
-        if yaml_file is not None:
+        if yaml_file is not None or yaml_string is not None:
             self._is_clone = False
             loader = GriddlyLoader(gdy_path, image_path, shader_path)
-            self.gdy = loader.load(yaml_file)
+            if yaml_file is not None:
+                self.gdy = loader.load(yaml_file)
+            else:
+                self.gdy = loader.load_string(yaml_string)
+
             self.game = self.gdy.create_game(global_observer_type)
 
             if max_steps is not None:
@@ -314,3 +318,5 @@ def build_gym_from_yaml(self, environment_name, yaml_file, global_observer_type=
                 'player_observer_type': player_observer_type
             }
         )
+
+
diff --git a/python/griddly/util/environment_generator_generator.py b/python/griddly/util/environment_generator_generator.py
new file mode 100644
index 000000000..9d5d4315a
--- /dev/null
+++ b/python/griddly/util/environment_generator_generator.py
@@ -0,0 +1,87 @@
+import os
+import yaml
+
+from griddly import GymWrapper
+
+
+class EnvironmentGeneratorGenerator():
+
+    def __init__(self, gdy_path=None, yaml_file=None):
+        module_path = os.path.dirname(os.path.realpath(__file__))
+        self._gdy_path = os.path.join(module_path, 'resources', 'games') if gdy_path is None else gdy_path
+        self._input_yaml_file = self._get_full_path(yaml_file)
+
+    def _get_full_path(self, gdy_path):
+        # Assume the file is relative first and if not, try to find it in the pre-defined games
+        fullpath = gdy_path if os.path.exists(gdy_path) else os.path.join(self._gdy_path, gdy_path)
+        # (for debugging only) look in parent directory resources because we might not have built the latest version
+        fullpath = fullpath if os.path.exists(fullpath) else os.path.realpath(
+            os.path.join(self._gdy_path + '../../../../resources/games', gdy_path))
+        return fullpath
+
+    def generate_env_yaml(self):
+
+        level_generator_gdy = {}
+        with open(self._input_yaml_file, 'r') as fs:
+            self._gdy = yaml.load(fs, Loader=yaml.FullLoader)
+
+        objects = self._gdy['Objects']
+        environment = self._gdy['Environment']
+
+        # Create the placement actions
+        actions = []
+        for obj in objects:
+            object_name = obj["Name"]
+            place_action = {
+                'InputMapping': {
+                    'Inputs': {
+                        '1': {'Description': f'Places objects of type \"{object_name}\"'}
+                    }
+                },
+                'Name': f'place_{object_name.lower()}',
+                'Behaviours': [{
+                    'Src': {
+                        'Object': '_empty',
+                        'Commands': [
+                            {'spawn': object_name}
+                        ]
+                    },
+                    'Dst': {
+                        'Object': '_empty'
+                    }
+                }]
+
+            }
+            actions.append(place_action)
+
+        level_generator_gdy['Actions'] = actions
+
+        # Copy the Objects
+        level_generator_gdy['Objects'] = objects
+
+        # Create the environment template
+        level_generator_gdy['Environment'] = {
+            'Name': f'{environment["Name"]} Generator',
+            'Description': f'Level Generator environment for {environment["Name"]}',
+            'Observers': {k: v for k,v in environment['Observers'].items() if k in ['Sprite2D', 'Isometric']}
+        }
+
+        return yaml.dump(level_generator_gdy)
+
+    def generate_env(self, **env_kwargs):
+        env_yaml = self.generate_env_yaml()
+
+        env_args = {
+            **env_kwargs,
+            'yaml_string': env_yaml,
+        }
+
+        return GymWrapper(*env_args)
+
+
+if __name__ == '__main__':
+    yaml_file = 'Single-Player/GVGAI/spider-nest.yaml'
+
+    egg = EnvironmentGeneratorGenerator(yaml_file=yaml_file)
+
+    print(egg.generate_env_yaml())

From dcaab7ebab929be9a0d253df9f58d9e7b4539408 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 25 Jun 2021 22:48:55 +0100
Subject: [PATCH 12/18] adding in the bits required for EGG

---
 .../griddlyrts/griddly_rts_global.png         | Bin 4058 -> 2747 bytes
 python/examples/griddlyrts/griddly_rts_p1.png | Bin 219 -> 393 bytes
 python/examples/griddlyrts/griddly_rts_p2.png | Bin 223 -> 393 bytes
 python/griddly/GymWrapper.py                  |  14 ++++
 .../util/environment_generator_generator.py   |  78 ++++++++++++++----
 python/tests/egg_test.py                      |  51 ++++++++++++
 6 files changed, 129 insertions(+), 14 deletions(-)
 create mode 100644 python/tests/egg_test.py

diff --git a/python/examples/griddlyrts/griddly_rts_global.png b/python/examples/griddlyrts/griddly_rts_global.png
index aa190b14cd6102db8c84ac5dd56cc847ccee451b..2bafc42fab104cfae366f76991b3970b5383eea3 100644
GIT binary patch
literal 2747
zcmY*bdpy)xA3kFkwrEgtjmfg@esUQ#t&|wzMdh-t<&vpHB-hj!mWgdm$*tD?(o~k$
z-MVWUBWx<<UZG|R4aVIJgE2GjkIlZjzkkm8opZk5^PK1NeV)(vj-8E#)DEQ`001c~
zOEY@_V9*o>Bt)R0U)op?fE_VbW+smK;n`g4E6Njle@!w)2apD=M^cs0*L#U$X#xq2
zLdR@>cTryz5o)%n)QjRV*{9PhI+QD?<@7blxAouI{Z^pamaUa#uXRcO)J0{}N6Gh<
zUMEnBE|;H?@AHU!i#JqCut>vX^@gjS$uMBQR(#B6@e;4w>^XjXy%=2il22;0l`?po
zD&(KcY4~;Zo6zg)9ADn;)uKn9X)k7F;>e-Yv4EZ@^YKv(K%r1pI_|vEmO1C)QLDbo
zByQb%b4Ostu5BBCyMheNxD;Vi|JdUM7Ju|}N>^0K)6J<=Pfi!z;A6Qe>fXGFBC|>0
zrlBJrb)>LWH;Tq>cbaA;{jSew+NkEI%(7sn*N82h)dgwS7M5D5cf+be4^H8|C<LON
za<kX9iy_neox!1gyY|jGxn2(aYk8a#<Nq;y-Xk>2?b&Q@7nGyLP1MaG7y2{K9vOuH
za#JiLBSTuI=v2TWbB$GVhD6fR)~+Q)LgDCgkeHNcJ{}o19L3`Q#Ma~N+I*1FjT;=N
ztjDC1g!U_Oh&n8|8;?sf9rYXQgp*y$d{hC|?*toQWj?59^T#o4fIf=AsRB&XPA_P1
zR3?T4yKCTrD)>zqn;{Om%qvs-JK@AWIcTG&K?IE?o-fP`2cyMMK5zu9+gP`Ty1_PP
zHW=}BT@pMNZg(ZW`%$fCz1H)S+hiJyK;@j>5WJ#!1YR6pC>rDDD7)1?3@A-<Q%VaN
z-S@)Q^~f!1Y|S~Abj|O=jSkzc=YM|Cbb+6Zxtj2DU^pvv{Y$PK<>=u$Ep>;hV=H0g
zLT*wNahZph^o_1NF;Ang%T9*t-JHVq)J*6NJ+#W#R{rg#^PxL6+}SX$pch%$G;xF&
zJ2h*(FQw30Y5EJ}wcy?Pa1Yhj`;qsw151-UM<TI$;E_&@xtG_tX6VA|Vjw++(Eoc<
zM_}$NCN2DILzTXZ+Wm~SybnTFb*HUisI($ng+LYJRxGXcQnOs$M$W2r-_t%&9WK*Y
z#qE8-(|_Y-TzdLMW>>nbn8ObC5>f`;tald|-xu_Gi9VQRdFXgQ$$i2%*0LOQ$yK(i
z<EVoUArZ<065|UarC?SzL8#E7L0#L8Dn{U+^3(YiW^>L5Z<ffpEDj92>ZKmjuk-Kb
zB`hz7Ug{{Y{PZf8bnVu8yuiR>JlAK`P@McHU^+2ckzJRu>^h%IKfBu(@s$Aipd0x-
z*T+pUQ0P1TdDnrS`NXD!1g<lQ$=pAmlto=ml#eo=nVTcbEOlw})O-4Q7RJr%C??GC
zY1Y2gncD$-;VMa3@r#r5ap=9zVcZM-3|m9PMd-jUf+)^~K}xhS@v0Lmn2=9zVFleV
zi!^%X#*J0wKdLv0xO+94)(ZCyUhvd`UoS&Q$gcDDJBt1xa`xerx9pVHkDgaK+;$D`
zb>87S7(O3eiKui?(jg68wYT;5@v|>EO~tr>@+HC;BE1Y`DR`4#NK@ORNEAfj#6XW9
zs1OKR%W{E<GHO-ezs~E8Gg14%g{w4n=oZ*xd}WYFRo#z6X{Ak9V<hdY)tE5SZlvu8
zszl;LrI7zp<0Uzh-xlB0jdAOJZ8h0z;n*#HfvhA66aat&8~~Dl2m@#U5I_MB@6k;>
zUue_-ReqaOHyqf(!7n?Zd?ks8Aw|?eir^G44?wb#+>U7m+lh!KKLY;fWEd+`994eo
zjUlKM6Y1H(25nC5nc~<A*KR{V7$o=svIOG)LEE=Cqm+qJ!JK2uop5QFeUN<Li@>hj
z{wlz~1$_kAiNbOJguImrmn?;)9VO%vz9I$ww?IvcAqXA}X2N<(-u{JM349*|+j{4}
zu1CK_kUdqXHjrCvAq9|^xL!~tHn5Je!KBml7Is@Hu;=;qL$@(+GUoLcV}DzP8w!-6
zky!VzoGq%h%%~6n?&AItw0*r~6>L)8qQU_pW(z4%Tbk&c@s&J?sx9meaA1yxZrTpQ
zeSJM*2yo(`yesngij<u7U}HCyhR37_hE4f@{!b7B_k#w#9UmSw5S5kru?7SC&}~)n
z-TRLpYjrTE_la;OkM~wsTc0cPq@OdGiK`)bc^A%1W9R35gdQl$uv{ECv2Mc=pK7XB
zSI;yXmRVd|crzc@4MSZiO^-gv^Njcs7AM|0`spVPJJD9uLhxGI;h_zE<W83rChMf^
zgZB@3o<FCp{ZOfl6C;wX<l+n7cWLy!@^AVs<nsKJ1Khwi4d-;iq3mvrzJfiwK2cGU
zfS-?Xmo9pjpV#?jARpTFZIB+9suYVc(h(_8Xb7Nro#!QxTlPv|aQEpOif9F}-a0(s
zSbSEiJ8770beM83Pt95`o|&t@S<txT4x;tD+2ls0oK2D$p48TFpwd!XSWTg9IR5d{
z5J+lS)ES8O%Ot>1q@22{wO)6Dw^l%6;q+V}XGDxz2ZQQ?qGDV{V~jpv2&eN>zYXRo
zLKPuiOcSzojgO@3Fm)Q4G|l7}_xmV3hCbj=LzJrJM?7gAsxk@p`IF9?dC8lfi=1AS
zk`GPSdj5pYFs5RAekkYjm+WR#zwa(QT%Fxz-ojaVnE0|E7pMxy>M!;)j1Mi{H^6VK
z>T_ku`;!S`aO``%vg4UUT}zS2GP_Pcp$X5doa|?Kp4w9?h-z0~;KU9I=!OVlfW4BA
zJDuXX+sfNVDP_9M&s}JaMi47?Mf#$mqeI113^A=H+^I{^#t5Py=$=4OI1)V+Z8jcI
z8&dE3%~IWvhzSG#d2K=^<!0U;2ho%H9UxsGaO|bh7|&P{tNR<YrTLSSloIaTeElK1
zU`$vsJ<6xln_~2l;n4&4RH+uxv_>y&kxiH7%n5wsex3V7qcMchc!g$5sDKBzWbrRo
zg1;43Vd!!v7)YWKVZCiUjZ|7*exrQi0gj|_=T+IP8Xeufl4FzyG2>XxND@yRxCBT+
zD-jXRNqNo^Bt)pEP+K;ACoQZ0vpkK#8!HZ5Ztu$u^c1Wq5F|k_8O<&&x~%-{S<pN=
z@cM-F5*}JjxiH~;NUw2OaGRg_Q)p#SMPCkIu&e;onYYA-p0eo_CZ--waa!RGKpb!k
zlc5&n0FOU;4u(2)<_y%AIBM48*^yzc-<g@ErKKfqb{aoxEKij5d-SsTn-1a|hZwXI
zjrH3W^13Bth}a4jNad4|p`mz4r~%=4)9S@D#EH*uL4Al68<6)gVE~Cn0@jIUL-0Lx
jjx%WvWw3#4glMy7?3=<4ZVF@%1L(6dw=pX>#l`#&9Rwa`

literal 4058
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
I*Sj12KQJ=nnE(I)

diff --git a/python/examples/griddlyrts/griddly_rts_p1.png b/python/examples/griddlyrts/griddly_rts_p1.png
index 42f1cd370078fa1ac8d31fa5f9383b1f82fe9301..1e496fecf67fd8ff29f3006ea3b9c534f24508bd 100644
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I2}rW6{ZPfgz!>1^;uunK>+KCk-opkw4i_u5
zIu>d4DoS-JN%c;85mCXjCTr%ZklO!QPamnr3srBMKYMZJ2e~kYhz3>&lGwn&4M7G8
zjA99l*Jiqw+15?}9Bz2}M$Ua!pd2$$6pUooe^$@dT=s8O3|IqH{F?mhUneJVLlm*;
z9AJVWm<<sPj8Gep%mSK-UnMuhIbdUvRIX)!yZ1xytThQOO4E~OZQPl_h-9;Uq<ZN8
z(5>61U0x1!7D98^mga}Qm!JqS@gN7pYo%JoRScp^{f*CUfI-aQ>FVdQ&MBb@011kJ
A_y7O^

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901SGegx)utg7J0fjhE&{odu=1v0R<k{!1$N-
z*X{j}=iPK!_<WsHn={k0wtadm76lIuG%~aE$sjWX;M_jjyRY4rpDMEu11nIJu`v7Z
z^?TmLXQjtrVvWql`@M8!?w(zD1R>Op&DaBt&PcY*xy<c#jALs9qf!&lwG5uFelF{r
G5}E)&lTk1L

diff --git a/python/examples/griddlyrts/griddly_rts_p2.png b/python/examples/griddlyrts/griddly_rts_p2.png
index 0e252684c441139606dc17575f080b66191b441d..1e496fecf67fd8ff29f3006ea3b9c534f24508bd 100644
GIT binary patch
literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I2}rW6{ZPfgz!>1^;uunK>+KCk-opkw4i_u5
zIu>d4DoS-JN%c;85mCXjCTr%ZklO!QPamnr3srBMKYMZJ2e~kYhz3>&lGwn&4M7G8
zjA99l*Jiqw+15?}9Bz2}M$Ua!pd2$$6pUooe^$@dT=s8O3|IqH{F?mhUneJVLlm*;
z9AJVWm<<sPj8Gep%mSK-UnMuhIbdUvRIX)!yZ1xytThQOO4E~OZQPl_h-9;Uq<ZN8
z(5>61U0x1!7D98^mga}Qm!JqS@gN7pYo%JoRScp^{f*CUfI-aQ>FVdQ&MBb@011kJ
A_y7O^

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^Q6S901SGegx)utgmU+53hE&{od()fifC7)h!6jcF
ze0x%OGd676zh`q5c-UMvJEcoA$ygLTIMB$<&WFt4fOC)Are68|?}PT`mm74TD*N=e
z#+M&{E&Vq2M@NyB4mVWiWBXLwk~MjH`Aes<!nFe#htLg&SoaWO>FL=om3TImJHH49
Px|qS!)z4*}Q$iB}x>QmW

diff --git a/python/griddly/GymWrapper.py b/python/griddly/GymWrapper.py
index 30d7f6a9d..cdfdc23fc 100644
--- a/python/griddly/GymWrapper.py
+++ b/python/griddly/GymWrapper.py
@@ -319,4 +319,18 @@ def build_gym_from_yaml(self, environment_name, yaml_file, global_observer_type=
             }
         )
 
+    def build_gym_from_yaml_string(self, environment_name, yaml_string, global_observer_type=gd.ObserverType.SPRITE_2D,
+                            player_observer_type=gd.ObserverType.SPRITE_2D, level=None, max_steps=None):
+        register(
+            id=f'GDY-{environment_name}-v0',
+            entry_point='griddly:GymWrapper',
+            kwargs={
+                'yaml_string': yaml_string,
+                'level': level,
+                'max_steps': max_steps,
+                'global_observer_type': global_observer_type,
+                'player_observer_type': player_observer_type
+            }
+        )
+
 
diff --git a/python/griddly/util/environment_generator_generator.py b/python/griddly/util/environment_generator_generator.py
index 9d5d4315a..52209c59a 100644
--- a/python/griddly/util/environment_generator_generator.py
+++ b/python/griddly/util/environment_generator_generator.py
@@ -1,14 +1,20 @@
 import os
+
+import gym
+import numpy as np
 import yaml
 
-from griddly import GymWrapper
+from griddly import GymWrapper, gd, GymWrapperFactory
+from griddly.RenderTools import VideoRecorder
+from griddly.util.wrappers import ValidActionSpaceWrapper
 
 
 class EnvironmentGeneratorGenerator():
 
     def __init__(self, gdy_path=None, yaml_file=None):
         module_path = os.path.dirname(os.path.realpath(__file__))
-        self._gdy_path = os.path.join(module_path, 'resources', 'games') if gdy_path is None else gdy_path
+        self._gdy_path = os.path.realpath(
+            os.path.join(module_path, '../', 'resources', 'games')) if gdy_path is None else gdy_path
         self._input_yaml_file = self._get_full_path(yaml_file)
 
     def _get_full_path(self, gdy_path):
@@ -19,13 +25,12 @@ def _get_full_path(self, gdy_path):
             os.path.join(self._gdy_path + '../../../../resources/games', gdy_path))
         return fullpath
 
-    def generate_env_yaml(self):
-
+    def generate_env_yaml(self, level_shape):
         level_generator_gdy = {}
         with open(self._input_yaml_file, 'r') as fs:
             self._gdy = yaml.load(fs, Loader=yaml.FullLoader)
 
-        objects = self._gdy['Objects']
+        objects = [o for o in self._gdy['Objects'] if 'MapCharacter' in o]
         environment = self._gdy['Environment']
 
         # Create the placement actions
@@ -45,9 +50,6 @@ def generate_env_yaml(self):
                         'Commands': [
                             {'spawn': object_name}
                         ]
-                    },
-                    'Dst': {
-                        'Object': '_empty'
                     }
                 }]
 
@@ -57,19 +59,39 @@ def generate_env_yaml(self):
         level_generator_gdy['Actions'] = actions
 
         # Copy the Objects
-        level_generator_gdy['Objects'] = objects
+        level_generator_gdy['Objects'] = [{
+            'Name': o['Name'],
+            'MapCharacter': o['MapCharacter'],
+            'Observers': o['Observers']
+        } for o in objects]
+
+        # Generate a default empty level
+        empty_level = np.empty(level_shape, dtype='str')
+        empty_level[:] = '.'
+
+        level_0_string = '\n'.join(['   '.join(list(r)) for r in empty_level])
 
         # Create the environment template
         level_generator_gdy['Environment'] = {
             'Name': f'{environment["Name"]} Generator',
             'Description': f'Level Generator environment for {environment["Name"]}',
-            'Observers': {k: v for k,v in environment['Observers'].items() if k in ['Sprite2D', 'Isometric']}
+            'Observers': {k: v for k, v in environment['Observers'].items() if k in ['Sprite2D', 'Isometric']},
+            'Player': {
+                'Observer': {
+                    'TrackAvatar': False,
+                    'Height': level_shape[1],
+                    'Width': level_shape[0],
+                    'OffsetX': 0,
+                    'OffsetY': 0,
+                }
+            },
+            'Levels': [level_0_string],
         }
 
         return yaml.dump(level_generator_gdy)
 
-    def generate_env(self, **env_kwargs):
-        env_yaml = self.generate_env_yaml()
+    def generate_env(self, size, **env_kwargs):
+        env_yaml = self.generate_env_yaml(size)
 
         env_args = {
             **env_kwargs,
@@ -80,8 +102,36 @@ def generate_env(self, **env_kwargs):
 
 
 if __name__ == '__main__':
-    yaml_file = 'Single-Player/GVGAI/spider-nest.yaml'
+    wrapper_factory = GymWrapperFactory()
+    yaml_file = 'Single-Player/GVGAI/sokoban.yaml'
 
     egg = EnvironmentGeneratorGenerator(yaml_file=yaml_file)
 
-    print(egg.generate_env_yaml())
+    generator_yaml = egg.generate_env_yaml((10, 50))
+
+    wrapper_factory.build_gym_from_yaml_string(
+        'test',
+        yaml_string=generator_yaml,
+        # TODO: Change this to ASCII observer when its ready
+        global_observer_type=gd.ObserverType.SPRITE_2D,
+        player_observer_type=gd.ObserverType.SPRITE_2D,
+    )
+
+    env = gym.make(f'GDY-test-v0')
+    env.reset()
+    #env = ValidActionSpaceWrapper(env)
+
+    visualization = env.render(observer=0, mode='rgb_array')
+    video_recorder = VideoRecorder()
+    video_recorder.start('generator_video_test.mp4', visualization.shape)
+
+    # Place 10 Random Objects
+    for i in range(0, 100):
+        action = env.action_space.sample()
+        obs, reward, done, info = env.step(action)
+
+        state = env.get_state()
+
+        visual = env.render(observer=0, mode='rgb_array')
+        video_recorder.add_frame(visual)
+
diff --git a/python/tests/egg_test.py b/python/tests/egg_test.py
new file mode 100644
index 000000000..c04112d46
--- /dev/null
+++ b/python/tests/egg_test.py
@@ -0,0 +1,51 @@
+import gym
+import pytest
+from griddly.RenderTools import VideoRecorder
+
+from griddly import GymWrapperFactory, gd
+from griddly.util.environment_generator_generator import EnvironmentGeneratorGenerator
+
+
+@pytest.fixture
+def test_name(request):
+    return request.node.name
+
+def build_generator(test_name, yaml_file):
+    wrapper_factory = GymWrapperFactory()
+    egg = EnvironmentGeneratorGenerator(yaml_file=yaml_file)
+    generator_yaml = egg.generate_env_yaml((10,10))
+
+    wrapper_factory.build_gym_from_yaml_string(
+        test_name,
+        yaml_string=generator_yaml,
+        # TODO: Change this to ASCII observer when its ready
+        global_observer_type=gd.ObserverType.SPRITE_2D,
+        player_observer_type=gd.ObserverType.SPRITE_2D,
+    )
+
+    env = gym.make(f'GDY-{test_name}-v0')
+    env.reset()
+    return env
+
+def test_spider_nest_generator(test_name):
+
+    yaml_file = 'Single-Player/GVGAI/spider-nest.yaml'
+
+    genv = build_generator(test_name, yaml_file)
+
+    visualization = genv.render(observer=0, mode='rgb_array')
+    video_recorder = VideoRecorder()
+    video_recorder.start('generator_video_test.mp4', visualization.shape)
+
+    # Place 10 Random Objects
+    for i in range(0,10):
+        action = genv.action_space.sample()
+        obs, reward, done, info = genv.step(action)
+
+        state = genv.get_state()
+
+        visual = genv.render(observer=0, mode='rgb_array')
+        video_recorder.add_frame(visual)
+        #assert len(state['Objects']) == i
+
+    video_recorder.close()

From c4d7633c113f6e765ee38e8c1732235f6ad3de95 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Fri, 25 Jun 2021 22:52:41 +0100
Subject: [PATCH 13/18] forgot to add the cpp changes

---
 src/Griddly/Core/GDY/Actions/Action.cpp       |  25 +++-
 src/Griddly/Core/GDY/GDYFactory.cpp           |  30 ++---
 src/Griddly/Core/GDY/GDYFactory.hpp           |   4 +-
 src/Griddly/Core/GDY/Objects/Object.cpp       |   1 +
 .../Core/GDY/Objects/ObjectGenerator.cpp      |  14 +-
 src/Griddly/Core/GameProcess.cpp              |   1 +
 src/Griddly/Core/Grid.cpp                     |  59 +++++----
 src/Griddly/Core/Grid.hpp                     |  11 +-
 .../{MapReader.cpp => MapGenerator.cpp}       |  32 +++--
 .../{MapReader.hpp => MapGenerator.hpp}       |   7 +-
 src/Griddly/Core/Observers/AsciiObserver.cpp  |   0
 src/Griddly/Core/Observers/AsciiObserver.hpp  |   0
 src/Griddly/Core/Observers/VectorObserver.cpp |  12 +-
 src/Griddly/Core/Players/Player.cpp           |   3 -
 tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp | 124 +++++++++++++++++-
 .../Griddly/Core/GDY/Objects/ObjectTest.cpp   |   3 +
 tests/src/Griddly/Core/GridTest.cpp           |  34 +++++
 .../Core/LevelGenerator/MapReaderTest.cpp     |  38 ++++--
 .../LevelGenerators/MockLevelGenerator.hpp    |   1 -
 tests/src/Mocks/Griddly/Core/MockGrid.hpp     |   4 +
 20 files changed, 315 insertions(+), 88 deletions(-)
 rename src/Griddly/Core/LevelGenerators/{MapReader.cpp => MapGenerator.cpp} (78%)
 rename src/Griddly/Core/LevelGenerators/{MapReader.hpp => MapGenerator.hpp} (81%)
 create mode 100644 src/Griddly/Core/Observers/AsciiObserver.cpp
 create mode 100644 src/Griddly/Core/Observers/AsciiObserver.hpp

diff --git a/src/Griddly/Core/GDY/Actions/Action.cpp b/src/Griddly/Core/GDY/Actions/Action.cpp
index ea9cf39fe..53b4a9aea 100644
--- a/src/Griddly/Core/GDY/Actions/Action.cpp
+++ b/src/Griddly/Core/GDY/Actions/Action.cpp
@@ -49,20 +49,35 @@ std::shared_ptr<Object> Action::getSourceObject() const {
   if (sourceObject_ != nullptr) {
     return sourceObject_;
   } else {
-    return grid_->getObject(sourceLocation_);
+    auto srcObject = grid_->getObject(sourceLocation_);
+    if (srcObject != nullptr) {
+      return srcObject;
+    }
+
+    return grid_->getPlayerDefaultObject(playerId_);
   }
 }
 
 std::shared_ptr<Object> Action::getDestinationObject() const {
   switch (actionMode_) {
     case ActionMode::SRC_LOC_DST_LOC:
-    case ActionMode::SRC_OBJ_DST_LOC:
-      return grid_->getObject(destinationLocation_);
+    case ActionMode::SRC_OBJ_DST_LOC: {
+      auto dstObject = grid_->getObject(destinationLocation_);
+      if (dstObject != nullptr) {
+        return dstObject;
+      }
+      return grid_->getPlayerDefaultObject(playerId_);
+    }
     case ActionMode::SRC_OBJ_DST_OBJ:
       return destinationObject_;
-    case ActionMode::SRC_OBJ_DST_VEC:
+    case ActionMode::SRC_OBJ_DST_VEC: {
       auto destinationLocation = (getSourceLocation() + vectorToDest_);
-      return grid_->getObject(destinationLocation);
+      auto dstObject = grid_->getObject(destinationLocation);
+      if (dstObject != nullptr) {
+        return dstObject;
+      }
+      return grid_->getPlayerDefaultObject(playerId_);
+    }
   }
 }
 
diff --git a/src/Griddly/Core/GDY/GDYFactory.cpp b/src/Griddly/Core/GDY/GDYFactory.cpp
index 7eecf7b7d..cd57aaecf 100644
--- a/src/Griddly/Core/GDY/GDYFactory.cpp
+++ b/src/Griddly/Core/GDY/GDYFactory.cpp
@@ -8,7 +8,6 @@
 #include <spdlog/fmt/fmt.h>
 
 #include "../Grid.hpp"
-#include "../LevelGenerators/MapReader.hpp"
 #include "../Observers/VectorObserver.hpp"
 #include "../TurnBasedGameProcess.hpp"
 #include "GDYFactory.hpp"
@@ -81,19 +80,19 @@ void GDYFactory::loadEnvironment(YAML::Node environment) {
     parseIsometricSpriteObserverConfig(observerConfigNode["Isometric"]);
   }
 
+  parsePlayerDefinition(environment["Player"]);
+  parseGlobalVariables(environment["Variables"]);
+  parseTerminationConditions(environment["Termination"]);
+
   auto levels = environment["Levels"];
   for (std::size_t l = 0; l < levels.size(); l++) {
     auto levelStringStream = std::stringstream(levels[l].as<std::string>());
 
-    auto mapGenerator = std::shared_ptr<MapReader>(new MapReader(objectGenerator_));
+    auto mapGenerator = std::shared_ptr<MapGenerator>(new MapGenerator(playerCount_, objectGenerator_));
     mapGenerator->parseFromStream(levelStringStream);
     mapLevelGenerators_.push_back(mapGenerator);
   }
 
-  parsePlayerDefinition(environment["Player"]);
-  parseGlobalVariables(environment["Variables"]);
-  parseTerminationConditions(environment["Termination"]);
-
   spdlog::info("Loaded {0} levels", mapLevelGenerators_.size());
 }
 
@@ -507,14 +506,6 @@ ActionBehaviourDefinition GDYFactory::makeBehaviourDefinition(ActionBehaviourTyp
 void GDYFactory::parseActionBehaviours(ActionBehaviourType actionBehaviourType, std::string objectName, std::string actionName, std::vector<std::string> associatedObjectNames, YAML::Node commandsNode, YAML::Node preconditionsNode) {
   spdlog::debug("Parsing {0} commands for action {1}, object {2}", commandsNode.size(), actionName, objectName);
 
-  // If the object is _empty do nothing
-  if (objectName == "_empty") {
-    if (commandsNode.size() > 0) {
-      spdlog::error("Cannot add commands to _empty object. Commands for action {0} will be ignored", actionName);
-    }
-    return;
-  }
-
   // Get preconditions
   CommandList actionPreconditions;
 
@@ -697,6 +688,15 @@ void GDYFactory::loadActions(YAML::Node actions) {
       auto srcObjectNames = singleOrListNodeToList(srcNode["Object"]);
       auto dstObjectNames = singleOrListNodeToList(dstNode["Object"]);
 
+      // If the source of the destintation is not supplied then assume the source or dest is _empty and has no commands
+      if(srcObjectNames.size() == 0) {
+        srcObjectNames = {"_empty"};
+      } 
+
+      if(dstObjectNames.size() == 0) {
+        dstObjectNames = {"_empty"};
+      } 
+
       for (auto srcName : srcObjectNames) {
         parseActionBehaviours(ActionBehaviourType::SOURCE, srcName, actionName, dstObjectNames, srcNode["Commands"], srcNode["Preconditions"]);
       }
@@ -809,7 +809,7 @@ std::shared_ptr<LevelGenerator> GDYFactory::getLevelGenerator(uint32_t level) co
 std::shared_ptr<LevelGenerator> GDYFactory::getLevelGenerator(std::string levelString) const {
   auto levelStringStream = std::stringstream(levelString);
 
-  auto mapGenerator = std::shared_ptr<MapReader>(new MapReader(objectGenerator_));
+  auto mapGenerator = std::shared_ptr<MapGenerator>(new MapGenerator(playerCount_, objectGenerator_));
   mapGenerator->parseFromStream(levelStringStream);
 
   return mapGenerator;
diff --git a/src/Griddly/Core/GDY/GDYFactory.hpp b/src/Griddly/Core/GDY/GDYFactory.hpp
index b7b936995..9b3581a11 100644
--- a/src/Griddly/Core/GDY/GDYFactory.hpp
+++ b/src/Griddly/Core/GDY/GDYFactory.hpp
@@ -2,7 +2,7 @@
 #include <memory>
 #include <sstream>
 
-#include "../LevelGenerators/MapReader.hpp"
+#include "../LevelGenerators/MapGenerator.hpp"
 #include "../Observers/BlockObserver.hpp"
 #include "../Observers/SpriteObserver.hpp"
 #include "../Observers/IsometricSpriteObserver.hpp"
@@ -137,7 +137,7 @@ class GDYFactory {
   std::unordered_map<std::string, ActionInputsDefinition> actionInputsDefinitions_;
   std::vector<std::string> externalActionNames_;
 
-  std::vector<std::shared_ptr<MapReader>> mapLevelGenerators_;
+  std::vector<std::shared_ptr<MapGenerator>> mapLevelGenerators_;
   const std::shared_ptr<ObjectGenerator> objectGenerator_;
   const std::shared_ptr<TerminationGenerator> terminationGenerator_;
 };
diff --git a/src/Griddly/Core/GDY/Objects/Object.cpp b/src/Griddly/Core/GDY/Objects/Object.cpp
index 69b994610..8f4081629 100644
--- a/src/Griddly/Core/GDY/Objects/Object.cpp
+++ b/src/Griddly/Core/GDY/Objects/Object.cpp
@@ -431,6 +431,7 @@ BehaviourFunction Object::instantiateBehaviour(std::string commandName, Behaviou
       auto destinationLocation = action->getDestinationLocation();
       spdlog::debug("Spawning object={0} in location [{1},{2}]", objectName, destinationLocation.x, destinationLocation.y);
       auto playerId = getPlayerId();
+
       auto newObject = objectGenerator_->newInstance(objectName, playerId, grid_->getGlobalVariables());
       grid_->addObject(destinationLocation, newObject);
       return {};
diff --git a/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp b/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp
index cc7c3fc7f..190a4f177 100644
--- a/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp
+++ b/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp
@@ -9,6 +9,14 @@
 
 namespace griddly {
 ObjectGenerator::ObjectGenerator() {
+
+  // Define the default _empty object
+  ObjectDefinition objectDefinition;
+  objectDefinition.objectName = "_empty";
+  objectDefinition.zIdx = 0;
+  objectDefinition.variableDefinitions = {};
+
+  objectDefinitions_.insert({"_empty", std::make_shared<ObjectDefinition>(objectDefinition)});
 }
 
 ObjectGenerator::~ObjectGenerator() {
@@ -121,10 +129,10 @@ std::shared_ptr<Object> ObjectGenerator::cloneInstance(std::shared_ptr<Object> t
 }
 
 std::shared_ptr<Object> ObjectGenerator::newInstance(std::string objectName, uint32_t playerId, std::unordered_map<std::string, std::unordered_map<uint32_t, std::shared_ptr<int32_t>>> globalVariables) {
-  auto objectDefinition = getObjectDefinition(objectName);
-
   spdlog::debug("Creating new object {0}.", objectName);
 
+  auto objectDefinition = getObjectDefinition(objectName);
+
   auto isAvatar = objectName == avatarObject_;
 
   // if the object is marked as an avatar, but the playerId is 0 then assume this is the only avatar and set the playerId to 1
@@ -197,7 +205,7 @@ std::shared_ptr<Object> ObjectGenerator::newInstance(std::string objectName, uin
   initializedObject->setInitialActionDefinitions(objectDefinition->initialActionDefinitions);
 
   return initializedObject;
-}  // namespace griddly
+}
 
 void ObjectGenerator::setAvatarObject(std::string objectName) {
   avatarObject_ = objectName;
diff --git a/src/Griddly/Core/GameProcess.cpp b/src/Griddly/Core/GameProcess.cpp
index 17b4e202c..7c1c0042c 100644
--- a/src/Griddly/Core/GameProcess.cpp
+++ b/src/Griddly/Core/GameProcess.cpp
@@ -161,6 +161,7 @@ void GameProcess::reset() {
   terminationHandler_ = std::shared_ptr<TerminationHandler>(gdyFactory_->createTerminationHandler(grid_, players_));
 
   requiresReset_ = false;
+  spdlog::debug("Reset Complete.");
 }
 
 ObserverConfig GameProcess::getObserverConfig(ObserverType observerType) const {
diff --git a/src/Griddly/Core/Grid.cpp b/src/Griddly/Core/Grid.cpp
index d207d101e..5fd36812d 100644
--- a/src/Griddly/Core/Grid.cpp
+++ b/src/Griddly/Core/Grid.cpp
@@ -36,8 +36,15 @@ void Grid::resetMap(uint32_t width, uint32_t height) {
   objectIds_.clear();
   objectVariableIds_.clear();
   delayedActions_ = {};
+  defaultObject_ = {};
 
   gameTicks_ = std::make_shared<int32_t>(0);
+
+  if (updatedLocations_.size() == 0) {
+    for (auto p = 0; p < playerCount_ + 1; p++) {
+      updatedLocations_.push_back(std::unordered_set<glm::ivec2>{});
+    }
+  }
 }
 
 void Grid::setGlobalVariables(std::unordered_map<std::string, std::unordered_map<uint32_t, int32_t>> globalVariableDefinitions) {
@@ -46,7 +53,7 @@ void Grid::setGlobalVariables(std::unordered_map<std::string, std::unordered_map
     auto variableName = variable.first;
     auto playerVariables = variable.second;
 
-    for (auto playerVariable : playerVariables){
+    for (auto playerVariable : playerVariables) {
       auto playerId = playerVariable.first;
       auto variableValue = playerVariable.second;
       globalVariables_[variableName].insert({playerId, std::make_shared<int32_t>(variableValue)});
@@ -71,13 +78,6 @@ void Grid::resetGlobalVariables(std::unordered_map<std::string, GlobalVariableDe
 }
 
 bool Grid::invalidateLocation(glm::ivec2 location) {
-
-  if(updatedLocations_.size() == 0) {
-    for(auto p = 0; p<playerCount_+1; p++) {
-    updatedLocations_.push_back(std::unordered_set<glm::ivec2>{});
-    }
-  }
-
   for (int p = 0; p < playerCount_ + 1; p++) {
     updatedLocations_[p].insert(location);
   }
@@ -111,7 +111,7 @@ bool Grid::updateLocation(std::shared_ptr<Object> object, glm::ivec2 previousLoc
 }
 
 const std::unordered_set<glm::ivec2>& Grid::getUpdatedLocations(uint32_t playerId) const {
-  if(playerId >= updatedLocations_.size()) {
+  if (playerId >= updatedLocations_.size()) {
     return EMPTY_LOCATIONS;
   }
   return updatedLocations_[playerId];
@@ -129,14 +129,14 @@ std::unordered_map<uint32_t, int32_t> Grid::executeAndRecord(uint32_t playerId,
 }
 
 std::unordered_map<uint32_t, int32_t> Grid::executeAction(uint32_t playerId, std::shared_ptr<Action> action) {
+  spdlog::debug("Executing action {0}", action->getDescription());
+
   auto sourceObject = action->getSourceObject();
   auto destinationObject = action->getDestinationObject();
 
   // Need to get this name before anything happens to the object for example if the object is removed in onActionDst.
   auto originalDestinationObjectName = destinationObject == nullptr ? "_empty" : destinationObject->getObjectName();
 
-  spdlog::debug("Executing action {0}", action->getDescription());
-
   if (objects_.find(sourceObject) == objects_.end() && action->getDelay() > 0) {
     spdlog::debug("Delayed action for object that no longer exists.");
     return {};
@@ -188,20 +188,16 @@ GridEvent Grid::buildGridEvent(std::shared_ptr<Action> action, uint32_t playerId
   GridEvent event;
   event.playerId = playerId;
   event.actionName = action->getActionName();
+  event.sourceObjectName = sourceObject->getObjectName();
+  event.destObjectName = destObject->getObjectName();
 
-  if (sourceObject != nullptr) {
+  if (sourceObject->getObjectName() != "_empty") {
     event.sourceObjectPlayerId = sourceObject->getPlayerId();
-    event.sourceObjectName = sourceObject->getObjectName();
-  } else {
-    event.sourceObjectName = "_empty";
   }
 
-  if (destObject != nullptr) {
+  if (destObject->getObjectName() != "_empty") {
     event.destinationObjectPlayerId = destObject->getPlayerId();
-    event.destObjectName = destObject->getObjectName();
-  } else {
-    event.destObjectName = "_empty";
-  }
+  } 
 
   event.sourceLocation = action->getSourceLocation();
   event.destLocation = action->getDestinationLocation();
@@ -312,7 +308,6 @@ const std::unordered_map<std::string, uint32_t>& Grid::getObjectIds() const {
   return objectIds_;
 }
 
-
 const std::unordered_map<std::string, uint32_t>& Grid::getObjectVariableIds() const {
   return objectVariableIds_;
 }
@@ -321,7 +316,7 @@ const std::vector<std::string> Grid::getObjectNames() const {
   auto namesCount = objectIds_.size();
   std::vector<std::string> orderedNames(namesCount);
 
-  for(auto& objectIdIt : objectIds_) {
+  for (auto& objectIdIt : objectIds_) {
     auto name = objectIdIt.first;
     auto idx = objectIdIt.second;
     orderedNames[idx] = name;
@@ -334,7 +329,7 @@ const std::vector<std::string> Grid::getObjectVariableNames() const {
   auto namesCount = objectVariableIds_.size();
   std::vector<std::string> orderedNames(namesCount);
 
-  for(auto& objectVariableIdIt : objectVariableIds_) {
+  for (auto& objectVariableIdIt : objectVariableIds_) {
     auto name = objectVariableIdIt.first;
     auto idx = objectVariableIdIt.second;
     orderedNames[idx] = name;
@@ -343,11 +338,10 @@ const std::vector<std::string> Grid::getObjectVariableNames() const {
   return orderedNames;
 }
 
-
 void Grid::initObject(std::string objectName, std::vector<std::string> variableNames) {
   objectIds_.insert({objectName, objectIds_.size()});
 
-  for(auto& variableName : variableNames) {
+  for (auto& variableName : variableNames) {
     objectVariableIds_.insert({variableName, objectVariableIds_.size()});
   }
 }
@@ -366,6 +360,19 @@ const std::unordered_map<std::string, std::unordered_map<uint32_t, std::shared_p
   return globalVariables_;
 }
 
+void Grid::addPlayerDefaultObject(std::shared_ptr<Object> object) {
+  spdlog::debug("Adding default object for player {0}", object->getPlayerId());
+
+  object->init({-1,-1}, shared_from_this());
+
+  defaultObject_[object->getPlayerId()] = object;
+}
+
+std::shared_ptr<Object> Grid::getPlayerDefaultObject(uint32_t playerId) const {
+  spdlog::debug("Getting default object for player {0}", playerId);
+  return defaultObject_.at(playerId);
+}
+
 void Grid::addObject(glm::ivec2 location, std::shared_ptr<Object> object, bool applyInitialActions) {
   auto objectName = object->getObjectName();
   auto playerId = object->getPlayerId();
@@ -430,7 +437,7 @@ bool Grid::removeObject(std::shared_ptr<Object> object) {
     invalidateLocation(location);
 
     // if we are removing a player's avatar
-    if(playerAvatars_.size() > 0 && playerId != 0 && playerAvatars_.at(playerId) == object) {
+    if (playerAvatars_.size() > 0 && playerId != 0 && playerAvatars_.at(playerId) == object) {
       spdlog::debug("Removing player {0} avatar {1}", playerId, objectName);
       playerAvatars_.erase(playerId);
     }
diff --git a/src/Griddly/Core/Grid.hpp b/src/Griddly/Core/Grid.hpp
index 22e36cdbb..3529b9d29 100644
--- a/src/Griddly/Core/Grid.hpp
+++ b/src/Griddly/Core/Grid.hpp
@@ -57,7 +57,7 @@ class Grid : public std::enable_shared_from_this<Grid> {
   virtual void setGlobalVariables(std::unordered_map<std::string, std::unordered_map<uint32_t, int32_t>> globalVariableDefinitions);
 
   virtual std::unordered_map<uint32_t, int32_t> performActions(uint32_t playerId, std::vector<std::shared_ptr<Action>> actions);
-  virtual std::unordered_map<uint32_t, int32_t>  executeAction(uint32_t playerId, std::shared_ptr<Action> action);
+  virtual std::unordered_map<uint32_t, int32_t> executeAction(uint32_t playerId, std::shared_ptr<Action> action);
   virtual void delayAction(uint32_t playerId, std::shared_ptr<Action> action);
   virtual std::unordered_map<uint32_t, int32_t> update();
 
@@ -78,11 +78,16 @@ class Grid : public std::enable_shared_from_this<Grid> {
   virtual void setTickCount(int32_t tickCount);
 
   virtual void initObject(std::string objectName, std::vector<std::string> objectVariableNames);
+
   virtual void addObject(glm::ivec2 location, std::shared_ptr<Object> object, bool applyInitialActions = true);
+
   virtual bool removeObject(std::shared_ptr<Object> object);
 
   virtual const std::unordered_set<std::shared_ptr<Object>>& getObjects();
 
+  virtual void addPlayerDefaultObject(std::shared_ptr<Object> object);
+  virtual std::shared_ptr<Object> getPlayerDefaultObject(uint32_t playerId) const;
+
   /**
    * Gets all the objects at a certain location
    */
@@ -161,6 +166,10 @@ class Grid : public std::enable_shared_from_this<Grid> {
 
   bool recordEvents_ = false;
   std::vector<GridEvent> eventHistory_;
+
+  // An object that is used if the source of destination location of an action is '_empty'
+  // Allows a subset of actions like "spawn" to be performed in empty space.
+  std::unordered_map<uint32_t, std::shared_ptr<Object>> defaultObject_;
 };
 
 }  // namespace griddly
\ No newline at end of file
diff --git a/src/Griddly/Core/LevelGenerators/MapReader.cpp b/src/Griddly/Core/LevelGenerators/MapGenerator.cpp
similarity index 78%
rename from src/Griddly/Core/LevelGenerators/MapReader.cpp
rename to src/Griddly/Core/LevelGenerators/MapGenerator.cpp
index 90bff7747..0d3104034 100644
--- a/src/Griddly/Core/LevelGenerators/MapReader.cpp
+++ b/src/Griddly/Core/LevelGenerators/MapGenerator.cpp
@@ -1,4 +1,4 @@
-#include "MapReader.hpp"
+#include "MapGenerator.hpp"
 
 #include <spdlog/spdlog.h>
 
@@ -7,7 +7,7 @@
 
 namespace griddly {
 
-MapReader::MapReader(std::shared_ptr<ObjectGenerator> objectGenerator) : objectGenerator_(objectGenerator) {
+MapGenerator::MapGenerator(uint32_t playerCount, std::shared_ptr<ObjectGenerator> objectGenerator) : playerCount_(playerCount), objectGenerator_(objectGenerator) {
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);
 #else
@@ -15,20 +15,23 @@ MapReader::MapReader(std::shared_ptr<ObjectGenerator> objectGenerator) : objectG
 #endif
 }
 
-MapReader::~MapReader() {
+MapGenerator::~MapGenerator() {
 }
 
-void MapReader::reset(std::shared_ptr<Grid> grid) {
+void MapGenerator::reset(std::shared_ptr<Grid> grid) {
   grid->resetMap(width_, height_);
 
   for (auto objectDefinition : objectGenerator_->getObjectDefinitions()) {
     auto objectName = objectDefinition.second->objectName;
-    std::vector<std::string> objectVariableNames;
-    for (auto variableNameIt : objectDefinition.second->variableDefinitions) {
-      objectVariableNames.push_back(variableNameIt.first);
+    if (objectName != "_empty") {
+      std::vector<std::string> objectVariableNames;
+      for (auto variableNameIt : objectDefinition.second->variableDefinitions) {
+        objectVariableNames.push_back(variableNameIt.first);
+      }
+
+      grid->initObject(objectName, objectVariableNames);
+      spdlog::debug("Initializing object {0}", objectName);
     }
-    grid->initObject(objectName, objectVariableNames);
-    spdlog::debug("Initializing object {0}", objectName);
   }
 
   for (auto& item : mapDescription_) {
@@ -40,16 +43,21 @@ void MapReader::reset(std::shared_ptr<Grid> grid) {
     auto object = objectGenerator_->newInstance(objectName, playerId, grid->getGlobalVariables());
     grid->addObject(location, object);
   }
+
+  for (auto playerId = 0; playerId < playerCount_ + 1; playerId++) {
+    auto defaultObject = objectGenerator_->newInstance("_empty", playerId, grid->getGlobalVariables());
+    grid->addPlayerDefaultObject(defaultObject);
+  }
 }
 
-void MapReader::initializeFromFile(std::string filename) {
+void MapGenerator::initializeFromFile(std::string filename) {
   spdlog::debug("Loading map file: {0}", filename);
   std::ifstream mapFile;
   mapFile.open(filename);
   parseFromStream(mapFile);
 }
 
-void MapReader::parseFromStream(std::istream& stream) {
+void MapGenerator::parseFromStream(std::istream& stream) {
   auto state = MapReaderState::READ_NORMAL;
 
   mapDescription_.clear();
@@ -148,7 +156,7 @@ void MapReader::parseFromStream(std::istream& stream) {
   }
 }
 
-void MapReader::addObject(std::string objectName, char* playerIdString, int playerIdStringLength, uint32_t x, uint32_t y) {
+void MapGenerator::addObject(std::string objectName, char* playerIdString, int playerIdStringLength, uint32_t x, uint32_t y) {
   auto playerId = playerIdStringLength > 0 ? atoi(playerIdString) : 0;
   GridInitInfo gridInitInfo;
   gridInitInfo.objectName = objectName;
diff --git a/src/Griddly/Core/LevelGenerators/MapReader.hpp b/src/Griddly/Core/LevelGenerators/MapGenerator.hpp
similarity index 81%
rename from src/Griddly/Core/LevelGenerators/MapReader.hpp
rename to src/Griddly/Core/LevelGenerators/MapGenerator.hpp
index 5fba48991..c256c56e3 100644
--- a/src/Griddly/Core/LevelGenerators/MapReader.hpp
+++ b/src/Griddly/Core/LevelGenerators/MapGenerator.hpp
@@ -19,10 +19,10 @@ enum class MapReaderState {
   READ_PLAYERID
 };
 
-class MapReader : public LevelGenerator {
+class MapGenerator : public LevelGenerator {
  public:
-  MapReader(std::shared_ptr<ObjectGenerator> objectGenerator);
-  ~MapReader() override;
+  MapGenerator(uint32_t playerCount, std::shared_ptr<ObjectGenerator> objectGenerator);
+  ~MapGenerator() override;
 
   virtual void parseFromStream(std::istream& stream);
 
@@ -33,6 +33,7 @@ class MapReader : public LevelGenerator {
  private:
   uint32_t width_ = 0; 
   uint32_t height_ = 0;
+  const uint32_t playerCount_;
   std::unordered_map<glm::ivec2, GridInitInfo> mapDescription_;
 
   const std::shared_ptr<ObjectGenerator> objectGenerator_;
diff --git a/src/Griddly/Core/Observers/AsciiObserver.cpp b/src/Griddly/Core/Observers/AsciiObserver.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Griddly/Core/Observers/AsciiObserver.hpp b/src/Griddly/Core/Observers/AsciiObserver.hpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Griddly/Core/Observers/VectorObserver.cpp b/src/Griddly/Core/Observers/VectorObserver.cpp
index 83adfb91d..5ecf1becc 100644
--- a/src/Griddly/Core/Observers/VectorObserver.cpp
+++ b/src/Griddly/Core/Observers/VectorObserver.cpp
@@ -145,12 +145,16 @@ void VectorObserver::renderLocation(glm::ivec2 objectLocation, glm::ivec2 output
 }
 
 uint8_t* VectorObserver::update() {
-
+  spdlog::debug("Vector renderer updating.");
+  
   if (observerState_ != ObserverState::READY) {
     throw std::runtime_error("Observer not ready, must be initialized and reset before update() can be called.");
   }
 
   if (trackAvatar_) {
+
+    spdlog::debug("Tracking Avatar.");
+
     auto avatarLocation = avatarObject_->getLocation();
     auto avatarOrientation = avatarObject_->getObjectOrientation();
     auto avatarDirection = avatarOrientation.getDirection();
@@ -237,6 +241,8 @@ uint8_t* VectorObserver::update() {
             location.x - observerConfig_.gridXOffset,
             location.y - observerConfig_.gridYOffset);
 
+        spdlog::debug("Rendering location {0}, {1}.", location.x, location.y);
+
         if (outputLocation.x < gridWidth_ && outputLocation.x >= 0 && outputLocation.y < gridHeight_ && outputLocation.y >= 0) {
           renderLocation(location, outputLocation, true);
         }
@@ -244,8 +250,12 @@ uint8_t* VectorObserver::update() {
     }
   }
 
+  spdlog::debug("Purging update locations.");
+
   grid_->purgeUpdatedLocations(observerConfig_.playerId);
 
+  spdlog::debug("Vector renderer done.");
+
   return observation_.get();
 }
 
diff --git a/src/Griddly/Core/Players/Player.cpp b/src/Griddly/Core/Players/Player.cpp
index e6d51af77..a34654879 100644
--- a/src/Griddly/Core/Players/Player.cpp
+++ b/src/Griddly/Core/Players/Player.cpp
@@ -69,9 +69,6 @@ ActionResult Player::performActions(std::vector<std::shared_ptr<Action>> actions
 }
 
 uint8_t* Player::observe() {
-  // if (observer_ == nullptr) {
-  //   return nullptr;
-  // }
   return observer_->update();
 }
 
diff --git a/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp b/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
index 4d324e727..19b21af9b 100644
--- a/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
+++ b/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
@@ -421,7 +421,7 @@ TEST(GDYFactoryTest, loadEnvironment_termination_v2) {
       .Times(1);
   EXPECT_CALL(*mockTerminationGeneratorPtr, defineTerminationCondition(Eq(TerminationState::WIN), Eq("gt"), Eq(0), Eq(0), Eq(std::vector<std::string>{"var2", "10"})))
       .Times(1);
-  
+
   EXPECT_CALL(*mockTerminationGeneratorPtr, defineTerminationCondition(Eq(TerminationState::NONE), Eq("eq"), Eq(-5), Eq(5), Eq(std::vector<std::string>{"var1", "-10"})))
       .Times(1);
   EXPECT_CALL(*mockTerminationGeneratorPtr, defineTerminationCondition(Eq(TerminationState::NONE), Eq("lt"), Eq(0), Eq(0), Eq(std::vector<std::string>{"var3", "-1"})))
@@ -534,18 +534,18 @@ MATCHER_P(ActionBehaviourDefinitionEqMatcher, behaviour, "") {
   return isEqual;
 }
 
-void expectOpposingDefinitionNOP(ActionBehaviourType behaviourType, std::shared_ptr<MockObjectGenerator> mockObjectGeneratorPtr) {
+void expectOpposingDefinitionNOP(ActionBehaviourType behaviourType, std::string sourceObjectName, std::string destinationObjectName, std::shared_ptr<MockObjectGenerator> mockObjectGeneratorPtr) {
   ActionBehaviourDefinition expectedNOPDefinition = GDYFactory::makeBehaviourDefinition(
       behaviourType == ActionBehaviourType::DESTINATION ? ActionBehaviourType::SOURCE : ActionBehaviourType::DESTINATION,
-      behaviourType == ActionBehaviourType::DESTINATION ? "sourceObject" : "destinationObject",
-      behaviourType == ActionBehaviourType::SOURCE ? "sourceObject" : "destinationObject",
+      behaviourType == ActionBehaviourType::DESTINATION ? sourceObjectName : destinationObjectName,
+      behaviourType == ActionBehaviourType::SOURCE ? sourceObjectName : destinationObjectName,
       "action",
       "nop",
       {},
       {},
       {});
 
-  auto objectName = behaviourType == ActionBehaviourType::SOURCE ? "destinationObject" : "sourceObject";
+  auto objectName = behaviourType == ActionBehaviourType::SOURCE ? destinationObjectName : sourceObjectName;
 
   EXPECT_CALL(*mockObjectGeneratorPtr, defineActionBehaviour(Eq(objectName), ActionBehaviourDefinitionEqMatcher(expectedNOPDefinition)))
       .Times(1);
@@ -558,13 +558,13 @@ void testBehaviourDefinition(std::string yamlString, ActionBehaviourDefinition e
 
   auto actionsNode = loadFromStringAndGetNode(std::string(yamlString), "Actions");
 
-  auto objectName = expectedBehaviourDefinition.behaviourType == ActionBehaviourType::SOURCE ? "sourceObject" : "destinationObject";
+  auto objectName = expectedBehaviourDefinition.behaviourType == ActionBehaviourType::SOURCE ? expectedBehaviourDefinition.sourceObjectName : expectedBehaviourDefinition.destinationObjectName;
 
   EXPECT_CALL(*mockObjectGeneratorPtr, defineActionBehaviour(Eq(objectName), ActionBehaviourDefinitionEqMatcher(expectedBehaviourDefinition)))
       .Times(1);
 
   if (expectNOP) {
-    expectOpposingDefinitionNOP(expectedBehaviourDefinition.behaviourType, mockObjectGeneratorPtr);
+    expectOpposingDefinitionNOP(expectedBehaviourDefinition.behaviourType, expectedBehaviourDefinition.sourceObjectName, expectedBehaviourDefinition.destinationObjectName, mockObjectGeneratorPtr);
   }
 
   gdyFactory->loadActions(actionsNode);
@@ -713,6 +713,106 @@ TEST(GDYFactoryTest, loadAction_destination_conditional) {
   testBehaviourDefinition(yamlString, expectedBehaviourDefinition, true);
 }
 
+TEST(GDYFactoryTest, loadAction_source_empty) {
+  auto yamlString = R"(
+Actions:
+  - Name: action
+    Behaviours:
+      - Src:
+          Object: _empty
+          Commands: 
+            - spawn: cars
+        Dst:
+          Object: _empty
+)";
+
+  ActionBehaviourDefinition expectedBehaviourDefinition = GDYFactory::makeBehaviourDefinition(
+      ActionBehaviourType::SOURCE,
+      "_empty",
+      "_empty",
+      "action",
+      "spawn",
+      {{"0", _Y("cars")}},
+      {},
+      {});
+
+  testBehaviourDefinition(yamlString, expectedBehaviourDefinition, true);
+}
+
+TEST(GDYFactoryTest, loadAction_dest_empty) {
+  auto yamlString = R"(
+Actions:
+  - Name: action
+    Behaviours:
+      - Src:
+          Object: _empty
+        Dst:
+          Object: _empty
+          Commands: 
+            - spawn: cars
+)";
+
+  ActionBehaviourDefinition expectedBehaviourDefinition = GDYFactory::makeBehaviourDefinition(
+      ActionBehaviourType::DESTINATION,
+      "_empty",
+      "_empty",
+      "action",
+      "spawn",
+      {{"0", _Y("cars")}},
+      {},
+      {});
+
+  testBehaviourDefinition(yamlString, expectedBehaviourDefinition, true);
+}
+
+TEST(GDYFactoryTest, loadAction_destination_missing) {
+  auto yamlString = R"(
+Actions:
+  - Name: action
+    Behaviours:
+      - Src:
+          Object: _empty
+          Commands: 
+            - spawn: cars
+)";
+
+  ActionBehaviourDefinition expectedBehaviourDefinition = GDYFactory::makeBehaviourDefinition(
+      ActionBehaviourType::SOURCE,
+      "_empty",
+      "_empty",
+      "action",
+      "spawn",
+      {{"0", _Y("cars")}},
+      {},
+      {});
+
+  testBehaviourDefinition(yamlString, expectedBehaviourDefinition, true);
+}
+
+TEST(GDYFactoryTest, loadAction_src_missing) {
+  auto yamlString = R"(
+Actions:
+  - Name: action
+    Behaviours:
+      - Dst:
+          Object: _empty
+          Commands: 
+            - spawn: cars
+)";
+
+  ActionBehaviourDefinition expectedBehaviourDefinition = GDYFactory::makeBehaviourDefinition(
+      ActionBehaviourType::DESTINATION,
+      "_empty",
+      "_empty",
+      "action",
+      "spawn",
+      {{"0", _Y("cars")}},
+      {},
+      {});
+
+  testBehaviourDefinition(yamlString, expectedBehaviourDefinition, true);
+}
+
 std::unordered_map<std::string, std::shared_ptr<ObjectDefinition>> mockObjectDefs(std::vector<std::string> objectNames) {
   std::unordered_map<std::string, std::shared_ptr<ObjectDefinition>> mockObjectDefinitions;
   for (auto name : objectNames) {
@@ -732,6 +832,7 @@ TEST(GDYFactoryTest, wallTest) {
 
   auto mockWall2Object = std::shared_ptr<MockObject>(new MockObject());
   auto mockWall16Object = std::shared_ptr<MockObject>(new MockObject());
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
 
   std::string wall2String = "Wall2";
   std::string wall16String = "Wall16";
@@ -753,6 +854,9 @@ TEST(GDYFactoryTest, wallTest) {
   EXPECT_CALL(*mockObjectGeneratorPtr, getObjectNameFromMapChar(Eq('W')))
       .WillRepeatedly(ReturnRef(wall16String));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wall2String), Eq(0), _))
       .WillRepeatedly(Return(mockWall2Object));
 
@@ -777,6 +881,9 @@ TEST(GDYFactoryTest, zIndexTest) {
   auto mockWallObject = std::shared_ptr<MockObject>(new MockObject());
   auto mockFloorObject = std::shared_ptr<MockObject>(new MockObject());
   auto mockGhostObject = std::shared_ptr<MockObject>(new MockObject());
+
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+
   std::string wall = "Wall2";
   std::string floor = "floor";
   std::string ghost = "ghost";
@@ -804,6 +911,9 @@ TEST(GDYFactoryTest, zIndexTest) {
   EXPECT_CALL(*mockObjectGeneratorPtr, getObjectNameFromMapChar(Eq('g')))
       .WillRepeatedly(ReturnRef(floor));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wall), Eq(0), _))
       .WillRepeatedly(Return(mockWallObject));
 
diff --git a/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp b/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp
index 41768926d..fb99d1312 100644
--- a/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp
+++ b/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp
@@ -364,6 +364,9 @@ std::shared_ptr<MockGrid> mockGrid() {
   EXPECT_CALL(*mockGridPtr, updateLocation)
       .WillRepeatedly(Return(true));
 
+  EXPECT_CALL(*mockGridPtr, invalidateLocation)
+      .WillRepeatedly(Return(true));
+
   return mockGridPtr;
 }
 
diff --git a/tests/src/Griddly/Core/GridTest.cpp b/tests/src/Griddly/Core/GridTest.cpp
index 50ab0edf3..f661105e0 100644
--- a/tests/src/Griddly/Core/GridTest.cpp
+++ b/tests/src/Griddly/Core/GridTest.cpp
@@ -191,6 +191,40 @@ TEST(GridTest, removeObjectNotInitialized) {
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(mockObjectPtr.get()));
 }
 
+TEST(GridTest, performActionDefaultObject) {
+  auto grid = std::shared_ptr<Grid>(new Grid());
+  grid->resetMap(123, 456);
+  grid->enableHistory(true);
+
+  auto mockActionDestinationLocation = glm::ivec2(2, 0);
+  auto mockActionSourceLocation = glm::ivec2(2, 0);
+
+  auto mockActionPtr = mockAction("action", mockActionSourceLocation, mockActionDestinationLocation);
+
+  auto actions = std::vector<std::shared_ptr<Action>>{mockActionPtr};
+
+  auto reward = grid->performActions(1, actions);
+
+  ASSERT_THAT(reward, ContainerEq(std::unordered_map<uint32_t, int32_t>{}));
+
+  GridEvent gridEvent;
+  gridEvent.actionName = "action";
+  gridEvent.playerId = 1;
+  gridEvent.sourceObjectPlayerId = 0;
+  gridEvent.destinationObjectPlayerId = 0;
+  gridEvent.sourceObjectName = "_empty";
+  gridEvent.destObjectName = "_empty";
+  gridEvent.sourceLocation = mockActionSourceLocation; 
+  gridEvent.destLocation = mockActionDestinationLocation;
+  gridEvent.rewards = {};
+  gridEvent.tick = 0;
+  gridEvent.delay = 0;
+
+  ASSERT_THAT(grid->getHistory(), ElementsAre(ActionEventMatcher(gridEvent)));
+
+  EXPECT_TRUE(Mock::VerifyAndClearExpectations(mockActionPtr.get()));
+}
+
 TEST(GridTest, performActionOnEmptySpace) {
   auto grid = std::shared_ptr<Grid>(new Grid());
   grid->resetMap(123, 456);
diff --git a/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp b/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp
index f17f04b1f..7999ae1b8 100644
--- a/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp
+++ b/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <memory>
 
-#include "Griddly/Core/LevelGenerators/MapReader.cpp"
+#include "Griddly/Core/LevelGenerators/MapGenerator.cpp"
 #include "Mocks/Griddly/Core/GDY/Objects/MockObject.hpp"
 #include "Mocks/Griddly/Core/GDY/Objects/MockObjectGenerator.hpp"
 #include "Mocks/Griddly/Core/MockGrid.hpp"
@@ -28,12 +28,13 @@ std::unordered_map<std::string, std::shared_ptr<ObjectDefinition>> mockObjectDef
   return mockObjectDefinitions;
 }
 
-TEST(MapReaderTest, testLoadStringWithPlayerObjects) {
+TEST(MapGeneratorTest, testLoadStringWithPlayerObjects) {
   auto mockObjectGeneratorPtr = std::shared_ptr<MockObjectGenerator>(new MockObjectGenerator());
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
   auto mockWallObject = std::shared_ptr<MockObject>(new MockObject());
   auto mockAvatarObject = std::shared_ptr<MockObject>(new MockObject());
-  std::shared_ptr<MapReader> mapReader(new MapReader(mockObjectGeneratorPtr));
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+  std::shared_ptr<MapGenerator> mapReader(new MapGenerator(1, mockObjectGeneratorPtr));
 
   std::string wallObjectName = "wall";
   std::string avatarObjectName = "avatar";
@@ -61,6 +62,10 @@ TEST(MapReaderTest, testLoadStringWithPlayerObjects) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wallObjectName), Eq(0), _))
       .Times(8)
       .WillRepeatedly(Return(mockWallObject));
@@ -88,12 +93,13 @@ TEST(MapReaderTest, testLoadStringWithPlayerObjects) {
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(mockObjectGeneratorPtr.get()));
 }
 
-TEST(MapReaderTest, testLoadStringWithPlayerObjectsRandomWhitespace) {
+TEST(MapGeneratorTest, testLoadStringWithPlayerObjectsRandomWhitespace) {
   auto mockObjectGeneratorPtr = std::shared_ptr<MockObjectGenerator>(new MockObjectGenerator());
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
   auto mockWallObject = std::shared_ptr<MockObject>(new MockObject());
   auto mockAvatarObject = std::shared_ptr<MockObject>(new MockObject());
-  std::shared_ptr<MapReader> mapReader(new MapReader(mockObjectGeneratorPtr));
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+  std::shared_ptr<MapGenerator> mapReader(new MapGenerator(1, mockObjectGeneratorPtr));
 
   std::string wallObjectName = "wall";
   std::string avatarObjectName = "avatar";
@@ -121,6 +127,10 @@ TEST(MapReaderTest, testLoadStringWithPlayerObjectsRandomWhitespace) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wallObjectName), Eq(0), _))
       .Times(8)
       .WillRepeatedly(Return(mockWallObject));
@@ -148,12 +158,13 @@ TEST(MapReaderTest, testLoadStringWithPlayerObjectsRandomWhitespace) {
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(mockObjectGeneratorPtr.get()));
 }
 
-TEST(MapReaderTest, testLoadStringNoSpaces) {
+TEST(MapGeneratorTest, testLoadStringNoSpaces) {
   auto mockObjectGeneratorPtr = std::shared_ptr<MockObjectGenerator>(new MockObjectGenerator());
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
   auto mockWallObject = std::shared_ptr<MockObject>(new MockObject());
   auto mockAvatarObject = std::shared_ptr<MockObject>(new MockObject());
-  std::shared_ptr<MapReader> mapReader(new MapReader(mockObjectGeneratorPtr));
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+  std::shared_ptr<MapGenerator> mapReader(new MapGenerator(1, mockObjectGeneratorPtr));
 
   std::string wallObjectName = "wall";
   std::string avatarObjectName = "avatar";
@@ -181,6 +192,10 @@ TEST(MapReaderTest, testLoadStringNoSpaces) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wallObjectName), Eq(0), _))
       .Times(8)
       .WillRepeatedly(Return(mockWallObject));
@@ -207,12 +222,13 @@ TEST(MapReaderTest, testLoadStringNoSpaces) {
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(mockObjectGeneratorPtr.get()));
 }
 
-TEST(MapReaderTest, testLoadStringNoSpacesWithDots) {
+TEST(MapGeneratorTest, testLoadStringNoSpacesWithDots) {
   auto mockObjectGeneratorPtr = std::shared_ptr<MockObjectGenerator>(new MockObjectGenerator());
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
   auto mockWallObject = std::shared_ptr<MockObject>(new MockObject());
   auto mockAvatarObject = std::shared_ptr<MockObject>(new MockObject());
-  std::shared_ptr<MapReader> mapReader(new MapReader(mockObjectGeneratorPtr));
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+  std::shared_ptr<MapGenerator> mapReader(new MapGenerator(1, mockObjectGeneratorPtr));
 
   std::string wallObjectName = "wall";
   std::string avatarObjectName = "avatar";
@@ -240,6 +256,10 @@ TEST(MapReaderTest, testLoadStringNoSpacesWithDots) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wallObjectName), Eq(0), _))
       .Times(12)
       .WillRepeatedly(Return(mockWallObject));
diff --git a/tests/src/Mocks/Griddly/Core/LevelGenerators/MockLevelGenerator.hpp b/tests/src/Mocks/Griddly/Core/LevelGenerators/MockLevelGenerator.hpp
index f4be87153..6b57a9a74 100644
--- a/tests/src/Mocks/Griddly/Core/LevelGenerators/MockLevelGenerator.hpp
+++ b/tests/src/Mocks/Griddly/Core/LevelGenerators/MockLevelGenerator.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "Griddly/Core/GDY/Objects/ObjectGenerator.hpp"
-#include "Griddly/Core/LevelGenerators/MapReader.hpp"
 #include "gmock/gmock.h"
 
 namespace griddly {
diff --git a/tests/src/Mocks/Griddly/Core/MockGrid.hpp b/tests/src/Mocks/Griddly/Core/MockGrid.hpp
index a36860e67..5ec3f792b 100644
--- a/tests/src/Mocks/Griddly/Core/MockGrid.hpp
+++ b/tests/src/Mocks/Griddly/Core/MockGrid.hpp
@@ -19,11 +19,15 @@ class MockGrid : public Grid {
   MOCK_METHOD(uint32_t, getWidth, (), (const));
   MOCK_METHOD(uint32_t, getHeight, (), (const));
 
+  MOCK_METHOD(bool, invalidateLocation, (glm::ivec2 location));
+
   MOCK_METHOD(bool, updateLocation, (std::shared_ptr<Object> object, glm::ivec2 previousLocation, glm::ivec2 newLocation), ());
   MOCK_METHOD((std::unordered_map<uint32_t, int32_t>), performActions, (uint32_t playerId, std::vector<std::shared_ptr<Action>> actions), ());
 
   MOCK_METHOD(void, initObject, (std::string, std::vector<std::string>), ());
   MOCK_METHOD(void, addObject, (glm::ivec2 location, std::shared_ptr<Object> object, bool applyInitialActions), ());
+  MOCK_METHOD(void, addPlayerDefaultObject, (std::shared_ptr<Object> object));
+  MOCK_METHOD(std::shared_ptr<Object>, getPlayerDefaultObject, (uint32_t playerId), (const));
   MOCK_METHOD(bool, removeObject, (std::shared_ptr<Object> object), ());
 
   MOCK_METHOD((std::unordered_map<uint32_t, std::shared_ptr<int32_t>>), getObjectCounter, (std::string), ());

From 31d086a3349491a1fca395ce9aaa098520716423 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Sat, 26 Jun 2021 21:26:11 +0100
Subject: [PATCH 14/18] fixing tests

---
 python/examples/experiments/autoregressive-cats  |  2 +-
 python/examples/experiments/rts-self-play        |  2 +-
 src/Griddly/Core/Grid.cpp                        |  2 +-
 tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp    |  6 ++++++
 .../Core/LevelGenerator/MapReaderTest.cpp        | 16 ++++++++++++++++
 tests/src/Griddly/Core/TestUtils/common.hpp      | 12 +++++++++---
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/python/examples/experiments/autoregressive-cats b/python/examples/experiments/autoregressive-cats
index 3082d3c00..94edc6f6c 160000
--- a/python/examples/experiments/autoregressive-cats
+++ b/python/examples/experiments/autoregressive-cats
@@ -1 +1 @@
-Subproject commit 3082d3c00764ee59bf5d248054f10b56122d1450
+Subproject commit 94edc6f6c9ed5681e8fe5873f086b95a60c29834
diff --git a/python/examples/experiments/rts-self-play b/python/examples/experiments/rts-self-play
index 44a548664..c057f0233 160000
--- a/python/examples/experiments/rts-self-play
+++ b/python/examples/experiments/rts-self-play
@@ -1 +1 @@
-Subproject commit 44a548664c53a6e31771c0d59f65b01597307619
+Subproject commit c057f0233241feaddb58f4f1a29dd6b42202b418
diff --git a/src/Griddly/Core/Grid.cpp b/src/Griddly/Core/Grid.cpp
index 5fd36812d..619fe4059 100644
--- a/src/Griddly/Core/Grid.cpp
+++ b/src/Griddly/Core/Grid.cpp
@@ -193,7 +193,7 @@ GridEvent Grid::buildGridEvent(std::shared_ptr<Action> action, uint32_t playerId
 
   if (sourceObject->getObjectName() != "_empty") {
     event.sourceObjectPlayerId = sourceObject->getPlayerId();
-  }
+  } 
 
   if (destObject->getObjectName() != "_empty") {
     event.destinationObjectPlayerId = destObject->getPlayerId();
diff --git a/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp b/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
index 19b21af9b..126f05107 100644
--- a/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
+++ b/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
@@ -857,6 +857,9 @@ TEST(GDYFactoryTest, wallTest) {
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
       .WillRepeatedly(Return(mockDefaultObject));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(0), _))
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wall2String), Eq(0), _))
       .WillRepeatedly(Return(mockWall2Object));
 
@@ -913,6 +916,9 @@ TEST(GDYFactoryTest, zIndexTest) {
 
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
       .WillRepeatedly(Return(mockDefaultObject));
+      
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(0), _))
+      .WillRepeatedly(Return(mockDefaultObject));
 
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq(wall), Eq(0), _))
       .WillRepeatedly(Return(mockWallObject));
diff --git a/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp b/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp
index 7999ae1b8..2073e26c3 100644
--- a/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp
+++ b/tests/src/Griddly/Core/LevelGenerator/MapReaderTest.cpp
@@ -62,6 +62,10 @@ TEST(MapGeneratorTest, testLoadStringWithPlayerObjects) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(0), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
       .Times(1)
       .WillRepeatedly(Return(mockDefaultObject));
@@ -127,6 +131,10 @@ TEST(MapGeneratorTest, testLoadStringWithPlayerObjectsRandomWhitespace) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(0), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
       .Times(1)
       .WillRepeatedly(Return(mockDefaultObject));
@@ -192,6 +200,10 @@ TEST(MapGeneratorTest, testLoadStringNoSpaces) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(0), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
       .Times(1)
       .WillRepeatedly(Return(mockDefaultObject));
@@ -256,6 +268,10 @@ TEST(MapGeneratorTest, testLoadStringNoSpacesWithDots) {
       .Times(1)
       .WillRepeatedly(ReturnRef(avatarObjectName));
 
+  EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(0), _))
+      .Times(1)
+      .WillRepeatedly(Return(mockDefaultObject));
+
   EXPECT_CALL(*mockObjectGeneratorPtr, newInstance(Eq("_empty"), Eq(1), _))
       .Times(1)
       .WillRepeatedly(Return(mockDefaultObject));
diff --git a/tests/src/Griddly/Core/TestUtils/common.hpp b/tests/src/Griddly/Core/TestUtils/common.hpp
index 87f558d84..0c4abd3a8 100644
--- a/tests/src/Griddly/Core/TestUtils/common.hpp
+++ b/tests/src/Griddly/Core/TestUtils/common.hpp
@@ -46,9 +46,12 @@ std::shared_ptr<MockAction> static mockAction(std::string actionName, std::share
 std::shared_ptr<MockAction> static mockAction(std::string actionName, glm::ivec2 sourceLocation, glm::ivec2 destLocation) {
   auto mockActionPtr = std::shared_ptr<MockAction>(new MockAction());
 
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+  EXPECT_CALL(*mockDefaultObject, getObjectName()).WillRepeatedly(Return("_empty"));
+
   EXPECT_CALL(*mockActionPtr, getActionName()).WillRepeatedly(Return(actionName));
-  EXPECT_CALL(*mockActionPtr, getSourceObject()).WillRepeatedly(Return(nullptr));
-  EXPECT_CALL(*mockActionPtr, getDestinationObject()).WillRepeatedly(Return(nullptr));
+  EXPECT_CALL(*mockActionPtr, getSourceObject()).WillRepeatedly(Return(mockDefaultObject));
+  EXPECT_CALL(*mockActionPtr, getDestinationObject()).WillRepeatedly(Return(mockDefaultObject));
   EXPECT_CALL(*mockActionPtr, getSourceLocation()).WillRepeatedly(Return(sourceLocation));
   EXPECT_CALL(*mockActionPtr, getDestinationLocation()).WillRepeatedly(Return(destLocation));
   EXPECT_CALL(*mockActionPtr, getVectorToDest()).WillRepeatedly(Return(destLocation - sourceLocation));
@@ -59,9 +62,12 @@ std::shared_ptr<MockAction> static mockAction(std::string actionName, glm::ivec2
 std::shared_ptr<MockAction> static mockAction(std::string actionName, std::shared_ptr<Object> sourceObject, glm::ivec2 destLocation) {
   auto mockActionPtr = std::shared_ptr<MockAction>(new MockAction());
 
+  auto mockDefaultObject = std::shared_ptr<MockObject>(new MockObject());
+  EXPECT_CALL(*mockDefaultObject, getObjectName()).WillRepeatedly(Return("_empty"));
+
   EXPECT_CALL(*mockActionPtr, getActionName()).WillRepeatedly(Return(actionName));
   EXPECT_CALL(*mockActionPtr, getSourceObject()).WillRepeatedly(Return(sourceObject));
-  EXPECT_CALL(*mockActionPtr, getDestinationObject()).WillRepeatedly(Return(nullptr));
+  EXPECT_CALL(*mockActionPtr, getDestinationObject()).WillRepeatedly(Return(mockDefaultObject));
   EXPECT_CALL(*mockActionPtr, getSourceLocation()).WillRepeatedly(Return(sourceObject->getLocation()));
   EXPECT_CALL(*mockActionPtr, getDestinationLocation()).WillRepeatedly(Return(destLocation));
   EXPECT_CALL(*mockActionPtr, getVectorToDest()).WillRepeatedly(Return(destLocation - sourceObject->getLocation()));

From 8e4e95395354d09d0c79ae0d9df97b2455ec3cd2 Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Sun, 27 Jun 2021 09:27:34 +0100
Subject: [PATCH 15/18] removing video recording from egg_test as it does not
 run on test server

---
 python/examples/experiments/autoregressive-cats |  2 +-
 python/examples/experiments/rts-self-play       |  2 +-
 python/tests/egg_test.py                        | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/python/examples/experiments/autoregressive-cats b/python/examples/experiments/autoregressive-cats
index 94edc6f6c..3082d3c00 160000
--- a/python/examples/experiments/autoregressive-cats
+++ b/python/examples/experiments/autoregressive-cats
@@ -1 +1 @@
-Subproject commit 94edc6f6c9ed5681e8fe5873f086b95a60c29834
+Subproject commit 3082d3c00764ee59bf5d248054f10b56122d1450
diff --git a/python/examples/experiments/rts-self-play b/python/examples/experiments/rts-self-play
index c057f0233..44a548664 160000
--- a/python/examples/experiments/rts-self-play
+++ b/python/examples/experiments/rts-self-play
@@ -1 +1 @@
-Subproject commit c057f0233241feaddb58f4f1a29dd6b42202b418
+Subproject commit 44a548664c53a6e31771c0d59f65b01597307619
diff --git a/python/tests/egg_test.py b/python/tests/egg_test.py
index c04112d46..bd03c4c73 100644
--- a/python/tests/egg_test.py
+++ b/python/tests/egg_test.py
@@ -4,6 +4,7 @@
 
 from griddly import GymWrapperFactory, gd
 from griddly.util.environment_generator_generator import EnvironmentGeneratorGenerator
+from griddly.util.wrappers import ValidActionSpaceWrapper
 
 
 @pytest.fixture
@@ -33,19 +34,19 @@ def test_spider_nest_generator(test_name):
 
     genv = build_generator(test_name, yaml_file)
 
-    visualization = genv.render(observer=0, mode='rgb_array')
-    video_recorder = VideoRecorder()
-    video_recorder.start('generator_video_test.mp4', visualization.shape)
+    # visualization = genv.render(observer=0, mode='rgb_array')
+    # video_recorder = VideoRecorder()
+    # video_recorder.start('generator_video_test.mp4', visualization.shape)
 
     # Place 10 Random Objects
-    for i in range(0,10):
+    for i in range(0,1000):
         action = genv.action_space.sample()
         obs, reward, done, info = genv.step(action)
 
         state = genv.get_state()
 
         visual = genv.render(observer=0, mode='rgb_array')
-        video_recorder.add_frame(visual)
-        #assert len(state['Objects']) == i
+        # video_recorder.add_frame(visual)
 
-    video_recorder.close()
+
+    # video_recorder.close()

From 14a267c4ab8be1c596433cf8a9c493a22d4c821b Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Sun, 27 Jun 2021 16:29:27 +0100
Subject: [PATCH 16/18] lots of test fixing and ASCII Observer code

---
 python/examples/snippet.py                    |   4 +-
 .../util/environment_generator_generator.py   |  56 +-
 python/tests/egg_test.py                      |  27 +-
 src/Griddly/Core/GDY/GDYFactory.cpp           |   4 +-
 src/Griddly/Core/GDY/Objects/Object.cpp       |   8 +-
 src/Griddly/Core/GDY/Objects/Object.hpp       |   7 +-
 .../Core/GDY/Objects/ObjectGenerator.cpp      |  11 +-
 .../Core/GDY/Objects/ObjectGenerator.hpp      |   3 +-
 src/Griddly/Core/Observers/ASCIIObserver.cpp  | 226 +++++++
 src/Griddly/Core/Observers/ASCIIObserver.hpp  |  34 ++
 src/Griddly/Core/Observers/AsciiObserver.cpp  |   0
 src/Griddly/Core/Observers/AsciiObserver.hpp  |   0
 src/Griddly/Core/Observers/Observer.hpp       |   6 +-
 tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp |   8 +-
 .../Griddly/Core/GDY/Objects/ObjectTest.cpp   |  55 +-
 tests/src/Griddly/Core/GameProcessTest.cpp    |  14 +-
 tests/src/Griddly/Core/GridTest.cpp           |  36 +-
 .../Core/Observers/ASCIIObserverTest.cpp      | 550 ++++++++++++++++++
 .../Core/Observers/ObserverRTSTestData.hpp    |  42 +-
 .../Core/Observers/ObserverTestData.hpp       |   8 +-
 tests/src/Griddly/Core/TestUtils/common.hpp   |   3 +-
 .../Griddly/Core/GDY/Objects/MockObject.hpp   |   3 +-
 .../Core/GDY/Objects/MockObjectGenerator.hpp  |   2 +-
 23 files changed, 967 insertions(+), 140 deletions(-)
 create mode 100644 src/Griddly/Core/Observers/ASCIIObserver.cpp
 create mode 100644 src/Griddly/Core/Observers/ASCIIObserver.hpp
 delete mode 100644 src/Griddly/Core/Observers/AsciiObserver.cpp
 delete mode 100644 src/Griddly/Core/Observers/AsciiObserver.hpp
 create mode 100644 tests/src/Griddly/Core/Observers/ASCIIObserverTest.cpp

diff --git a/python/examples/snippet.py b/python/examples/snippet.py
index 8fb1cb3d4..f53962f52 100644
--- a/python/examples/snippet.py
+++ b/python/examples/snippet.py
@@ -9,7 +9,7 @@
 def make_env(name):
     wrapper = GymWrapperFactory()
     wrapper.build_gym_from_yaml(name, 'Single-Player/Mini-Grid/minigrid-spiders.yaml',
-                                player_observer_type=gd.ObserverType.SPRITE_2D,
+                                player_observer_type=gd.ObserverType.VECTOR,
                                 global_observer_type=gd.ObserverType.BLOCK_2D,
                                 level=0,
                                 max_steps=200)
@@ -38,7 +38,7 @@ def make_env(name):
 
         frames += 1
         obs, reward, done, info = env.step(action)
-        #env.render()
+        env.render()
         env.render(observer='global')
 
         if frames % 1000 == 0:
diff --git a/python/griddly/util/environment_generator_generator.py b/python/griddly/util/environment_generator_generator.py
index 52209c59a..4f1726a24 100644
--- a/python/griddly/util/environment_generator_generator.py
+++ b/python/griddly/util/environment_generator_generator.py
@@ -107,31 +107,33 @@ def generate_env(self, size, **env_kwargs):
 
     egg = EnvironmentGeneratorGenerator(yaml_file=yaml_file)
 
-    generator_yaml = egg.generate_env_yaml((10, 50))
-
-    wrapper_factory.build_gym_from_yaml_string(
-        'test',
-        yaml_string=generator_yaml,
-        # TODO: Change this to ASCII observer when its ready
-        global_observer_type=gd.ObserverType.SPRITE_2D,
-        player_observer_type=gd.ObserverType.SPRITE_2D,
-    )
-
-    env = gym.make(f'GDY-test-v0')
-    env.reset()
-    #env = ValidActionSpaceWrapper(env)
-
-    visualization = env.render(observer=0, mode='rgb_array')
-    video_recorder = VideoRecorder()
-    video_recorder.start('generator_video_test.mp4', visualization.shape)
-
-    # Place 10 Random Objects
-    for i in range(0, 100):
-        action = env.action_space.sample()
-        obs, reward, done, info = env.step(action)
-
-        state = env.get_state()
-
-        visual = env.render(observer=0, mode='rgb_array')
-        video_recorder.add_frame(visual)
+    for i in range(100):
+        generator_yaml = egg.generate_env_yaml((10, 10))
+
+        env_name = f'test_{i}'
+        wrapper_factory.build_gym_from_yaml_string(
+            env_name,
+            yaml_string=generator_yaml,
+            # TODO: Change this to ASCII observer when its ready
+            global_observer_type=gd.ObserverType.VECTOR,
+            player_observer_type=gd.ObserverType.VECTOR,
+        )
+
+        env = gym.make(f'GDY-{env_name}-v0')
+        env.reset()
+        #env = ValidActionSpaceWrapper(env)
+
+        # visualization = env.render(observer=0, mode='rgb_array')
+        # video_recorder = VideoRecorder()
+        # video_recorder.start('generator_video_test.mp4', visualization.shape)
+
+        # Place 10 Random Objects
+        for i in range(0, 100):
+            action = env.action_space.sample()
+            obs, reward, done, info = env.step(action)
+
+            #state = env.get_state()
+
+            #visual = env.render(observer=0, mode='rgb_array')
+            # video_recorder.add_frame(visual)
 
diff --git a/python/tests/egg_test.py b/python/tests/egg_test.py
index bd03c4c73..d0c363e8d 100644
--- a/python/tests/egg_test.py
+++ b/python/tests/egg_test.py
@@ -20,8 +20,8 @@ def build_generator(test_name, yaml_file):
         test_name,
         yaml_string=generator_yaml,
         # TODO: Change this to ASCII observer when its ready
-        global_observer_type=gd.ObserverType.SPRITE_2D,
-        player_observer_type=gd.ObserverType.SPRITE_2D,
+        global_observer_type=gd.ObserverType.VECTOR,
+        player_observer_type=gd.ObserverType.VECTOR,
     )
 
     env = gym.make(f'GDY-{test_name}-v0')
@@ -32,21 +32,22 @@ def test_spider_nest_generator(test_name):
 
     yaml_file = 'Single-Player/GVGAI/spider-nest.yaml'
 
-    genv = build_generator(test_name, yaml_file)
+    for i in range(10):
+        genv = build_generator(test_name+f'{i}', yaml_file)
 
-    # visualization = genv.render(observer=0, mode='rgb_array')
-    # video_recorder = VideoRecorder()
-    # video_recorder.start('generator_video_test.mp4', visualization.shape)
+        # visualization = genv.render(observer=0, mode='rgb_array')
+        # video_recorder = VideoRecorder()
+        # video_recorder.start('generator_video_test.mp4', visualization.shape)
 
-    # Place 10 Random Objects
-    for i in range(0,1000):
-        action = genv.action_space.sample()
-        obs, reward, done, info = genv.step(action)
+        # Place 10 Random Objects
+        for i in range(0, 100):
+            action = genv.action_space.sample()
+            obs, reward, done, info = genv.step(action)
 
-        state = genv.get_state()
+            state = genv.get_state()
 
-        visual = genv.render(observer=0, mode='rgb_array')
-        # video_recorder.add_frame(visual)
+            visual = genv.render(observer=0, mode='rgb_array')
+            # video_recorder.add_frame(visual)
 
 
     # video_recorder.close()
diff --git a/src/Griddly/Core/GDY/GDYFactory.cpp b/src/Griddly/Core/GDY/GDYFactory.cpp
index cd57aaecf..4303aafb6 100644
--- a/src/Griddly/Core/GDY/GDYFactory.cpp
+++ b/src/Griddly/Core/GDY/GDYFactory.cpp
@@ -330,7 +330,7 @@ void GDYFactory::loadObjects(YAML::Node objects) {
   for (std::size_t i = 0; i < objects.size(); i++) {
     auto object = objects[i];
     auto objectName = object["Name"].as<std::string>();
-    auto mapChar = object["MapCharacter"].as<char>('\0');
+    auto mapCharacter = object["MapCharacter"].as<char>('?');
     auto observerDefinitions = object["Observers"];
 
     if (observerDefinitions.IsDefined()) {
@@ -357,7 +357,7 @@ void GDYFactory::loadObjects(YAML::Node objects) {
       zIdx = objectZIdx.as<uint32_t>();
     }
 
-    objectGenerator_->defineNewObject(objectName, zIdx, mapChar, variableDefinitions);
+    objectGenerator_->defineNewObject(objectName, mapCharacter, zIdx, variableDefinitions);
 
     auto initialActionsNode = object["InitialActions"];
 
diff --git a/src/Griddly/Core/GDY/Objects/Object.cpp b/src/Griddly/Core/GDY/Objects/Object.cpp
index 8f4081629..2eea27cde 100644
--- a/src/Griddly/Core/GDY/Objects/Object.cpp
+++ b/src/Griddly/Core/GDY/Objects/Object.cpp
@@ -9,8 +9,8 @@
 
 namespace griddly {
 
-Object::Object(std::string objectName, uint32_t playerId, uint32_t zIdx, std::unordered_map<std::string, std::shared_ptr<int32_t>> availableVariables, std::shared_ptr<ObjectGenerator> objectGenerator)
-    : objectName_(objectName), zIdx_(zIdx), objectGenerator_(objectGenerator) {
+Object::Object(std::string objectName, char mapCharacter, uint32_t playerId, uint32_t zIdx, std::unordered_map<std::string, std::shared_ptr<int32_t>> availableVariables, std::shared_ptr<ObjectGenerator> objectGenerator)
+    : objectName_(objectName), mapCharacter_(mapCharacter), zIdx_(zIdx), objectGenerator_(objectGenerator) {
   availableVariables.insert({"_x", x_});
   availableVariables.insert({"_y", y_});
 
@@ -663,6 +663,10 @@ std::string Object::getObjectName() const {
   return objectName_;
 }
 
+char Object::getMapCharacter() const {
+  return mapCharacter_;
+}
+
 std::string Object::getObjectRenderTileName() const {
   return objectName_ + std::to_string(renderTileId_);
 }
diff --git a/src/Griddly/Core/GDY/Objects/Object.hpp b/src/Griddly/Core/GDY/Objects/Object.hpp
index 0a74197cc..0f9f527a8 100644
--- a/src/Griddly/Core/GDY/Objects/Object.hpp
+++ b/src/Griddly/Core/GDY/Objects/Object.hpp
@@ -66,6 +66,8 @@ class Object : public std::enable_shared_from_this<Object> {
 
   virtual std::string getObjectName() const;
 
+  virtual char getMapCharacter() const;
+
   virtual std::string getObjectRenderTileName() const;
 
   virtual std::string getDescription() const;
@@ -102,7 +104,7 @@ class Object : public std::enable_shared_from_this<Object> {
   virtual std::vector<std::shared_ptr<Action>> getInitialActions();
   virtual void setInitialActionDefinitions(std::vector<InitialActionDefinition> actionDefinitions);
 
-  Object(std::string objectName, uint32_t playerId, uint32_t zIdx, std::unordered_map<std::string, std::shared_ptr<int32_t>> availableVariables, std::shared_ptr<ObjectGenerator> objectGenerator);
+  Object(std::string objectName, char mapCharacter, uint32_t playerId, uint32_t zIdx, std::unordered_map<std::string, std::shared_ptr<int32_t>> availableVariables, std::shared_ptr<ObjectGenerator> objectGenerator);
 
   ~Object();
 
@@ -115,6 +117,7 @@ class Object : public std::enable_shared_from_this<Object> {
 
   std::shared_ptr<int32_t> playerId_ = std::make_shared<int32_t>(0);
   const std::string objectName_;
+  const char mapCharacter_;
   const uint32_t zIdx_;
   uint32_t renderTileId_ = 0;
   bool isPlayerAvatar_ = false;
@@ -153,8 +156,6 @@ class Object : public std::enable_shared_from_this<Object> {
   BehaviourFunction instantiateBehaviour(std::string commandName, BehaviourCommandArguments commandArguments);
   BehaviourFunction instantiateConditionalBehaviour(std::string commandName, BehaviourCommandArguments commandArguments, CommandList subCommands);
 
-  std::string getStringMapValue(std::unordered_map<std::string, std::string> map, std::string mapKey);
-
   ActionExecutor getActionExecutorFromString(std::string executorString) const;
 };
 
diff --git a/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp b/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp
index 190a4f177..bfa872858 100644
--- a/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp
+++ b/src/Griddly/Core/GDY/Objects/ObjectGenerator.cpp
@@ -22,16 +22,17 @@ ObjectGenerator::ObjectGenerator() {
 ObjectGenerator::~ObjectGenerator() {
 }
 
-void ObjectGenerator::defineNewObject(std::string objectName, uint32_t zIdx, char mapChar, std::unordered_map<std::string, uint32_t> variableDefinitions) {
+void ObjectGenerator::defineNewObject(std::string objectName, char mapCharacter, uint32_t zIdx, std::unordered_map<std::string, uint32_t> variableDefinitions) {
   spdlog::debug("Defining new object {0}", objectName);
 
   ObjectDefinition objectDefinition;
   objectDefinition.objectName = objectName;
+  objectDefinition.mapCharacter = mapCharacter;
   objectDefinition.zIdx = zIdx;
   objectDefinition.variableDefinitions = variableDefinitions;
 
   objectDefinitions_.insert({objectName, std::make_shared<ObjectDefinition>(objectDefinition)});
-  objectChars_[mapChar] = objectName;
+  objectChars_[mapCharacter] = objectName;
 }
 
 void ObjectGenerator::defineActionBehaviour(
@@ -86,7 +87,8 @@ std::shared_ptr<Object> ObjectGenerator::cloneInstance(std::shared_ptr<Object> t
   }
 
   auto objectZIdx = objectDefinition->zIdx;
-  auto initializedObject = std::shared_ptr<Object>(new Object(objectName, playerId, objectZIdx, availableVariables, shared_from_this()));
+  auto mapCharacter = objectDefinition->mapCharacter;
+  auto initializedObject = std::shared_ptr<Object>(new Object(objectName, mapCharacter, playerId, objectZIdx, availableVariables, shared_from_this()));
 
   if (objectName == avatarObject_) {
     initializedObject->markAsPlayerAvatar();
@@ -165,7 +167,8 @@ std::shared_ptr<Object> ObjectGenerator::newInstance(std::string objectName, uin
   }
 
   auto objectZIdx = objectDefinition->zIdx;
-  auto initializedObject = std::shared_ptr<Object>(new Object(objectName, playerId, objectZIdx, availableVariables, shared_from_this()));
+  auto mapCharacter = objectDefinition->mapCharacter;
+  auto initializedObject = std::shared_ptr<Object>(new Object(objectName, mapCharacter, playerId, objectZIdx, availableVariables, shared_from_this()));
 
   if (isAvatar) {
     initializedObject->markAsPlayerAvatar();
diff --git a/src/Griddly/Core/GDY/Objects/ObjectGenerator.hpp b/src/Griddly/Core/GDY/Objects/ObjectGenerator.hpp
index da3bde46c..51429cac9 100644
--- a/src/Griddly/Core/GDY/Objects/ObjectGenerator.hpp
+++ b/src/Griddly/Core/GDY/Objects/ObjectGenerator.hpp
@@ -26,6 +26,7 @@ struct ActionBehaviourDefinition {
 
 struct ObjectDefinition {
   std::string objectName;
+  char mapCharacter;
   std::unordered_map<std::string, uint32_t> variableDefinitions;
   std::vector<ActionBehaviourDefinition> actionBehaviourDefinitions;
   std::vector<InitialActionDefinition> initialActionDefinitions;
@@ -38,7 +39,7 @@ class ObjectGenerator : public std::enable_shared_from_this<ObjectGenerator> {
 
   ~ObjectGenerator();
 
-  virtual void defineNewObject(std::string objectName, uint32_t zIdx, char mapChar, std::unordered_map<std::string, uint32_t> variableDefinitions);
+  virtual void defineNewObject(std::string objectName, char mapCharacter, uint32_t zIdx, std::unordered_map<std::string, uint32_t> variableDefinitions);
   virtual void defineActionBehaviour(std::string objectName, ActionBehaviourDefinition behaviourDefinition);
   virtual void addInitialAction(std::string objectName, std::string actionName, uint32_t actionId, uint32_t delay, bool randomize=false);
 
diff --git a/src/Griddly/Core/Observers/ASCIIObserver.cpp b/src/Griddly/Core/Observers/ASCIIObserver.cpp
new file mode 100644
index 000000000..deb2fd8b4
--- /dev/null
+++ b/src/Griddly/Core/Observers/ASCIIObserver.cpp
@@ -0,0 +1,226 @@
+#include "ASCIIObserver.hpp"
+
+#define SPDLOG_HEADER_ONLY
+#include <spdlog/fmt/fmt.h>
+#include <spdlog/spdlog.h>
+
+namespace griddly {
+
+ASCIIObserver::ASCIIObserver(std::shared_ptr<Grid> grid) : Observer(grid) {}
+
+ASCIIObserver::~ASCIIObserver() {}
+
+void ASCIIObserver::init(ObserverConfig observerConfig) {
+  Observer::init(observerConfig);
+}
+
+void ASCIIObserver::reset() {
+  Observer::reset();
+
+  // there are no additional steps until this observer can be used.
+  observerState_ = ObserverState::READY;
+}
+
+ObserverType ASCIIObserver::getObserverType() const {
+  return ObserverType::ASCII;
+}
+
+glm::ivec2 ASCIIObserver::getTileSize() const {
+  return glm::ivec2{1, 1};
+}
+
+void ASCIIObserver::resetShape() {
+  gridWidth_ = observerConfig_.overrideGridWidth > 0 ? observerConfig_.overrideGridWidth : grid_->getWidth();
+  gridHeight_ = observerConfig_.overrideGridHeight > 0 ? observerConfig_.overrideGridHeight : grid_->getHeight();
+
+  gridBoundary_.x = grid_->getWidth();
+  gridBoundary_.y = grid_->getHeight();
+
+  observationChannels_ = observerConfig_.asciiPadWidth;
+
+  observationShape_ = {observationChannels_, gridWidth_, gridHeight_};
+  observationStrides_ = {1, observationChannels_, observationChannels_ * gridWidth_};
+
+  size_t obsBufferSize = observationChannels_ * gridWidth_ * gridHeight_;
+
+  observation_ = std::shared_ptr<uint8_t>(new uint8_t[obsBufferSize]);
+  memset(observation_.get(), ' ', obsBufferSize);
+
+  trackAvatar_ = avatarObject_ != nullptr;
+}
+
+void ASCIIObserver::renderLocation(glm::ivec2 objectLocation, glm::ivec2 outputLocation, bool resetLocation) const {
+  auto charPtr = observation_.get() + observationChannels_ * (gridWidth_ * outputLocation.y + outputLocation.x);
+
+  if (resetLocation) {
+    auto size = sizeof(uint8_t) * observationChannels_;
+    memset(charPtr, ' ', size);
+  }
+
+  char mapCharacter;
+  if (grid_->getObjectsAt(objectLocation).size() > 0) {
+    auto objectIt = grid_->getObjectsAt(objectLocation).begin();
+    auto object = objectIt->second;
+    auto objectName = object->getObjectName();
+    mapCharacter = object->getMapCharacter();
+
+    spdlog::debug("Rendering object {0}", objectName);
+
+    charPtr[0] = mapCharacter;
+    if (observerConfig_.includePlayerId) {
+      // if we are including the player ID, we always set player = 1 from the perspective of the agent being controlled.
+      // e.g if this is observer is owned by player 3 then objects owned by player 3 will be rendered as "player 1".
+      // This is so multi-agent games always see the agents they are controlling from first person perspective
+      uint32_t playerIdx = 0;
+      uint32_t objectPlayerId = object->getPlayerId();
+
+      if (objectPlayerId == 0 || observerConfig_.playerId == 0) {
+        playerIdx = objectPlayerId;
+      } else if (objectPlayerId < observerConfig_.playerId) {
+        playerIdx = objectPlayerId + 1;
+      } else if (objectPlayerId == observerConfig_.playerId) {
+        playerIdx = 1;
+      } else {
+        playerIdx = objectPlayerId;
+      }
+
+      if (playerIdx > 0) {
+        auto playerIdxString = std::to_string(playerIdx);
+        memcpy(charPtr + 1, playerIdxString.c_str(), sizeof(char) * playerIdxString.length());
+      }
+    }
+
+  } else {
+    charPtr[0] = '.';
+  }
+}
+
+uint8_t* ASCIIObserver::update() {
+  spdlog::debug("ASCII renderer updating.");
+
+  if (observerState_ != ObserverState::READY) {
+    throw std::runtime_error("Observer not ready, must be initialized and reset before update() can be called.");
+  }
+
+  if (trackAvatar_) {
+    spdlog::debug("Tracking Avatar.");
+
+    auto avatarLocation = avatarObject_->getLocation();
+    auto avatarOrientation = avatarObject_->getObjectOrientation();
+    auto avatarDirection = avatarOrientation.getDirection();
+
+    // Have to reset the observation
+    auto size = sizeof(uint8_t) * observationChannels_ * gridWidth_ * gridHeight_;
+    memset(observation_.get(), ' ', size);
+
+    if (observerConfig_.rotateWithAvatar) {
+      // Assuming here that gridWidth and gridHeight are odd numbers
+      auto pGrid = getAvatarObservableGrid(avatarLocation, avatarDirection);
+      uint32_t outx = 0, outy = 0;
+      switch (avatarDirection) {
+        default:
+        case Direction::UP:
+        case Direction::NONE:
+          for (auto objx = pGrid.left; objx <= pGrid.right; objx++) {
+            outy = 0;
+            for (auto objy = pGrid.bottom; objy <= pGrid.top; objy++) {
+              renderLocation({objx, objy}, {outx, outy});
+              outy++;
+            }
+            outx++;
+          }
+          break;
+        case Direction::DOWN:
+          outx = gridWidth_ - 1;
+          for (auto objx = pGrid.left; objx <= pGrid.right; objx++) {
+            outy = gridHeight_ - 1;
+            for (auto objy = pGrid.bottom; objy <= pGrid.top; objy++) {
+              renderLocation({objx, objy}, {outx, outy});
+              outy--;
+            }
+            outx--;
+          }
+          break;
+        case Direction::RIGHT:
+          outy = gridHeight_ - 1;
+          for (auto objx = pGrid.left; objx <= pGrid.right; objx++) {
+            outx = 0;
+            for (auto objy = pGrid.bottom; objy <= pGrid.top; objy++) {
+              renderLocation({objx, objy}, {outx, outy});
+              outx++;
+            }
+            outy--;
+          }
+          break;
+        case Direction::LEFT:
+          for (auto objx = pGrid.left; objx <= pGrid.right; objx++) {
+            outx = gridWidth_ - 1;
+            for (auto objy = pGrid.bottom; objy <= pGrid.top; objy++) {
+              renderLocation({objx, objy}, {outx, outy});
+              outx--;
+            }
+            outy++;
+          }
+          break;
+      }
+
+    } else {
+      auto pGrid = getAvatarObservableGrid(avatarLocation, Direction::NONE);
+
+      uint32_t outx = 0, outy = 0;
+      for (auto objx = pGrid.left; objx <= pGrid.right; objx++) {
+        outy = 0;
+        for (auto objy = pGrid.bottom; objy <= pGrid.top; objy++) {
+          if (objx < gridBoundary_.x && objx >= 0 && objy < gridBoundary_.y && objy >= 0) {
+            renderLocation({objx, objy}, {outx, outy});
+          }
+          outy++;
+        }
+        outx++;
+      }
+    }
+  } else {
+    const auto& updatedLocations = grid_->getUpdatedLocations(observerConfig_.playerId);
+
+    for (auto& location : updatedLocations) {
+      if (location.x >= observerConfig_.gridXOffset &&
+          location.x < gridWidth_ + observerConfig_.gridXOffset &&
+          location.y >= observerConfig_.gridYOffset &&
+          location.y < gridHeight_ + observerConfig_.gridYOffset) {
+        auto outputLocation = glm::ivec2(
+            location.x - observerConfig_.gridXOffset,
+            location.y - observerConfig_.gridYOffset);
+
+        spdlog::debug("Rendering location {0}, {1}.", location.x, location.y);
+
+        if (outputLocation.x < gridWidth_ && outputLocation.x >= 0 && outputLocation.y < gridHeight_ && outputLocation.y >= 0) {
+          renderLocation(location, outputLocation, true);
+        }
+      }
+    }
+  }
+
+  spdlog::debug("Purging update locations.");
+
+  grid_->purgeUpdatedLocations(observerConfig_.playerId);
+
+  spdlog::debug("ASCII renderer done.");
+
+  return observation_.get();
+}
+
+void ASCIIObserver::print(std::shared_ptr<uint8_t> observation) {
+  std::string printString;
+
+  // for (int h = height - 1; h >= 0; h--) {
+  //   printString += "[";
+  //   for (int w = 0; w < width; w++) {
+  //     int idx = h * width + w;
+  //     printString += " " + std::to_string(observation.get()[idx]) + " ";
+  //   }
+  //   printString += "]\n";
+  // }
+  spdlog::debug("TileObservation: \n {0}", printString);
+}
+
+}  // namespace griddly
\ No newline at end of file
diff --git a/src/Griddly/Core/Observers/ASCIIObserver.hpp b/src/Griddly/Core/Observers/ASCIIObserver.hpp
new file mode 100644
index 000000000..dbc3c3966
--- /dev/null
+++ b/src/Griddly/Core/Observers/ASCIIObserver.hpp
@@ -0,0 +1,34 @@
+#include "../Grid.hpp"
+#include "Observer.hpp"
+
+namespace griddly {
+
+class ASCIIObserver : public Observer {
+ public:
+  ASCIIObserver(std::shared_ptr<Grid> grid);
+  ~ASCIIObserver() override;
+
+  void init(ObserverConfig observerConfig) override;
+
+  uint8_t* update() override;
+  void reset() override;
+  void resetShape() override;
+
+  ObserverType getObserverType() const override;
+  glm::ivec2 getTileSize() const override;
+
+  void print(std::shared_ptr<uint8_t> observation) override;
+
+ protected:
+  void renderLocation(glm::ivec2 objectLocation, glm::ivec2 outputLocation, bool resetLocation=false) const;
+
+ private:
+  std::shared_ptr<uint8_t> observation_;
+  bool trackAvatar_;
+  uint32_t observationChannels_;
+  uint32_t channelsBeforePlayerCount_;
+  uint32_t channelsBeforeRotation_;
+  uint32_t channelsBeforeVariables_;
+};
+
+}  // namespace griddly
\ No newline at end of file
diff --git a/src/Griddly/Core/Observers/AsciiObserver.cpp b/src/Griddly/Core/Observers/AsciiObserver.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Griddly/Core/Observers/AsciiObserver.hpp b/src/Griddly/Core/Observers/AsciiObserver.hpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Griddly/Core/Observers/Observer.hpp b/src/Griddly/Core/Observers/Observer.hpp
index 5a6899cdc..8df745188 100644
--- a/src/Griddly/Core/Observers/Observer.hpp
+++ b/src/Griddly/Core/Observers/Observer.hpp
@@ -23,6 +23,9 @@ struct ObserverConfig {
   bool includeVariables = false;
   bool includeRotation = false;
   bool includePlayerId = false;
+
+  // Config for ASCII observers
+  uint32_t asciiPadWidth = 4;
 };
 
 struct PartialObservableGrid {
@@ -36,7 +39,8 @@ enum class ObserverType { NONE,
                           SPRITE_2D,
                           BLOCK_2D,
                           ISOMETRIC,
-                          VECTOR };
+                          VECTOR,
+                          ASCII };
 
 enum class ObserverState {
   NONE, INITIALISED, RESET, READY
diff --git a/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp b/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
index 126f05107..22a228ea4 100644
--- a/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
+++ b/tests/src/Griddly/Core/GDY/GDYFactoryTest.cpp
@@ -440,13 +440,13 @@ TEST(GDYFactoryTest, loadObjects) {
 
   auto expectedVariables = std::unordered_map<std::string, uint32_t>{{"resources", 0}, {"health", 10}};
 
-  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object"), Eq(0), Eq('O'), Eq(expectedVariables)))
+  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object"), Eq('O'), Eq(0), Eq(expectedVariables)))
       .Times(1);
 
-  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object_simple_sprite"), Eq(0), Eq('M'), Eq(std::unordered_map<std::string, uint32_t>{})))
+  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object_simple_sprite"), Eq('M'), Eq(0), Eq(std::unordered_map<std::string, uint32_t>{})))
       .Times(1);
 
-  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object_simple"), Eq(0), Eq(0), Eq(std::unordered_map<std::string, uint32_t>{})))
+  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object_simple"), Eq('?'), Eq(0), Eq(std::unordered_map<std::string, uint32_t>{})))
       .Times(1);
 
   gdyFactory->loadObjects(objectsNode);
@@ -494,7 +494,7 @@ TEST(GDYFactoryTest, load_object_initial_actions) {
 
   auto objectsNode = loadFromStringAndGetNode(std::string(yamlString), "Objects");
 
-  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object"), Eq(0), Eq('\0'), Eq(std::unordered_map<std::string, uint32_t>{})))
+  EXPECT_CALL(*mockObjectGeneratorPtr, defineNewObject(Eq("object"), Eq('?'), Eq(0), Eq(std::unordered_map<std::string, uint32_t>{})))
       .Times(1);
 
   EXPECT_CALL(*mockObjectGeneratorPtr, addInitialAction(Eq("object"), Eq("action_1"), Eq(2), Eq(10), Eq(false)))
diff --git a/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp b/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp
index fb99d1312..ed5bf93fc 100644
--- a/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp
+++ b/tests/src/Griddly/Core/GDY/Objects/ObjectTest.cpp
@@ -125,7 +125,7 @@ std::shared_ptr<MockAction> setupAction(std::string actionName, std::shared_ptr<
 
 TEST(ObjectTest, getLocation) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
-  auto object = std::shared_ptr<Object>(new Object("object", 0, 0, {}, nullptr));
+  auto object = std::shared_ptr<Object>(new Object("object", 'o', 0, 0, {}, nullptr));
 
   object->init({5, 5}, mockGridPtr);
 
@@ -136,7 +136,7 @@ TEST(ObjectTest, getLocation) {
 
 TEST(ObjectTest, getObjectName) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
-  auto object = std::shared_ptr<Object>(new Object("object", 0, 0, {}, nullptr));
+  auto object = std::shared_ptr<Object>(new Object("object", 'o', 0, 0, {}, nullptr));
 
   ASSERT_EQ(object->getObjectName(), "object");
 
@@ -145,7 +145,7 @@ TEST(ObjectTest, getObjectName) {
 
 TEST(ObjectTest, getDescription) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
-  auto object = std::shared_ptr<Object>(new Object("object", 0, 0, {}, nullptr));
+  auto object = std::shared_ptr<Object>(new Object("object", 'o', 0, 0, {}, nullptr));
 
   object->init({9, 6}, mockGridPtr);
 
@@ -156,7 +156,7 @@ TEST(ObjectTest, getDescription) {
 
 TEST(ObjectTest, getPlayerId) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
-  auto object = std::shared_ptr<Object>(new Object("object", 2, 0, {}, nullptr));
+  auto object = std::shared_ptr<Object>(new Object("object", 'o', 2, 0, {}, nullptr));
 
   object->init({5, 5}, mockGridPtr);
 
@@ -167,7 +167,7 @@ TEST(ObjectTest, getPlayerId) {
 
 TEST(ObjectTest, getVariables) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
-  auto object = std::shared_ptr<Object>(new Object("object", 2, 0, {{"test_param", _V(20)}}, nullptr));
+  auto object = std::shared_ptr<Object>(new Object("object", 'o', 2, 0, {{"test_param", _V(20)}}, nullptr));
 
   ASSERT_EQ(*object->getVariableValue("test_param"), 20);
 
@@ -184,8 +184,8 @@ TEST(ObjectTest, getVariables) {
 TEST(ObjectTest, actionBoundToSrc) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, dstObject);
 
@@ -201,8 +201,8 @@ TEST(ObjectTest, actionBoundToSrc) {
 TEST(ObjectTest, actionBoundToDst) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, dstObject);
 
@@ -220,7 +220,7 @@ TEST(ObjectTest, actionBoundToDst) {
 TEST(ObjectTest, actionDestinationObjectDifferentFromOriginalObject) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, glm::ivec2{1, 1});
 
@@ -237,8 +237,8 @@ TEST(ObjectTest, actionDestinationObjectDifferentFromOriginalObject) {
 TEST(ObjectTest, srcActionNoBehaviourForDstObject) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, dstObject);
 
@@ -255,8 +255,8 @@ TEST(ObjectTest, srcActionNoBehaviourForDstObject) {
 TEST(ObjectTest, srcActionNoBehaviourForAction) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, dstObject);
 
@@ -270,8 +270,8 @@ TEST(ObjectTest, srcActionNoBehaviourForAction) {
 TEST(ObjectTest, dstActionNoBehaviourForDstObject) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, dstObject);
 
@@ -288,8 +288,8 @@ TEST(ObjectTest, dstActionNoBehaviourForDstObject) {
 TEST(ObjectTest, dstActionNoBehaviourForAction) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction("action", srcObject, dstObject);
 
@@ -307,7 +307,7 @@ struct CommandTestResult {
 };
 
 std::shared_ptr<Object> setupObject(uint32_t playerId, std::string objectname, glm::ivec2 location, DiscreteOrientation orientation, std::unordered_map<std::string, std::shared_ptr<int32_t>> initialVariables, std::shared_ptr<MockGrid> mockGridPtr, std::shared_ptr<ObjectGenerator> objectGenerator) {
-  auto object = std::shared_ptr<Object>(new Object(objectname, playerId, 0, initialVariables, objectGenerator));
+  auto object = std::shared_ptr<Object>(new Object(objectname, 'o', playerId, 0, initialVariables, objectGenerator));
 
   if (mockGridPtr != nullptr) {
     object->init(location, orientation, mockGridPtr);
@@ -1163,7 +1163,7 @@ TEST(ObjectTest, command_eq) {
   //*           Arguments: [resource, 1]
   //*           Commands:
   //*             - decr: resource
-  
+
   auto mockGridPtr = mockGrid();
   auto srcObjectPtr = setupObject("srcObject", {{"resource", _V(0)}}, mockGridPtr);
   auto dstObjectPtr = setupObject("dstObject", {{"resource", _V(1)}}, mockGridPtr);
@@ -1197,7 +1197,7 @@ TEST(ObjectTest, command_eq_qualifiers) {
   //*           Arguments: [src.resource, 1]
   //*           Commands:
   //*             - decr: resource
-  
+
   auto mockGridPtr = mockGrid();
   auto srcObjectPtr = setupObject("srcObject", {{"resource", _V(0)}}, mockGridPtr);
   auto dstObjectPtr = setupObject("dstObject", {{"resource", _V(1)}}, mockGridPtr);
@@ -1322,8 +1322,8 @@ TEST(ObjectTest, isValidAction) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
   auto actionName = "action";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {{"counter", _V(5)}}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {{"counter", _V(5)}}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction(actionName, srcObject, dstObject);
   // auto mockActionPtr = std::shared_ptr<MockAction>(new MockAction());
@@ -1339,15 +1339,14 @@ TEST(ObjectTest, isValidAction) {
   // preconditions should come back as true because the counter value is equal to 5
   ASSERT_EQ(*srcObject->getVariableValue("counter"), 5);
   ASSERT_TRUE(preconditionResult);
-
 }
 
 TEST(ObjectTest, isValidActionNotDefinedForAction) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
   auto actionName = "action";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {{"counter", _V(5)}}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {{"counter", _V(5)}}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction(actionName, srcObject, dstObject);
 
@@ -1366,8 +1365,8 @@ TEST(ObjectTest, isValidActionNotDefinedForDestination) {
   auto srcObjectName = "srcObject";
   auto dstObjectName = "dstObject";
   auto actionName = "action";
-  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 0, 0, {{"counter", _V(5)}}, nullptr));
-  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 0, 0, {}, nullptr));
+  auto srcObject = std::shared_ptr<Object>(new Object(srcObjectName, 'S', 0, 0, {{"counter", _V(5)}}, nullptr));
+  auto dstObject = std::shared_ptr<Object>(new Object(dstObjectName, 'D', 0, 0, {}, nullptr));
 
   auto mockActionPtr = setupAction(actionName, srcObject, dstObject);
 
diff --git a/tests/src/Griddly/Core/GameProcessTest.cpp b/tests/src/Griddly/Core/GameProcessTest.cpp
index ddb77b651..4ecadc10a 100644
--- a/tests/src/Griddly/Core/GameProcessTest.cpp
+++ b/tests/src/Griddly/Core/GameProcessTest.cpp
@@ -783,9 +783,9 @@ TEST(GameProcessTest, performActionsDelayedReward) {
 
 TEST(GameProcessTest, getAvailableActionNames) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
-  auto mockObject1 = mockObject("object", 0, 0, {0, 1}, DiscreteOrientation(), {"move", "internal"});
-  auto mockObject2 = mockObject("object", 1, 0, {4, 6}, DiscreteOrientation(), {"move", "fire"});
-  auto mockObject3 = mockObject("object", 1, 0, {20, 13}, DiscreteOrientation(), {});
+  auto mockObject1 = mockObject("object", 'o', 0, 0, {0, 1}, DiscreteOrientation(), {"move", "internal"});
+  auto mockObject2 = mockObject("object", 'o', 1, 0, {4, 6}, DiscreteOrientation(), {"move", "fire"});
+  auto mockObject3 = mockObject("object", 'o', 1, 0, {20, 13}, DiscreteOrientation(), {});
 
   auto objects = std::unordered_set<std::shared_ptr<Object>>{mockObject1, mockObject2, mockObject3};
 
@@ -856,7 +856,7 @@ TEST(GameProcessTest, getAvailableIdsForActionType) {
   auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
 
   auto objectLocation = glm::ivec2{0, 1};
-  auto mockObject1 = mockObject("object", 1, 0, objectLocation, DiscreteOrientation(), {"move", "attack"});
+  auto mockObject1 = mockObject("object", 'o', 1, 0, objectLocation, DiscreteOrientation(), {"move", "attack"});
 
   EXPECT_CALL(*mockGridPtr, getObject(Eq(objectLocation)))
       .Times(2)
@@ -917,9 +917,9 @@ TEST(GameProcessTest, getState) {
   auto globalVar = _V(5);
   auto playerVar = _V(6);
 
-  auto mockObject1 = mockObject("object1", 0, 0, {0, 1}, DiscreteOrientation(), {}, {{"global_var", globalVar}, {"test_param1", _V(20)}});
-  auto mockObject2 = mockObject("object2", 1, 0, {4, 6}, DiscreteOrientation(), {}, {{"global_var", globalVar}, {"test_param2", _V(5)}});
-  auto mockObject3 = mockObject("object3", 1, 0, {20, 13}, DiscreteOrientation(), {}, {{"global_var", globalVar}, {"test_param3", _V(12)}});
+  auto mockObject1 = mockObject("object1", 'a', 0, 0, {0, 1}, DiscreteOrientation(), {}, {{"global_var", globalVar}, {"test_param1", _V(20)}});
+  auto mockObject2 = mockObject("object2", 'b', 1, 0, {4, 6}, DiscreteOrientation(), {}, {{"global_var", globalVar}, {"test_param2", _V(5)}});
+  auto mockObject3 = mockObject("object3", 'c', 1, 0, {20, 13}, DiscreteOrientation(), {}, {{"global_var", globalVar}, {"test_param3", _V(12)}});
 
   auto objects = std::unordered_set<std::shared_ptr<Object>>{mockObject1, mockObject2, mockObject3};
 
diff --git a/tests/src/Griddly/Core/GridTest.cpp b/tests/src/Griddly/Core/GridTest.cpp
index f661105e0..2097a70f6 100644
--- a/tests/src/Griddly/Core/GridTest.cpp
+++ b/tests/src/Griddly/Core/GridTest.cpp
@@ -6,8 +6,8 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-using ::testing::ElementsAre;
 using ::testing::ContainerEq;
+using ::testing::ElementsAre;
 using ::testing::ElementsAreArray;
 using ::testing::Eq;
 using ::testing::Mock;
@@ -61,7 +61,7 @@ TEST(GridTest, initializeAvatarObjectSpecificPlayer) {
   auto grid = std::shared_ptr<Grid>(new Grid());
   grid->resetMap(123, 456);
 
-  auto mockObjectPtr = mockObject("player_1_avatar", 3);
+  auto mockObjectPtr = mockObject("player_1_avatar", '?', 3);
 
   EXPECT_CALL(*mockObjectPtr, isPlayerAvatar())
       .WillOnce(Return(true));
@@ -119,8 +119,8 @@ TEST(GridTest, initializeObjectPositionTwiceDifferentZ) {
   auto grid = std::shared_ptr<Grid>(new Grid());
   grid->resetMap(123, 456);
 
-  auto mockObjectPtr = mockObject("object1", 1, 0);
-  auto mockObjectPtr2 = mockObject("object2", 1, 1);
+  auto mockObjectPtr = mockObject("object1", '?', 1, 0);
+  auto mockObjectPtr2 = mockObject("object2", '?', 1, 1);
 
   grid->initObject("object1", {});
   grid->initObject("object2", {});
@@ -162,7 +162,7 @@ TEST(GridTest, removeObject) {
   auto playerId = 1;
 
   auto objectLocation = glm::ivec2(1, 2);
-  auto mockObjectPtr = mockObject("object", playerId, 0, objectLocation);
+  auto mockObjectPtr = mockObject("object", 'o', playerId, 0, objectLocation);
   grid->initObject("object", {});
 
   grid->addObject(objectLocation, mockObjectPtr);
@@ -181,7 +181,7 @@ TEST(GridTest, removeObjectNotInitialized) {
 
   auto objectLocation = glm::ivec2{4, 4};
 
-  auto mockObjectPtr = mockObject("object", 1, 0, objectLocation);
+  auto mockObjectPtr = mockObject("object", 'o', 1, 0, objectLocation);
   grid->initObject("object", {});
 
   ASSERT_EQ(grid->getObjects().size(), 0);
@@ -214,7 +214,7 @@ TEST(GridTest, performActionDefaultObject) {
   gridEvent.destinationObjectPlayerId = 0;
   gridEvent.sourceObjectName = "_empty";
   gridEvent.destObjectName = "_empty";
-  gridEvent.sourceLocation = mockActionSourceLocation; 
+  gridEvent.sourceLocation = mockActionSourceLocation;
   gridEvent.destLocation = mockActionDestinationLocation;
   gridEvent.rewards = {};
   gridEvent.tick = 0;
@@ -269,7 +269,7 @@ TEST(GridTest, performActionOnObjectWithNeutralPlayerId) {
   auto mockSourceObjectLocation = glm::ivec2(1, 0);
   auto actionDestinationLocation = glm::ivec2(2, 0);
 
-  auto mockSourceObjectPtr = mockObject("srcObject", mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
+  auto mockSourceObjectPtr = mockObject("srcObject", 'S', mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
   grid->initObject("srcObject", {});
 
   grid->addObject(mockSourceObjectLocation, mockSourceObjectPtr);
@@ -313,7 +313,7 @@ TEST(GridTest, performActionOnObjectWithDifferentPlayerId) {
   uint32_t mockSourceObjectPlayerId = 2;
 
   auto mockSourceObjectLocation = glm::ivec2(1, 0);
-  auto mockSourceObjectPtr = mockObject("srcObject", mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
+  auto mockSourceObjectPtr = mockObject("srcObject", 'S', mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
   grid->initObject("srcObject", {});
 
   grid->addObject(mockSourceObjectLocation, mockSourceObjectPtr);
@@ -343,7 +343,7 @@ TEST(GridTest, performActionDestinationObjectNull) {
   auto mockSourceObjectLocation = glm::ivec2(1, 0);
   auto actionDestinationLocation = glm::ivec2(2, 0);
 
-  auto mockSourceObjectPtr = mockObject("srcObject", mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
+  auto mockSourceObjectPtr = mockObject("srcObject", 'S', mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
   grid->initObject("srcObject", {});
 
   grid->addObject(mockSourceObjectLocation, mockSourceObjectPtr);
@@ -362,7 +362,7 @@ TEST(GridTest, performActionDestinationObjectNull) {
 
   auto reward = grid->performActions(playerId, actions);
 
-  ASSERT_THAT(reward, ContainerEq(std::unordered_map<uint32_t, int32_t>{{3,5}}));
+  ASSERT_THAT(reward, ContainerEq(std::unordered_map<uint32_t, int32_t>{{3, 5}}));
 
   GridEvent gridEvent;
   gridEvent.actionName = "action";
@@ -373,7 +373,7 @@ TEST(GridTest, performActionDestinationObjectNull) {
   gridEvent.destObjectName = "_empty";
   gridEvent.sourceLocation = mockSourceObjectLocation;
   gridEvent.destLocation = actionDestinationLocation;
-  gridEvent.rewards = {{3,5}};
+  gridEvent.rewards = {{3, 5}};
   gridEvent.tick = 0;
   gridEvent.delay = 0;
 
@@ -392,12 +392,12 @@ TEST(GridTest, performActionCannotBePerformedOnDestinationObject) {
 
   uint32_t mockSourceObjectPlayerId = 2;
   auto mockSourceObjectLocation = glm::ivec2(0, 0);
-  auto mockSourceObjectPtr = mockObject("srcObject", mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
+  auto mockSourceObjectPtr = mockObject("srcObject", 'S', mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
   grid->initObject("srcObject", {});
 
   uint32_t mockDestinationObjectPlayerId = 2;
   auto mockDestinationObjectLocation = glm::ivec2(0, 1);
-  auto mockDestinationObjectPtr = mockObject("dstObject", mockDestinationObjectPlayerId, 0, mockDestinationObjectLocation);
+  auto mockDestinationObjectPtr = mockObject("dstObject", 'D', mockDestinationObjectPlayerId, 0, mockDestinationObjectLocation);
   grid->initObject("dstObject", {});
 
   grid->addObject(mockSourceObjectLocation, mockSourceObjectPtr);
@@ -450,12 +450,12 @@ TEST(GridTest, performActionCanBePerformedOnDestinationObject) {
 
   uint32_t mockSourceObjectPlayerId = 2;
   auto mockSourceObjectLocation = glm::ivec2(0, 0);
-  auto mockSourceObjectPtr = mockObject("srcObject", mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
+  auto mockSourceObjectPtr = mockObject("srcObject", 'S', mockSourceObjectPlayerId, 0, mockSourceObjectLocation);
   grid->initObject("srcObject", {});
 
   uint32_t mockDestinationObjectPlayerId = 4;
   auto mockDestinationObjectLocation = glm::ivec2(0, 1);
-  auto mockDestinationObjectPtr = mockObject("dstObject", mockDestinationObjectPlayerId, 0, mockDestinationObjectLocation);
+  auto mockDestinationObjectPtr = mockObject("dstObject", 'D', mockDestinationObjectPlayerId, 0, mockDestinationObjectLocation);
   grid->initObject("dstObject", {});
 
   grid->addObject(mockSourceObjectLocation, mockSourceObjectPtr);
@@ -508,11 +508,11 @@ TEST(GridTest, performActionDelayed) {
   uint32_t playerId = 2;
 
   auto mockSourceObjectLocation = glm::ivec2(0, 0);
-  auto mockSourceObjectPtr = mockObject("srcObject", playerId, 0, mockSourceObjectLocation);
+  auto mockSourceObjectPtr = mockObject("srcObject", 'S', playerId, 0, mockSourceObjectLocation);
   grid->initObject("srcObject", {});
 
   auto mockDestinationObjectLocation = glm::ivec2(0, 1);
-  auto mockDestinationObjectPtr = mockObject("dstObject", playerId, 0, mockDestinationObjectLocation);
+  auto mockDestinationObjectPtr = mockObject("dstObject", 'D', playerId, 0, mockDestinationObjectLocation);
   grid->initObject("dstObject", {});
 
   grid->addObject(mockSourceObjectLocation, mockSourceObjectPtr);
diff --git a/tests/src/Griddly/Core/Observers/ASCIIObserverTest.cpp b/tests/src/Griddly/Core/Observers/ASCIIObserverTest.cpp
new file mode 100644
index 000000000..560523b45
--- /dev/null
+++ b/tests/src/Griddly/Core/Observers/ASCIIObserverTest.cpp
@@ -0,0 +1,550 @@
+#include "Griddly/Core/GDY/Objects/Object.hpp"
+#include "Griddly/Core/Grid.hpp"
+#include "Griddly/Core/Observers/ASCIIObserver.hpp"
+#include "Mocks/Griddly/Core/MockGrid.hpp"
+#include "ObserverRTSTestData.hpp"
+#include "ObserverTestData.hpp"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+using ::testing::AnyNumber;
+using ::testing::ElementsAre;
+using ::testing::ElementsAreArray;
+using ::testing::Eq;
+using ::testing::Invoke;
+using ::testing::Mock;
+using ::testing::Pair;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace griddly {
+
+void runASCIIObserverTest(ObserverConfig observerConfig,
+                          Direction avatarDirection,
+                          std::vector<uint32_t> expectedObservationShape,
+                          std::vector<uint32_t> expectedObservationStride,
+                          uint8_t* expectedData,
+                          bool trackAvatar) {
+  ObserverTestData testEnvironment = ObserverTestData(observerConfig, DiscreteOrientation(avatarDirection), trackAvatar);
+
+  std::shared_ptr<ASCIIObserver> asciiObserver = std::shared_ptr<ASCIIObserver>(new ASCIIObserver(testEnvironment.mockGridPtr));
+
+  asciiObserver->init(observerConfig);
+
+  if (trackAvatar) {
+    asciiObserver->setAvatar(testEnvironment.mockAvatarObjectPtr);
+  }
+
+  asciiObserver->reset();
+
+  auto updateObservation = asciiObserver->update();
+
+  ASSERT_EQ(asciiObserver->getTileSize(), glm::ivec2(1, 1));
+  ASSERT_EQ(asciiObserver->getShape(), expectedObservationShape);
+  ASSERT_EQ(asciiObserver->getStrides(), expectedObservationStride);
+
+  size_t dataLength = asciiObserver->getShape()[0] * asciiObserver->getShape()[1] * asciiObserver->getShape()[2];
+
+  auto updateObservationPointer = std::vector<uint8_t>(updateObservation, updateObservation + dataLength);
+
+  ASSERT_THAT(updateObservationPointer, ElementsAreArray(expectedData, dataLength));
+
+  testEnvironment.verifyAndClearExpectations();
+}
+
+void runASCIIObserverRTSTest(ObserverConfig observerConfig,
+                             std::vector<uint32_t> expectedObservationShape,
+                             std::vector<uint32_t> expectedObservationStride,
+                             uint8_t* expectedData) {
+  auto mockGridPtr = std::shared_ptr<MockGrid>(new MockGrid());
+
+  ObserverRTSTestData testEnvironment = ObserverRTSTestData(observerConfig);
+
+  std::shared_ptr<ASCIIObserver> asciiObserver = std::shared_ptr<ASCIIObserver>(new ASCIIObserver(testEnvironment.mockGridPtr));
+
+  asciiObserver->init(observerConfig);
+
+  asciiObserver->reset();
+
+  auto updateObservation = asciiObserver->update();
+
+  ASSERT_EQ(asciiObserver->getTileSize(), glm::ivec2(1, 1));
+  ASSERT_EQ(asciiObserver->getShape(), expectedObservationShape);
+  ASSERT_EQ(asciiObserver->getStrides()[0], expectedObservationStride[0]);
+  ASSERT_EQ(asciiObserver->getStrides()[1], expectedObservationStride[1]);
+
+  size_t dataLength = asciiObserver->getShape()[0] * asciiObserver->getShape()[1] * asciiObserver->getShape()[2];
+
+  auto updateObservationPointer = std::vector<uint8_t>(updateObservation, updateObservation + dataLength);
+
+  ASSERT_THAT(updateObservationPointer, ElementsAreArray(expectedData, dataLength));
+
+  testEnvironment.verifyAndClearExpectations();
+}
+
+TEST(ASCIIObserverTest, defaultObserverConfig) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+
+TEST(ASCIIObserverTest, partialObserver) {
+  ObserverConfig config = {
+      3,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][3][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 3, 5}, {1, 4, 12}, expectedData[0][0], false);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset) {
+  ObserverConfig config = {
+      3,
+      5,
+      0,
+      1,
+      false};
+
+  uint8_t expectedData[5][3][4] = {
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {' ', ' ', ' ', ' '}, {' ', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 3, 5}, {1, 4, 12}, expectedData[0][0], false);
+}
+
+TEST(ASCIIObserverTest, defaultObserverConfig_trackAvatar) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+
+TEST(ASCIIObserverTest, defaultObserverConfig_trackAvatar_rotateWithAvatar_NONE) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+
+TEST(ASCIIObserverTest, defaultObserverConfig_trackAvatar_UP) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::UP, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+TEST(ASCIIObserverTest, defaultObserverConfig_trackAvatar_RIGHT) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::RIGHT, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+TEST(ASCIIObserverTest, defaultObserverConfig_trackAvatar_DOWN) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::DOWN, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+TEST(ASCIIObserverTest, defaultObserverConfig_trackAvatar_LEFT) {
+  ObserverConfig config = {
+      5,
+      5,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::LEFT, {4, 5, 5}, {1, 4, 20}, expectedData[0][0], false);
+}
+
+TEST(ASCIIObserverTest, partialObserver_trackAvatar_NONE) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_trackAvatar_UP) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::UP, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_trackAvatar_RIGHT) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::RIGHT, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_trackAvatar_DOWN) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::DOWN, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+TEST(ASCIIObserverTest, partialObserver_trackAvatar_LEFT) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      0,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::LEFT, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_NONE) {
+  ObserverConfig config = {
+      5,
+      3,
+      1,
+      1,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_UP) {
+  ObserverConfig config = {
+      5,
+      3,
+      1,
+      1,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::UP, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_RIGHT) {
+  ObserverConfig config = {
+      5,
+      3,
+      1,
+      1,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::RIGHT, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_DOWN) {
+  ObserverConfig config = {
+      5,
+      3,
+      1,
+      1,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::DOWN, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_LEFT) {
+  ObserverConfig config = {
+      5,
+      3,
+      1,
+      1,
+      false};
+
+  uint8_t expectedData[5][5][4] = {
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}},
+      {{' ', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::LEFT, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_rotateWithAvatar_NONE) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      1,
+      true};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::NONE, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_rotateWithAvatar_UP) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      1,
+      true};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::UP, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_rotateWithAvatar_RIGHT) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      1,
+      true};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::RIGHT, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_rotateWithAvatar_DOWN) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      1,
+      true};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::DOWN, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, partialObserver_withOffset_trackAvatar_rotateWithAvatar_LEFT) {
+  ObserverConfig config = {
+      5,
+      3,
+      0,
+      1,
+      true};
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'Q', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'P', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}},
+      {{'W', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'A', ' ', ' ', ' '}, {'.', ' ', ' ', ' '}, {'W', ' ', ' ', ' '}}};
+
+  runASCIIObserverTest(config, Direction::LEFT, {4, 5, 3}, {1, 4, 20}, expectedData[0][0], true);
+}
+
+TEST(ASCIIObserverTest, multiPlayer_Outline_Player1) {
+  ObserverConfig config = {5, 5, 0, 0};
+  config.playerId = 1;
+  config.playerCount = 3;
+
+  config.includePlayerId = true;
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','1',' ',' '}, {'B','1',' ',' '}, {'C','1',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','2',' ',' '}, {'B','2',' ',' '}, {'C','2',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','3',' ',' '}, {'B','3',' ',' '}, {'C','3',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}}};
+
+  runASCIIObserverRTSTest(config, {4, 5, 5}, {1, 4, 4 * 5}, expectedData[0][0]);
+}
+
+TEST(ASCIIObserverTest, multiPlayer_Outline_Player2) {
+  ObserverConfig config = {5, 5, 0, 0};
+  config.playerId = 2;
+  config.playerCount = 3;
+
+  config.includePlayerId = true;
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','2',' ',' '}, {'B','2',' ',' '}, {'C','2',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','1',' ',' '}, {'B','1',' ',' '}, {'C','1',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','3',' ',' '}, {'B','3',' ',' '}, {'C','3',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}}};
+
+  runASCIIObserverRTSTest(config, {4, 5, 5}, {1, 4, 4 * 5}, expectedData[0][0]);
+}
+
+TEST(ASCIIObserverTest, multiPlayer_Outline_Player3) {
+  ObserverConfig config = {5, 5, 0, 0};
+  config.playerId = 3;
+  config.playerCount = 3;
+
+  config.includePlayerId = true;
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','2',' ',' '}, {'B','2',' ',' '}, {'C','2',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','3',' ',' '}, {'B','3',' ',' '}, {'C','3',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','1',' ',' '}, {'B','1',' ',' '}, {'C','1',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}}};
+
+  runASCIIObserverRTSTest(config, {4, 5, 5}, {1, 4, 4 * 5}, expectedData[0][0]);
+}
+
+TEST(ASCIIObserverTest, multiPlayer_Outline_Global) {
+  ObserverConfig config = {5, 5, 0, 0};
+  config.playerId = 0;
+  config.playerCount = 3;
+
+  config.includePlayerId = true;
+
+  uint8_t expectedData[5][5][4] = {
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','1',' ',' '}, {'B','1',' ',' '}, {'C','1',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','2',' ',' '}, {'B','2',' ',' '}, {'C','2',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'A','3',' ',' '}, {'B','3',' ',' '}, {'C','3',' ',' '}, {'W',' ',' ',' '}},
+      {{'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}, {'W',' ',' ',' '}}};
+
+  runASCIIObserverRTSTest(config, {4, 5, 5}, {1, 4, 4 * 5}, expectedData[0][0]);
+}
+
+}  // namespace griddly
\ No newline at end of file
diff --git a/tests/src/Griddly/Core/Observers/ObserverRTSTestData.hpp b/tests/src/Griddly/Core/Observers/ObserverRTSTestData.hpp
index ead6cb80d..529062426 100644
--- a/tests/src/Griddly/Core/Observers/ObserverRTSTestData.hpp
+++ b/tests/src/Griddly/Core/Observers/ObserverRTSTestData.hpp
@@ -28,27 +28,27 @@ class ObserverRTSTestData {
     // 1  1   1   1   1
 
     if(observerConfig.includeVariables) {
-      mockObjectWallPtr = mockObject("W", 0, 0, {0,0}, DiscreteOrientation(), {}, {});
-      mockObjectA1Ptr = mockObject("A", 1, 0, {0,0}, DiscreteOrientation(), {}, {{"V1", _V(1)}, {"_ignored", _V(10)}});
-      mockObjectA2Ptr = mockObject("A", 2, 0, {0,0}, DiscreteOrientation(), {}, {{"V2", _V(2)}, {"_ignored", _V(10)}});
-      mockObjectA3Ptr = mockObject("A", 3, 0, {0,0}, DiscreteOrientation(), {}, {{"V3", _V(3)}, {"_ignored", _V(10)}});
-      mockObjectB1Ptr = mockObject("B", 1, 0, {0,0}, DiscreteOrientation(), {}, {{"V1", _V(4)}, {"_ignored", _V(10)}});
-      mockObjectB2Ptr = mockObject("B", 2, 0, {0,0}, DiscreteOrientation(), {}, {{"V2", _V(5)}, {"_ignored", _V(10)}});
-      mockObjectB3Ptr = mockObject("B", 3, 0, {0,0}, DiscreteOrientation(), {}, {{"V3", _V(6)}, {"_ignored", _V(10)}});
-      mockObjectC1Ptr = mockObject("C", 1, 0, {0,0}, DiscreteOrientation(), {}, {{"V1", _V(7)}, {"_ignored", _V(10)}});
-      mockObjectC2Ptr = mockObject("C", 2, 0, {0,0}, DiscreteOrientation(), {}, {{"V2", _V(8)}, {"_ignored", _V(10)}});
-      mockObjectC3Ptr = mockObject("C", 3, 0, {0,0}, DiscreteOrientation(), {}, {{"V3", _V(9)}, {"_ignored", _V(10)}});
-    } else {
-      mockObjectWallPtr = mockObject("W", 0);
-      mockObjectA1Ptr = mockObject("A", 1);
-      mockObjectA2Ptr = mockObject("A", 2);
-      mockObjectA3Ptr = mockObject("A", 3);
-      mockObjectB1Ptr = mockObject("B", 1);
-      mockObjectB2Ptr = mockObject("B", 2);
-      mockObjectB3Ptr = mockObject("B", 3);
-      mockObjectC1Ptr = mockObject("C", 1);
-      mockObjectC2Ptr = mockObject("C", 2);
-      mockObjectC3Ptr = mockObject("C", 3);
+      mockObjectWallPtr = mockObject("W", 'W', 0, 0, {0,0}, DiscreteOrientation(), {}, {});
+      mockObjectA1Ptr = mockObject("A", 'A', 1, 0, {0,0}, DiscreteOrientation(), {}, {{"V1", _V(1)}, {"_ignored", _V(10)}});
+      mockObjectA2Ptr = mockObject("A", 'A', 2, 0, {0,0}, DiscreteOrientation(), {}, {{"V2", _V(2)}, {"_ignored", _V(10)}});
+      mockObjectA3Ptr = mockObject("A", 'A', 3, 0, {0,0}, DiscreteOrientation(), {}, {{"V3", _V(3)}, {"_ignored", _V(10)}});
+      mockObjectB1Ptr = mockObject("B", 'B', 1, 0, {0,0}, DiscreteOrientation(), {}, {{"V1", _V(4)}, {"_ignored", _V(10)}});
+      mockObjectB2Ptr = mockObject("B", 'B', 2, 0, {0,0}, DiscreteOrientation(), {}, {{"V2", _V(5)}, {"_ignored", _V(10)}});
+      mockObjectB3Ptr = mockObject("B", 'B', 3, 0, {0,0}, DiscreteOrientation(), {}, {{"V3", _V(6)}, {"_ignored", _V(10)}});
+      mockObjectC1Ptr = mockObject("C", 'C', 1, 0, {0,0}, DiscreteOrientation(), {}, {{"V1", _V(7)}, {"_ignored", _V(10)}});
+      mockObjectC2Ptr = mockObject("C", 'C', 2, 0, {0,0}, DiscreteOrientation(), {}, {{"V2", _V(8)}, {"_ignored", _V(10)}});
+      mockObjectC3Ptr = mockObject("C", 'C', 3, 0, {0,0}, DiscreteOrientation(), {}, {{"V3", _V(9)}, {"_ignored", _V(10)}});
+    } else { 
+      mockObjectWallPtr = mockObject("W", 'W', 0);
+      mockObjectA1Ptr = mockObject("A", 'A', 1);
+      mockObjectA2Ptr = mockObject("A", 'A', 2);
+      mockObjectA3Ptr = mockObject("A", 'A', 3);
+      mockObjectB1Ptr = mockObject("B", 'B', 1);
+      mockObjectB2Ptr = mockObject("B", 'B', 2);
+      mockObjectB3Ptr = mockObject("B", 'B', 3);
+      mockObjectC1Ptr = mockObject("C", 'C', 1);
+      mockObjectC2Ptr = mockObject("C", 'C', 2);
+      mockObjectC3Ptr = mockObject("C", 'C', 3);
     }
 
     
diff --git a/tests/src/Griddly/Core/Observers/ObserverTestData.hpp b/tests/src/Griddly/Core/Observers/ObserverTestData.hpp
index ba5ecaea7..eed80024d 100644
--- a/tests/src/Griddly/Core/Observers/ObserverTestData.hpp
+++ b/tests/src/Griddly/Core/Observers/ObserverTestData.hpp
@@ -18,10 +18,10 @@ namespace griddly {
 class ObserverTestData {
  public:
   ObserverTestData(ObserverConfig observerConfig, DiscreteOrientation orientation, bool trackAvatar) {
-    mockAvatarObjectPtr = mockObject("avatar", 1, 0, {2, 2});
-    mockSinglePlayerObject1Ptr = mockObject("mo1", 1);
-    mockSinglePlayerObject2Ptr = mockObject("mo2", 1);
-    mockSinglePlayerObject3Ptr = mockObject("mo3", 1);
+    mockAvatarObjectPtr = mockObject("avatar", 'A', 1, 0, {2, 2});
+    mockSinglePlayerObject1Ptr = mockObject("mo1", 'W', 1);
+    mockSinglePlayerObject2Ptr = mockObject("mo2", 'P', 1);
+    mockSinglePlayerObject3Ptr = mockObject("mo3", 'Q', 1);
     mockSinglePlayerObjects = {mockSinglePlayerObject1Ptr, mockSinglePlayerObject2Ptr, mockSinglePlayerObject3Ptr};
 
     mockSinglePlayerGridData = {
diff --git a/tests/src/Griddly/Core/TestUtils/common.hpp b/tests/src/Griddly/Core/TestUtils/common.hpp
index 0c4abd3a8..85aaf2b85 100644
--- a/tests/src/Griddly/Core/TestUtils/common.hpp
+++ b/tests/src/Griddly/Core/TestUtils/common.hpp
@@ -15,11 +15,12 @@ using ::testing::Return;
 
 namespace griddly {
 
-std::shared_ptr<MockObject> static mockObject(std::string objectName = "object", uint32_t playerId = 1, uint32_t zidx = 0, glm::ivec2 location = {0, 0}, DiscreteOrientation orientation = DiscreteOrientation(), std::unordered_set<std::string> availableActionNames = {}, std::unordered_map<std::string, std::shared_ptr<int32_t>> availableVariables = {}) {
+std::shared_ptr<MockObject> static mockObject(std::string objectName = "object", char mapCharacter='?', uint32_t playerId = 1, uint32_t zidx = 0, glm::ivec2 location = {0, 0}, DiscreteOrientation orientation = DiscreteOrientation(), std::unordered_set<std::string> availableActionNames = {}, std::unordered_map<std::string, std::shared_ptr<int32_t>> availableVariables = {}) {
   auto mockObjectPtr = std::shared_ptr<MockObject>(new MockObject());
 
   EXPECT_CALL(*mockObjectPtr, getPlayerId()).WillRepeatedly(Return(playerId));
   EXPECT_CALL(*mockObjectPtr, getObjectName()).WillRepeatedly(Return(objectName));
+  EXPECT_CALL(*mockObjectPtr, getMapCharacter()).WillRepeatedly(Return(mapCharacter));
   EXPECT_CALL(*mockObjectPtr, getObjectOrientation()).WillRepeatedly(Return(orientation));
   EXPECT_CALL(*mockObjectPtr, getObjectRenderTileName()).WillRepeatedly(Return(objectName + std::to_string(0)));
   EXPECT_CALL(*mockObjectPtr, getZIdx()).WillRepeatedly(Return(zidx));
diff --git a/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObject.hpp b/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObject.hpp
index dc87d07a3..c29c7c7a6 100644
--- a/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObject.hpp
+++ b/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObject.hpp
@@ -8,7 +8,7 @@ namespace griddly {
 class MockObject : public Object {
  public:
   MockObject()
-      : Object("mockObject", 0, 0, {}, nullptr) {
+      : Object("mockObject", 'o', 0, 0, {}, nullptr) {
   }
 
   MOCK_METHOD(void, init, (glm::ivec2 location, std::shared_ptr<Grid> grid_), ());
@@ -16,6 +16,7 @@ class MockObject : public Object {
   MOCK_METHOD(uint32_t, getZIdx, (), (const));
   MOCK_METHOD(glm::ivec2, getLocation, (), (const));
   MOCK_METHOD(std::string, getObjectName, (), (const));
+  MOCK_METHOD(char, getMapCharacter, (), (const));
   MOCK_METHOD(std::string, getObjectRenderTileName, (), (const));
   MOCK_METHOD(uint32_t, getPlayerId, (), (const));
   MOCK_METHOD(std::string, getDescription, (), (const));
diff --git a/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObjectGenerator.hpp b/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObjectGenerator.hpp
index 41653e435..80c59b696 100644
--- a/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObjectGenerator.hpp
+++ b/tests/src/Mocks/Griddly/Core/GDY/Objects/MockObjectGenerator.hpp
@@ -9,7 +9,7 @@ class MockObjectGenerator : public ObjectGenerator {
  public:
   MockObjectGenerator() : ObjectGenerator() {}
 
-  MOCK_METHOD(void, defineNewObject, (std::string objectName, uint32_t zIdx, char mapChar, (std::unordered_map<std::string, uint32_t> parameterDefinitions)), ());
+  MOCK_METHOD(void, defineNewObject, (std::string objectName, char mapCharacter, uint32_t zIdx, (std::unordered_map<std::string, uint32_t> parameterDefinitions)), ());
   MOCK_METHOD(void, defineActionBehaviour, (std::string objectName, ActionBehaviourDefinition behaviourDefinition), ());
   MOCK_METHOD(void, addInitialAction, (std::string objectName, std::string actionName, uint32_t actionId, uint32_t delay, bool randomize), ());
 

From c8b6d2ee738b40ef8bf69a05446da01480ae9f0a Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Sun, 27 Jun 2021 18:04:19 +0100
Subject: [PATCH 17/18] building and testing python for ascii observer

---
 bindings/python.cpp                 |  1 +
 python/examples/snippet.py          |  8 ++++----
 python/griddly/GymWrapper.py        | 23 ++++++++++++++++++++---
 python/tests/egg_test.py            | 20 +++++---------------
 src/Griddly/Core/GDY/GDYFactory.cpp |  5 ++++-
 src/Griddly/Core/GDY/GDYFactory.hpp |  2 ++
 6 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/bindings/python.cpp b/bindings/python.cpp
index b32f2ce1d..9248d23b3 100644
--- a/bindings/python.cpp
+++ b/bindings/python.cpp
@@ -107,6 +107,7 @@ PYBIND11_MODULE(python_griddly, m) {
   observer_type.value("BLOCK_2D", ObserverType::BLOCK_2D);
   observer_type.value("ISOMETRIC", ObserverType::ISOMETRIC);
   observer_type.value("VECTOR", ObserverType::VECTOR);
+  observer_type.value("ASCII", ObserverType::ASCII);
 
   py::class_<NumpyWrapper<uint8_t>, std::shared_ptr<NumpyWrapper<uint8_t>>>(m, "Observation", py::buffer_protocol())
       .def_buffer([](NumpyWrapper<uint8_t> &m) -> py::buffer_info {
diff --git a/python/examples/snippet.py b/python/examples/snippet.py
index f53962f52..e3ee33ac8 100644
--- a/python/examples/snippet.py
+++ b/python/examples/snippet.py
@@ -8,9 +8,9 @@
 
 def make_env(name):
     wrapper = GymWrapperFactory()
-    wrapper.build_gym_from_yaml(name, 'Single-Player/Mini-Grid/minigrid-spiders.yaml',
-                                player_observer_type=gd.ObserverType.VECTOR,
-                                global_observer_type=gd.ObserverType.BLOCK_2D,
+    wrapper.build_gym_from_yaml(name, 'Single-Player/GVGAI/spider-nest.yaml',
+                                player_observer_type=gd.ObserverType.SPRITE_2D,
+                                global_observer_type=gd.ObserverType.ASCII,
                                 level=0,
                                 max_steps=200)
 
@@ -39,7 +39,7 @@ def make_env(name):
         frames += 1
         obs, reward, done, info = env.step(action)
         env.render()
-        env.render(observer='global')
+        print(env.render(observer='global'))
 
         if frames % 1000 == 0:
             end = timer()
diff --git a/python/griddly/GymWrapper.py b/python/griddly/GymWrapper.py
index cdfdc23fc..57d7a6800 100644
--- a/python/griddly/GymWrapper.py
+++ b/python/griddly/GymWrapper.py
@@ -208,10 +208,29 @@ def render(self, mode='human', observer=0):
             observation = np.array(self.game.observe(), copy=False)
             if self._global_observer_type == gd.ObserverType.VECTOR:
                 observation = self._vector2rgb.convert(observation)
+            if self._global_observer_type == gd.ObserverType.ASCII:
+                observation = observation \
+                    .swapaxes(2, 0) \
+                    .reshape(-1, observation.shape[0] * observation.shape[1]) \
+                    .view('c')
+                ascii_string = ''.join(np.column_stack(
+                    (observation, np.repeat(['\n'], observation.shape[0]))
+                ).flatten().tolist())
+                return ascii_string
+
         else:
             observation = self._player_last_observation[observer]
             if self._player_observer_type[observer] == gd.ObserverType.VECTOR:
                 observation = self._vector2rgb.convert(observation)
+            if self._player_observer_type[observer] == gd.ObserverType.ASCII:
+                observation = observation \
+                    .swapaxes(2, 0) \
+                    .reshape(-1, observation.shape[0] * observation.shape[1]) \
+                    .view('c')
+                ascii_string = ''.join(np.column_stack(
+                    (observation, np.repeat(['\n'], observation.shape[0]))
+                ).flatten().tolist())
+                return ascii_string
 
         if mode == 'human':
             if self._renderWindow.get(observer) is None:
@@ -320,7 +339,7 @@ def build_gym_from_yaml(self, environment_name, yaml_file, global_observer_type=
         )
 
     def build_gym_from_yaml_string(self, environment_name, yaml_string, global_observer_type=gd.ObserverType.SPRITE_2D,
-                            player_observer_type=gd.ObserverType.SPRITE_2D, level=None, max_steps=None):
+                                   player_observer_type=gd.ObserverType.SPRITE_2D, level=None, max_steps=None):
         register(
             id=f'GDY-{environment_name}-v0',
             entry_point='griddly:GymWrapper',
@@ -332,5 +351,3 @@ def build_gym_from_yaml_string(self, environment_name, yaml_string, global_obser
                 'player_observer_type': player_observer_type
             }
         )
-
-
diff --git a/python/tests/egg_test.py b/python/tests/egg_test.py
index d0c363e8d..633b1a153 100644
--- a/python/tests/egg_test.py
+++ b/python/tests/egg_test.py
@@ -1,10 +1,8 @@
 import gym
 import pytest
-from griddly.RenderTools import VideoRecorder
 
 from griddly import GymWrapperFactory, gd
 from griddly.util.environment_generator_generator import EnvironmentGeneratorGenerator
-from griddly.util.wrappers import ValidActionSpaceWrapper
 
 
 @pytest.fixture
@@ -19,9 +17,8 @@ def build_generator(test_name, yaml_file):
     wrapper_factory.build_gym_from_yaml_string(
         test_name,
         yaml_string=generator_yaml,
-        # TODO: Change this to ASCII observer when its ready
-        global_observer_type=gd.ObserverType.VECTOR,
-        player_observer_type=gd.ObserverType.VECTOR,
+        global_observer_type=gd.ObserverType.ASCII,
+        player_observer_type=gd.ObserverType.ASCII,
     )
 
     env = gym.make(f'GDY-{test_name}-v0')
@@ -35,19 +32,12 @@ def test_spider_nest_generator(test_name):
     for i in range(10):
         genv = build_generator(test_name+f'{i}', yaml_file)
 
-        # visualization = genv.render(observer=0, mode='rgb_array')
-        # video_recorder = VideoRecorder()
-        # video_recorder.start('generator_video_test.mp4', visualization.shape)
-
         # Place 10 Random Objects
         for i in range(0, 100):
             action = genv.action_space.sample()
             obs, reward, done, info = genv.step(action)
 
-            state = genv.get_state()
-
-            visual = genv.render(observer=0, mode='rgb_array')
-            # video_recorder.add_frame(visual)
-
+            player_ascii_string = genv.render(observer=0)
+            global_ascii_string = genv.render(observer='global')
 
-    # video_recorder.close()
+            assert player_ascii_string == global_ascii_string
diff --git a/src/Griddly/Core/GDY/GDYFactory.cpp b/src/Griddly/Core/GDY/GDYFactory.cpp
index 4303aafb6..c7e0fbc65 100644
--- a/src/Griddly/Core/GDY/GDYFactory.cpp
+++ b/src/Griddly/Core/GDY/GDYFactory.cpp
@@ -8,7 +8,6 @@
 #include <spdlog/fmt/fmt.h>
 
 #include "../Grid.hpp"
-#include "../Observers/VectorObserver.hpp"
 #include "../TurnBasedGameProcess.hpp"
 #include "GDYFactory.hpp"
 
@@ -778,6 +777,10 @@ std::shared_ptr<Observer> GDYFactory::createObserver(std::shared_ptr<Grid> grid,
       spdlog::debug("Creating VECTOR observer");
       return std::shared_ptr<VectorObserver>(new VectorObserver(grid));
       break;
+    case ObserverType::ASCII:
+      spdlog::debug("Creating ASCII observer");
+      return std::shared_ptr<ASCIIObserver>(new ASCIIObserver(grid));
+      break;
     case ObserverType::NONE:
       return nullptr;
     default:
diff --git a/src/Griddly/Core/GDY/GDYFactory.hpp b/src/Griddly/Core/GDY/GDYFactory.hpp
index 9b3581a11..fb9e47529 100644
--- a/src/Griddly/Core/GDY/GDYFactory.hpp
+++ b/src/Griddly/Core/GDY/GDYFactory.hpp
@@ -6,6 +6,8 @@
 #include "../Observers/BlockObserver.hpp"
 #include "../Observers/SpriteObserver.hpp"
 #include "../Observers/IsometricSpriteObserver.hpp"
+#include "../Observers/ASCIIObserver.hpp"
+#include "../Observers/VectorObserver.hpp"
 #include "../Players/Player.hpp"
 #include "Objects/ObjectGenerator.hpp"
 #include "TerminationGenerator.hpp"

From e48daf51ee32ebf16b0efeff0c831f80cc71027d Mon Sep 17 00:00:00 2001
From: Bam4d <chrisbam4d@gmail.com>
Date: Mon, 28 Jun 2021 08:45:15 +0100
Subject: [PATCH 18/18] bumping version numbers

---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 +-
 CMakeLists.txt                       | 2 +-
 bindings/python.cpp                  | 2 +-
 docs/conf.py                         | 2 +-
 python/setup.py                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8023f233c..5e8430440 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. mac/linux/windows]
- - Version [e.g. 1.2.0]
+ - Version [e.g. 1.2.1]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11c70cc0f..bc547cb44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.0)
-project(Griddly VERSION 1.2.0)
+project(Griddly VERSION 1.2.1)
 
 set(BINARY ${CMAKE_PROJECT_NAME})
 
diff --git a/bindings/python.cpp b/bindings/python.cpp
index 9248d23b3..11a95926b 100644
--- a/bindings/python.cpp
+++ b/bindings/python.cpp
@@ -12,7 +12,7 @@ namespace griddly {
 
 PYBIND11_MODULE(python_griddly, m) {
   m.doc() = "Griddly python bindings";
-  m.attr("version") = "1.2.0";
+  m.attr("version") = "1.2.1";
 
 #ifndef NDEBUG
   spdlog::set_level(spdlog::level::debug);
diff --git a/docs/conf.py b/docs/conf.py
index 06239da28..8a2533016 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'Chris Bamford'
 
 # The full version, including alpha/beta/rc tags
-release = '1.2.0'
+release = '1.2.1'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/python/setup.py b/python/setup.py
index 907305c37..50cb6d096 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'):
 
 setup(
     name='griddly',
-    version="1.2.0",
+    version="1.2.1",
     author_email="chrisbam4d@gmail.com",
     description="Griddly Python Libraries",
     long_description=long_description,