diff --git a/Data/map/23RS.tmx b/Data/map/23RS.tmx index 463626b..dabccd5 100644 --- a/Data/map/23RS.tmx +++ b/Data/map/23RS.tmx @@ -1,5 +1,5 @@ - + @@ -103,5 +103,13 @@ + + + + + + + + diff --git a/Data/map/FabLab.tmx b/Data/map/FabLab.tmx new file mode 100644 index 0000000..7683ac5 --- /dev/null +++ b/Data/map/FabLab.tmx @@ -0,0 +1,70 @@ + + + + + + + +77,77,77,77,77,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +77,77,77,77,77,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +77,77,77,77,77,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +77,77,77,77,77,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +77,77,77,77,77,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +77,77,77,77,77,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +21,21,21,21,21,523,523,523,523,523,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,2147484531,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,814,0,0,0,0,0,0, +0,0,0,0,0,2147484531,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,814,0,0,0,0,0,0, +0,0,0,0,0,2147484462,0,0,0,0,2147484462,0,0,0,0,0,0,0,0,2147484462,814,0,0,0,0,0,0, +0,0,0,0,0,2147484531,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,814,0,0,0,0,0,0, +0,0,0,0,0,2147484531,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,814,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0,0,2147484531,0,0,0,0,0,0,0 + + + + +4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,6, +23,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,24,25, +22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +42,43,43,43,43,202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +61,62,62,62,62,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,45,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,45,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,45,0,0,0,22,0,0,0,7,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,20, +45,45,0,0,0,42,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,44, +45,0,0,0,0,61,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,63 + + + + + + + + + + + + + diff --git a/src/Entity/Player.java b/src/Entity/Player.java index e3d7d60..314f97d 100644 --- a/src/Entity/Player.java +++ b/src/Entity/Player.java @@ -94,6 +94,7 @@ public class Player extends Character{ ScreenMap.Door.reset(); if (nMap == null || x == null || y == null) return; map = nMap; + if(map.equals("FabLab")) addXp(400); // * Like an easter egg, but necessary for win the game setPosition(x*sm.tileWidth, y*sm.tileHeight); turn(goalDirection); System.out.println("Go to: " + map + " in " + x + " x " + y); diff --git a/src/Screen/ScreenMap.java b/src/Screen/ScreenMap.java index 643164a..69719fb 100644 --- a/src/Screen/ScreenMap.java +++ b/src/Screen/ScreenMap.java @@ -68,6 +68,7 @@ public class ScreenMap extends RenderingScreen{ createMap("23RI"); createMap("23RS"); + createMap("FabLab"); createMap("23N1"); createMap("23N2"); createMap("23N215");