Merge pull request #263 from JacobSeto/grace-shihan-levelDesign

Grace shihan level design
JacobSeto · May 9, 2024 · 03ba4c3 · 03ba4c3
2 parents 8dca722 + 89c6545
commit 03ba4c3
Show file tree

Hide file tree

Showing 21 changed files with 3,552 additions and 5,572 deletions.
diff --git a/assets/Tiled/AnimatedArt.tsx b/assets/Tiled/AnimatedArt.tsx
@@ -20,6 +20,6 @@
    <property name="animated" type="bool" value="true"/>
    <property name="assetName" value="laser"/>
   </properties>
-  <image width="69" height="74" source="../../../../../Downloads/laser/laserTile.png"/>
+  <image width="69" height="74" source="tiles/laserTile.png"/>
  </tile>
 </tileset>
diff --git a/assets/Tiled/EricBearLevel2.tmx b/assets/Tiled/EricBearLevel2.tmx
diff --git a/assets/Tiled/EricEasyLevel.tmx b/assets/Tiled/EricEasyLevel.tmx
diff --git a/assets/Tiled/EricLaserLevel.tmx b/assets/Tiled/EricLaserLevel.tmx
diff --git a/assets/Tiled/EricMediumLevel.tmx b/assets/Tiled/EricMediumLevel.tmx
diff --git a/assets/Tiled/Images.tsx b/assets/Tiled/Images.tsx
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="Images" tilewidth="895" tileheight="320" tilecount="25" columns="0">
+ <editorsettings>
+  <export target="Images.tsx" format="tsx"/>
+ </editorsettings>
  <grid orientation="orthogonal" width="1" height="1"/>
  <tile id="2">
   <image width="64" height="123" source="tiles/playerTile.png"/>
  </tile>
  <tile id="7">
-  <image width="130" height="130" source="../world/checkpoints/checkpointInactive.png"/>
+  <image width="130" height="130" source="../world/checkpoints/checkpointTile.png"/>
  </tile>
  <tile id="8">
   <image width="173" height="200" source="tiles/bear.png"/>

diff --git a/assets/Tiled/propertytypes.json b/assets/Tiled/propertytypes.json
@@ -58,16 +58,6 @@
                 "name": "beatList",
                 "type": "string",
                 "value": "15"
-            },
-            {
-                "name": "beeBeat",
-                "type": "float",
-                "value": 1
-            },
-            {
-                "name": "isRight",
-                "type": "bool",
-                "value": false
             }
         ],
         "name": "Beehive",
@@ -109,6 +99,15 @@
             "project"
         ]
     },
