diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
index 78b47056014..c3c457f8d36 100644
--- a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
@@ -322,7 +322,7 @@ public class AdventureEventData implements Serializable {
     public Map<Integer, List<AdventureEventMatch>> matches = new HashMap<>();
 
     public void giveRewards() {
-        int wins = getHumanPlayer().wins;
+        int wins = matchesWon;
         Array<Reward> ret = new Array<>();
 
         //Todo: this should be automatic... "somehow"
diff --git a/forge-gui/res/adventure/common/maps/map/cave_10.tmx b/forge-gui/res/adventure/common/maps/map/cave_10.tmx
index 2c91ed6ad34..c82208cc65e 100644
--- a/forge-gui/res/adventure/common/maps/map/cave_10.tmx
+++ b/forge-gui/res/adventure/common/maps/map/cave_10.tmx
@@ -5,11 +5,6 @@
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRsJdnYOyVpoG9e4gwM5qX+vZG0cDMUUB9AADU9QKI
-  </data>
- </layer>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJwL42RgCBvFo3gUj+JRPIpH8YjAAK/DvUM=
@@ -36,9 +31,10 @@
   </object>
   <object id="48" template="../obj/treasure.tx" x="14.8954" y="128.712"/>
   <object id="49" template="../obj/gold.tx" x="166.538" y="81.703"/>
-  <object id="50" template="../obj/enemy.tx" x="206.464" y="215.682">
+  <object id="50" template="../obj/enemy.tx" x="206.464" y="165.682">
    <properties>
     <property name="enemy" value="Minotaur"/>
+    <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
   <object id="51" template="../obj/treasure.tx" x="384.492" y="232.777"/>
diff --git a/forge-gui/res/adventure/common/maps/map/cave_13.tmx b/forge-gui/res/adventure/common/maps/map/cave_13.tmx
index 14e2caef717..beb0fb4a4d8 100644
--- a/forge-gui/res/adventure/common/maps/map/cave_13.tmx
+++ b/forge-gui/res/adventure/common/maps/map/cave_13.tmx
@@ -7,7 +7,7 @@
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="5" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFIwXUcjMw1EFxPTf97JXmYWDYBcWyPPS1FwZg9u6ig/07kfy7m47+HYkAFMd7eOgTr+iAnml5FIwCagIA69wKDQ==
+   eJxjYBgFIwXUcjMw1EFxPTf97JXmYWDYBcWyPPS1Fwboae9OJP/upqO9o2AUjIJRQAwAACH9B2k=
   </data>
  </layer>
  <layer id="1" name="Background" width="30" height="17">
diff --git a/forge-gui/res/adventure/common/maps/map/cave_17.tmx b/forge-gui/res/adventure/common/maps/map/cave_17.tmx
index 295021fa68f..25b7e888068 100644
--- a/forge-gui/res/adventure/common/maps/map/cave_17.tmx
+++ b/forge-gui/res/adventure/common/maps/map/cave_17.tmx
@@ -5,11 +5,6 @@
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUEAJ7eBgY9vLQ394oXgaGaF762zsKRsEoGL4AABCfAmE=
-  </data>
- </layer>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJybycnAMHMUj+JRPIpH8SgexSMCAwCsCkLM
diff --git a/forge-gui/res/adventure/common/maps/map/cave_19.tmx b/forge-gui/res/adventure/common/maps/map/cave_19.tmx
index 20b61c7c099..e1606e8353c 100644
--- a/forge-gui/res/adventure/common/maps/map/cave_19.tmx
+++ b/forge-gui/res/adventure/common/maps/map/cave_19.tmx
@@ -5,11 +5,6 @@
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt0LENgDAQBMErwK4A0Ri0anqDAiwiC4SZST/5vQQAAAAAAAAYaSnJWt7+4jntaj1+1LvVZK/928xb9Nrutvi6mdsAGOsEY9gHcQ==
-  </data>
- </layer>
  <layer id="1" name="Background" width="60" height="40">
   <data encoding="base64" compression="zlib">
    eJztz0ENADAIBDC+C4ZnBbfIuIT0UQGdVzUBvzMSV19fX19fX19fX19fX19fAAAAAABuWiKHCi4=
diff --git a/forge-gui/res/adventure/common/maps/map/crawlspace.tmx b/forge-gui/res/adventure/common/maps/map/crawlspace.tmx
index 718a2c07554..6bd6c273086 100644
--- a/forge-gui/res/adventure/common/maps/map/crawlspace.tmx
+++ b/forge-gui/res/adventure/common/maps/map/crawlspace.tmx
@@ -10,14 +10,9 @@
  </properties>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztlEEOgzAMBM0NfwwhPlo18KuqhWc0VruSiRyokWkvXWmVS+KJNwaiv0o1yr/iWo5UaolG5an9DrdnoktmzXm95vXGazadyB34VfdRYYs7XjuCqzlg4y4WM4Ldv+trjs5gi5vUTHgk5+4VrmSgZ83iYv/g7B29ylwtBXfvm4Jx1iPrLfHGUktWzLmV8cx+pu4ZOdV6WoyMcdej+oRbzlY6kO0Wd0+R/w8PN1Jnc5+JeTWg
-  </data>
- </layer>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
-   eJxby8LAsHYUo+CZnBA80O5AxkwiEDxQ9lLLbnMuCCbVv5TGRxIHBBPrV2r5WZUdgXGpaRVkYGgThNjXIkgdu4mxV1mIgUFFCGKXEpQGuUUNyJ7GCcHk2onPXlUhhH9h+CBQbBYnbe0Fma8hhGqvBpJfybE3mQOC8am7LcrAoI5mLyiMjbnIsxeEPzFAMD417YKI+AVhTSGIWyhN08RgdL/Sy150N9DbzqGCAQFePTw=
+   eJxby8LAsHYUo+CZnBA80O5AxkwiEDxQ9lLLbnMuCCbVv5TGRxIHBBPrV2r5WZUdgXGpaRVkYGgThNjXIkgdu4mxV1mIgUFFCGKXEpQGuUUNyJ7GCcHk2onPXlUhiH83sCPwQaDYLE7a2gsyX0MINX41kPxKjr3JHBCMT91tUQYGdSFU/4LC2JiLPHtB+BMDBONT0y6IiF8Q1hSCuIXSNE0MRg5jNTrai+4Gets5VDAAVFFBAg==
   </data>
  </layer>
  <layer id="2" name="Ground" width="30" height="17">
diff --git a/forge-gui/res/adventure/common/maps/map/maze_1.tmx b/forge-gui/res/adventure/common/maps/map/maze_1.tmx
index 734f71b053a..111e614ced1 100644
--- a/forge-gui/res/adventure/common/maps/map/maze_1.tmx
+++ b/forge-gui/res/adventure/common/maps/map/maze_1.tmx
@@ -5,11 +5,6 @@
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMBzAXh4Ghnpu+tsbzcvAsJuH/vaOAvIAAN0IAoM=
-  </data>
- </layer>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJwL42RgCBvFo3gUj+JRPIpH8YjAAK/DvUM=
@@ -35,9 +30,10 @@
    </properties>
   </object>
   <object id="49" template="../obj/gold.tx" x="15.8713" y="122.37"/>
-  <object id="50" template="../obj/enemy.tx" x="210.797" y="217.515">
+  <object id="50" template="../obj/enemy.tx" x="208" y="176">
    <properties>
     <property name="enemy" value="Minotaur"/>
+    <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
   <object id="51" template="../obj/treasure.tx" x="384.492" y="232.777"/>
diff --git a/forge-gui/res/adventure/common/maps/map/maze_4.tmx b/forge-gui/res/adventure/common/maps/map/maze_4.tmx
index 2d1d1bea013..3c2630b36ee 100644
--- a/forge-gui/res/adventure/common/maps/map/maze_4.tmx
+++ b/forge-gui/res/adventure/common/maps/map/maze_4.tmx
@@ -5,11 +5,6 @@
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="200" height="200">
-  <data encoding="base64" compression="zlib">
-   eJztzgENAAAIA6AHsH8Y0xnDOSEBCQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANzVtT0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+GUAkeQAxw==
-  </data>
- </layer>
  <layer id="8" name="Solution" width="200" height="200">
   <data encoding="base64" compression="zlib">
    eJzt3U2O20YQhmEDnk2ci+UqXvgIOYIP5+tkFQgCIQ2H/UOyun7fB+BigmBEVfWnYbEl+ds3APDr3w/rMwD8Ih9AG/kA2sgH0EY+4nn0TPrwch4eD+j478fruEO6Z3fyAXhDPoA28gG0nV2Xvz6eR+t3cW2OTDTXJXlANKxTPT//sj4DnEU+9JCPeEb5aM0aOK9yPt73I+7uSWgiH3oq5yOimTmZfMghH7FwH0kX+YhFKh+9PZHfH6/jLsnfZeGfv3MfV733dd9by5mFvx+QcDcfnpEPSCAfQBv58Cf6PHKF9YyxYv7wvDcSOR8VWV7rr8qHZ+Qjlqzr0Cvysc6K11nyoUs6H9teyNF+SO8+d0bervM1eN3LuIq/H+tEWtc4Rj7WIRPxkY+2M9c3Ea+FMOY5H6M5psd6L4B8PO3nkVbfvM4knvNxx9m1yTq3RT50saZjIR+63vPB3wBcpZ2Po5lixZ4Is8R6o7ki2l7Hkbv5qLDP90A+aiIfc8hHTeRjzj4fHq7FuA5cL1I+eu/t2s5l1fu7rPdRNOapiO+PWi3r/avVIr9mRzxnK+SjHvIxj3zUwJxyjdd88DmSedL7ORX2NWZ5zQfmsde5ziMf1C42eqaHWsfCa5quTLV+n2Gufo5kz3rP4s710sxMUWWuuCpTPlahRnXR+zFqVBe9H6NGdVXs/Z/vr2NG1hrNfFa8+oyStfeSqFFd9H6MGtVF78eoUV3Rei/1Pqwq78+YnS8qzxg90Xov9f7EaM8bNqKtE/IBTZnXSe/+bebnDTmZ10lvn2Pl+56QBz2fR63qoefzqFU99Hzee6245qqB/n72PrPs5xZmlXro4xrUNQf6uAZ1zYE+rkFdc8jexzPfnTX7b+cdYf7IKXsftb5PLnsdq8reV/KBO7L3lXzgDvr6Ij1/MIe8RP18Cf1bi/o+kQ8cyVLfu+ubfOBIlvpGXd93ZemfV9Q3Nvq3FvWd4/XvE/1bi/rOIR81cY93DvmoixrHRe/Wo8Zx0bv1qHFc9G49ahwXvVuvwvuxtOdrrcfL2i+vstabfEBC1nqTj5y0Ph+ysaq39vPMgnzoPh75iIV86D4e+YiFfOg+XvV6R1O9X+QDPfSrT+Lz5BH2P7j+Oua1X17s63M1H96Rj2MRemcpSz5G+wXk45iH3nkWNR/79U4+riEffeSjNvLRlyUfuIZ89I3yMXN/i3zERT76ZvLR+7n131YjHzLIR5/XfEivf6/fj2CNfPSRDx+/zwr56Muaj7P3t87K8nmQ6vkYzddV8iGNfOQgnQetfwPEez60kY85f76f+/9X/L3QsF/fZzM5ykeW+eEu8iH7sxXp87LOh/Xjb7z018KqecMC+VjDS38tSOVD4pB4Lr2foyEfPoyev8a6q94Dz6r3hnygJ1pvpO9LSuTj7jVStB5UEq031t+nIDVvrN4fgYxovbHORxVk+Cna89beN45WHynZ7oddFe15kw8d3vOh9ffN2/MeschHxbkhSj7ef175OFF67ul9ed5rdUeEfPR+1npctGWulfd87JEPfyrVSvq5Sr9/hHzYqjZ/7O2f6931TT58yPY5ICve86GlWj6yPd9VvF9facm2XsiHjGrXky3ZajCTD3o/Ro2eqAGOsC6eqAOOsC6eqAOOWN/bPjvP830/NXmZl8iHjbPfz1ONdX825MMG+eiz7s/m7HlYX59JiXreVUTtT7T3O7ZEPe+oZl5LZ153H9cTnvekpfNhtU7Jh66q9SYfx5gvPquaj7vIRw3k4xryYUvjc/8zv9/7XCFldH/Ly/0vXs+eqIOu0fzupR9ezsMaddBFPmKhDrrIhy+POWg7jlhf5/bMnFuVuUWbx/WAY/RKHzWPg17po+Zx0Ct91Nzer4/PR4vnGSkrag20kQ+gLXs+evd0gZHM+Xjf8yAnuCJzPoCzvLwvEvDobB64JkEl5CMXrgVkUcNc6Kcs6pkL/ZRFPXOhn7Iy1HP1fsbRPT5P1/meziUb6jl2VCPqVgN9HqNGdfF9PmPkoy7yMeZx5rgq+vlro0410fc51KmmbH1f+T2XqCdb38kHJGWZpzbkA2gjH0Ab+QDayMdnfI78JdMccdWqeapqPTOhh1+RD2zo4VfkAxt6+FXUfDAvyKs+exyJmg9AA/kA2sgH0EY+4Im3GYh8wBNv64h8wBNv64h8wBNv64h8wBPmDyAO8gG0kQ+gjXwAbeQDaCMfQBv5ANok8+H537YArtBat+QDEZEPoI18+CF1Tco1rhzNfHBwRDwAAAAAAAAAAAAA4OF/xDSn6Q==