From 12ccf3f58a282e123b0c9dfd771cf32c98f41f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Heredero?= <remi@heredero.ch>
Date: Thu, 16 Jun 2022 21:08:31 +0200
Subject: [PATCH] FabLab added

---
 Data/map/23RS.tmx         | 10 +++++-
 Data/map/FabLab.tmx       | 70 +++++++++++++++++++++++++++++++++++++++
 src/Entity/Player.java    |  1 +
 src/Screen/ScreenMap.java |  1 +
 4 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 Data/map/FabLab.tmx

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="30" height="24" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="5">
+<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="30" height="24" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="6">
  <tileset firstgid="1" source="assets/Dungeon_v2.tsx"/>
  <tileset firstgid="229" source="assets/pokemon_v2.tsx"/>
  <layer id="1" name="floor" width="30" height="24">
@@ -103,5 +103,13 @@
     <property name="nextY" type="int" value="8"/>
    </properties>
   </object>
+  <object id="5" x="946.667" y="432">
+   <properties>
+    <property name="nextDirection" value="RIGHT"/>
+    <property name="nextMap" value="FabLab"/>
+    <property name="nextX" type="int" value="1"/>
+    <property name="nextY" type="int" value="10"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="27" height="14" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="5">
+ <tileset firstgid="1" source="assets/Dungeon_v2.tsx"/>
+ <tileset firstgid="229" source="assets/pokemon_v2.tsx"/>
+ <tileset firstgid="1215" source="assets/Slates_v2.tsx"/>
+ <layer id="1" name="floor" width="27" height="14">
+  <data encoding="csv">
+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
+</data>
+ </layer>
+ <layer id="8" name="small wall" width="27" height="14">
+  <data encoding="csv">
+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
+</data>
+ </layer>
+ <layer id="4" name="wall" width="27" height="14">
+  <data encoding="csv">
+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
+</data>
+ </layer>
+ <objectgroup id="5" name="door">
+  <object id="4" name="RS" x="16.6667" y="111.333">
+   <properties>
+    <property name="nextDirection" value="LEFT"/>
+    <property name="nextMap" value="23RS"/>
+    <property name="nextX" type="int" value="28"/>
+    <property name="nextY" type="int" value="10"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
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");