+    {
+        "id": 8,
+        "name": "laser",
+        "storageType": "string",
+        "type": "enum",
+        "values": [
+        ],
+        "valuesAsFlags": false
+    },
     {
         "color": "#ffa0a0a4",
         "drawFill": true,
@@ -158,6 +157,41 @@
         "color": "#ffa0a0a4",
         "drawFill": true,
         "id": 6,
+        "members": [
+            {
+                "name": "pulsePerBeat",
+                "type": "float",
+                "value": 1
+            },
+            {
+                "name": "pulseScale",
+                "type": "float",
+                "value": 1.1
+            },
+            {
+                "name": "shrinkRate",
+                "type": "float",
+                "value": 0.01
+            }
+        ],
+        "name": "Pulse",
+        "type": "class",
+        "useAs": [
+            "property",
+            "map",
+            "layer",
+            "object",
+            "tile",
+            "tileset",
+            "wangcolor",
+            "wangset",
+            "project"
+        ]
+    },
+    {
+        "color": "#ffa0a0a4",
+        "drawFill": true,
+        "id": 7,
         "members": [
             {
                 "name": "genre",

diff --git a/assets/Tiled/rabbeatLevelBat.tmx b/assets/Tiled/rabbeatLevelBat.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="120" height="17" tilewidth="64" tileheight="64" infinite="0" nextlayerid="23" nextobjectid="881">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="120" height="17" tilewidth="64" tileheight="64" infinite="0" nextlayerid="23" nextobjectid="883">
  <editorsettings>
   <export target="../levelsJson/rabbeatLevelBat.tmj" format="json"/>
  </editorsettings>
@@ -45,11 +45,9 @@
   <object id="807" type="Pulse" gid="261" x="127" y="768" width="128" height="128"/>
   <object id="838" gid="51" x="1310" y="80" width="875" height="128"/>
   <object id="839" gid="51" x="2057" y="109" width="875" height="128"/>
-  <object id="840" gid="51" x="3455" y="615" width="875" height="128"/>
   <object id="841" gid="51" x="5508" y="126" width="875" height="128"/>
-  <object id="853" gid="306" x="5599" y="332" width="120" height="120"/>
-  <object id="854" gid="306" x="5759" y="332" width="120" height="120"/>
-  <object id="856" gid="306" x="5916" y="332" width="120" height="120"/>
+  <object id="853" gid="306" x="5792" y="336" width="120" height="120"/>
+  <object id="856" gid="306" x="5920" y="336" width="120" height="120"/>
   <object id="860" gid="254" x="5118" y="466" width="128" height="216"/>
   <object id="861" type="Pulse" gid="253" x="5123" y="516" width="128" height="128"/>
   <object id="862" gid="317" x="5055" y="500" width="128" height="128"/>
@@ -61,12 +59,15 @@
   <object id="870" gid="316" x="7256" y="473" width="128" height="128"/>
   <object id="831" type="Pulse" gid="277" x="2641" y="256" width="140" height="140"/>
   <object id="832" gid="276" x="2769" y="258" width="100" height="100"/>
+  <object id="881" gid="306" x="1952" y="944" width="120" height="120"/>
+  <object id="882" gid="307" x="1936" y="528" width="120" height="120"/>
+  <object id="829" gid="283" x="543" y="514" width="120" height="120"/>
+  <object id="830" gid="275" x="518" y="515" width="70" height="70"/>
  </objectgroup>
  <objectgroup id="13" name="platforms">
   <properties>
    <property name="align" value="single"/>
   </properties>
-  <object id="571" gid="137" x="2176" y="768" width="192" height="32"/>
   <object id="572" gid="137" x="2176" y="640" width="192" height="32"/>
   <object id="670" type="Platform" gid="132" x="384" y="928" width="128" height="32">
    <properties>
@@ -86,7 +87,6 @@
    </properties>
   </object>
   <object id="676" type="Platform" gid="134" x="704" y="928" width="128" height="32"/>
-  <object id="677" gid="137" x="1664" y="768" width="192" height="32"/>
   <object id="678" gid="137" x="1664" y="640" width="192" height="32"/>
   <object id="759" type="Platform" gid="134" x="1424" y="416" width="128" height="32"/>
   <object id="760" type="Platform" gid="132" x="1712" y="224" width="128" height="32">
@@ -111,30 +111,29 @@
   <object id="874" gid="137" x="5744" y="576" width="192" height="32"/>
   <object id="875" gid="137" x="5744" y="704" width="192" height="32"/>
   <object id="876" gid="137" x="5744" y="832" width="192" height="32"/>
-  <object id="877" gid="137" x="5920" y="832" width="192" height="32"/>
   <object id="878" gid="137" x="6752" y="832" width="192" height="32"/>
   <object id="879" gid="137" x="6752" y="960" width="192" height="32"/>
   <object id="880" gid="137" x="6752" y="480" width="192" height="32"/>
  </objectgroup>
  <layer id="1" name="walls" width="120" height="17">
   <data encoding="csv">
-174,174,174,174,177,177,177,177,174,174,174,177,177,177,174,174,174,174,174,174,174,178,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,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,178,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
-174,174,174,178,0,0,0,0,176,177,178,0,0,0,176,174,174,174,174,174,178,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,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,178,0,0,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
-174,174,178,0,0,0,0,0,0,0,0,0,0,0,0,176,174,174,174,178,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,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,177,177,177,177,177,177,177,177,177,177,177,174,174,177,177,177,178,0,0,0,0,0,0,0,0,0,0,0,0,0,176,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
-174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,170,172,0,0,0,0,0,170,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,177,178,0,0,0,0,0,0,0,0,0,0,0,176,178,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,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,176,178,0,0,0,0,0,176,178,0,0,0,0,0,310,313,311,312,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,178,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,177,174,175,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,175,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,170,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,175,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,175,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,176,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,175,0,0,0,0,0,0,0,0,0,176,177,177,177,177,177,177,177,177,177,177,178,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,310,313,311,0,0,0,0,0,176,177,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,175,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,310,313,311,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,0,0,0,0,0,0,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,173,174,175,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,173,174,314,310,313,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,173,174,175,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,0,0,0,0,0,0,0,0,0,0,0,0,
-174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,175,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,173,174,175,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,0,0,0,0,0,0,0,0,0,310,313,311,
-174,175,0,0,0,0,0,0,173,174,175,0,0,0,0,0,170,171,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,175,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,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
-174,175,0,0,0,0,0,0,173,174,175,0,0,0,0,0,176,177,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,175,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,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
-174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,174,311,312,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
-174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
-174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,174,174,174,174,310,313,311,312,314,310,313,311,312,314,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
-174,174,310,313,311,312,314,310,174,174,174,312,314,310,313,311,312,314,310,313,311,312,314,310,313,311,312,314,310,313,311,312,314,310,313,311,312,314,310,0,0,0,0,173,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174
+174,174,174,174,177,177,177,177,174,174,174,177,177,177,174,174,174,174,174,174,174,175,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,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,178,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
+174,174,174,178,0,0,0,0,176,177,178,0,0,0,176,174,174,174,174,174,174,175,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,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,178,0,0,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,
+174,174,178,0,0,0,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,175,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,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,177,177,177,177,177,177,177,177,177,177,177,174,174,177,177,177,178,0,0,0,0,0,0,0,0,0,0,0,0,0,176,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,177,
+174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,175,0,0,0,0,0,170,172,0,0,0,0,0,170,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,177,178,0,0,0,0,0,0,0,0,0,0,0,176,178,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,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,175,0,0,0,0,0,176,178,0,0,0,0,0,176,178,0,0,0,0,0,310,313,311,312,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,174,174,178,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,177,174,175,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,174,175,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,174,171,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,175,0,0,0,0,0,0,0,0,176,174,174,174,174,174,174,174,174,174,174,174,175,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,175,0,0,0,0,0,0,0,0,0,176,177,177,177,177,177,177,177,177,177,177,178,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,310,313,311,0,0,0,0,0,176,177,177,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,175,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,310,313,311,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,0,0,0,0,0,0,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,173,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,314,310,313,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,173,174,175,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,0,0,0,0,0,0,0,0,0,0,0,0,
+174,175,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,173,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,175,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,173,174,175,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,0,0,0,0,0,0,0,0,0,310,313,311,
+174,175,0,0,0,0,0,0,173,174,175,0,0,0,0,0,170,171,171,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,175,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,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
+174,175,0,0,0,0,0,0,173,174,175,0,0,0,0,0,176,177,177,177,177,177,177,178,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,175,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,173,174,175,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,0,0,0,0,0,0,0,0,0,173,174,174,
+174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,174,311,312,314,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,170,171,171,171,171,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,
+174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,
+174,175,0,0,0,0,0,0,173,174,175,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,173,174,174,174,174,174,174,174,310,313,311,312,314,310,313,311,312,314,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,
+174,174,310,313,311,312,314,310,174,174,174,312,314,310,313,311,312,314,310,313,311,312,314,310,313,311,312,314,310,313,311,312,314,310,313,311,312,314,310,0,0,0,0,173,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,173,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174,174,174,175,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,173,174,174
 </data>
  </layer>
  <objectgroup id="21" name="wallArt">
@@ -153,8 +152,6 @@
   <object id="825" type="Pulse" gid="273" x="2780" y="942" width="128" height="121"/>
   <object id="826" type="Pulse" gid="272" x="2853" y="1036" width="128" height="121"/>
   <object id="828" type="Pulse" gid="273" x="3086" y="1053" width="128" height="121"/>
-  <object id="829" gid="283" x="543" y="514" width="120" height="120"/>
-  <object id="830" gid="275" x="518" y="515" width="70" height="70"/>
   <object id="833" gid="262" x="4630" y="320" width="128" height="128"/>
   <object id="844" gid="290" x="3703" y="496" width="130" height="130"/>
   <object id="846" gid="292" x="4704" y="692" width="120" height="120"/>