From dbf81b15c3d181d379a3105f7d9026e82860c115 Mon Sep 17 00:00:00 2001
From: montse4 <160216050+montse4@users.noreply.github.com>
Date: Fri, 12 Jun 2026 22:48:38 +0200
Subject: [PATCH] Enemies

---
 assets/maps/Map2.tmx            |  18 +-
 assets/maps/Map4.tmx            |   8 +-
 assets/maps/MapLvl1ZonaBaja.tmx |   7 +-
 assets/maps/MapLvl2Zona1.tmx    |  32 ++--
 assets/maps/MapTemplate.tmx     | 288 ++++++++++++++------------------
 5 files changed, 160 insertions(+), 193 deletions(-)

diff --git a/assets/maps/Map2.tmx b/assets/maps/Map2.tmx
index 07a1e5a..780da9f 100644
--- a/assets/maps/Map2.tmx
+++ b/assets/maps/Map2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="136" height="158" tilewidth="64" tileheight="64" infinite="0" nextlayerid="14" nextobjectid="188">
+<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="136" height="158" tilewidth="64" tileheight="64" infinite="0" nextlayerid="14" nextobjectid="197">
  <tileset firstgid="1" name="TilesetLvl2" tilewidth="64" tileheight="64" tilecount="40" columns="10">
   <image source="Tileset_nivell_2.png" width="640" height="256"/>
   <tile id="0">
@@ -345,11 +345,15 @@
   <object id="81" name="Antagonist" type="Antagonist" x="7734.28" y="2024.48" width="59.4458" height="55.0424"/>
   <object id="92" name="Player" type="Player" x="5850" y="9576.67" width="96" height="96"/>
   <object id="82" name="EnemyStitchling" type="EnemyStitchling" x="3944" y="9640" width="32" height="32"/>
-  <object id="83" name="EnemyStitchling" type="EnemyStitchling" x="2854.67" y="9637.33" width="32" height="32"/>
   <object id="84" name="EnemyStitchling" type="EnemyStitchling" x="1185.33" y="9641.33" width="32" height="32"/>
   <object id="85" name="EnemyStitchling" type="EnemyStitchling" x="2437.33" y="7392" width="32" height="32"/>
   <object id="86" name="EnemyStitchling" type="EnemyStitchling" x="7954" y="4009" width="32" height="32"/>
-  <object id="91" name="EnemyPlush" type="EnemyPlush" x="1954.67" y="9641.33" width="32" height="32"/>
+  <object id="191" name="Enemy" type="EnemyWindUpScurry" x="5355.33" y="5770.67" width="64" height="64"/>
+  <object id="192" name="Enemy" type="EnemyWindUpScurry" x="2566" y="5718" width="64" height="64"/>
+  <object id="193" name="Enemy" type="EnemyWindUpScurry" x="1258" y="7382" width="64" height="64"/>
+  <object id="194" name="Enemy" type="EnemyWindUpScurry" x="6772" y="3972" width="64" height="64"/>
+  <object id="195" name="Enemy" type="EnemyWindUpScurry" x="2820.67" y="9610" width="64" height="64"/>
+  <object id="196" name="Enemy" type="EnemyWindUpScurry" x="1906" y="9608" width="64" height="64"/>
  </objectgroup>
  <layer id="1" name="Map" width="136" height="158">
   <properties>
@@ -420,10 +424,10 @@
 52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,70,52,52,52,52,
 52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,70,52,52,52,52,52,
 52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,41,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,70,52,52,52,52,52,52,
-52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,60,52,52,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
-52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,41,70,52,52,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
-52,52,52,52,52,52,52,52,52,68,69,69,69,69,69,69,69,69,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,0,75,0,0,75,0,0,0,41,42,42,42,42,42,42,42,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,41,70,52,52,52,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
-52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,41,70,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,46,67,62,62,62,62,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
+52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
+52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,41,70,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
+52,52,52,52,52,52,52,52,52,68,69,69,69,69,69,69,69,69,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,43,0,75,0,0,75,0,0,0,41,42,42,42,42,42,42,42,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,41,70,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
+52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,41,70,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,46,67,62,62,62,62,50,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
 52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,41,70,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,75,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
 52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,41,42,70,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,68,43,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
 52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,41,70,52,48,62,50,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,53,0,0,0,0,0,0,0,60,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,52,
diff --git a/assets/maps/Map4.tmx b/assets/maps/Map4.tmx
index 6e7b9bf..f609075 100644
--- a/assets/maps/Map4.tmx
+++ b/assets/maps/Map4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="122" height="81" tilewidth="64" tileheight="64" infinite="0" nextlayerid="13" nextobjectid="137">
+<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="122" height="81" tilewidth="64" tileheight="64" infinite="0" nextlayerid="13" nextobjectid="138">
  <tileset firstgid="1" name="Tileset 4" tilewidth="64" tileheight="64" tilecount="100" columns="10">
   <image source="Nivell 1/Tileset.png" width="640" height="640"/>
   <tile id="0">
@@ -318,7 +318,7 @@
  <imagelayer id="9" name="Background" offsetx="0" offsety="-6272">
   <image source="../textures/fons_enviroment/Map4/Map4_fondo_delante_1.png" width="11072" height="11392"/>
  </imagelayer>
- <objectgroup id="11" name="Background">
+ <objectgroup id="11" name="background">
   <object id="93" gid="223" x="4284" y="5116.67" width="661.333" height="449.5"/>
   <object id="95" gid="228" x="2205.33" y="5120.33" width="415.057" height="210.894"/>
   <object id="96" gid="215" x="1841.02" y="5021.45" width="340.126" height="297.072" rotation="6.91376"/>
@@ -338,7 +338,7 @@
   <object id="111" gid="219" x="4479.14" y="2592" width="742.137" height="493.574" rotation="180"/>
   <object id="136" gid="2147483866" x="3422.11" y="3525.36" width="1270" height="423" rotation="-305.587"/>
  </objectgroup>
- <objectgroup id="12" name="MiddlegroundFin">
+ <objectgroup id="12" name="middleground">
   <object id="112" gid="244" x="4538" y="5135" width="503.627" height="657.03"/>
   <object id="113" gid="249" x="2705" y="5127" width="627" height="417"/>
   <object id="114" gid="254" x="3608" y="4960" width="248.357" height="244"/>
@@ -478,5 +478,5 @@
    <point/>
   </object>
  </objectgroup>
- <objectgroup id="3" name="Foreground"/>
+ <objectgroup id="3" name="foreground"/>
 </map>
diff --git a/assets/maps/MapLvl1ZonaBaja.tmx b/assets/maps/MapLvl1ZonaBaja.tmx
index 86abb86..3fabed7 100644
--- a/assets/maps/MapLvl1ZonaBaja.tmx
+++ b/assets/maps/MapLvl1ZonaBaja.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="152" height="81" tilewidth="64" tileheight="64" infinite="0" nextlayerid="19" nextobjectid="1438">
+<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="152" height="81" tilewidth="64" tileheight="64" infinite="0" nextlayerid="19" nextobjectid="1440">
  <tileset firstgid="1" name="Tileset" tilewidth="64" tileheight="64" tilecount="100" columns="10">
   <image source="Nivell 1/Tileset.png" width="640" height="640"/>
   <tile id="0">
@@ -12809,11 +12809,11 @@
   <object id="1373" gid="193" x="3308.45" y="3719.26" width="170" height="165"/>
   <object id="1374" gid="192" x="2903.45" y="3673.26" width="310" height="127"/>
  </objectgroup>
- <objectgroup id="7" name="Entities">
+ <objectgroup id="7" name="Entities" class="EnemyWindUpScurry">
   <object id="1294" name="Player" type="Player" x="2428" y="170" width="96" height="96"/>
   <object id="1398" name="Antagonist" type="Antagonist" x="5696.94" y="1544.48" width="59.4458" height="55.0424"/>
   <object id="1399" name="Antagonist" type="Antagonist" x="1318.28" y="4800.48" width="59.4458" height="55.0424"/>
-  <object id="1397" name="WindUpScurry" type="EnemyWindUpScurry" x="1628" y="170" width="64" height="64"/>
+  <object id="1397" name="Enemy" type="EnemyWindUpScurry" x="1918" y="500" width="64" height="64"/>
   <object id="1420" name="HidingRock" type="HidingRock" x="4635" y="1510" width="120" height="100">
    <properties>
     <property name="rock_type" type="int" value="1"/>
@@ -12824,6 +12824,7 @@
     <property name="rock_type" type="int" value="1"/>
    </properties>
   </object>
+  <object id="1439" name="Enemy" type="EnemyWindUpScurry" x="3597" y="1543" width="64" height="64"/>
  </objectgroup>
  <objectgroup id="8" name="Portals" class="Portals">
   <object id="1291" type="Portal" x="2292" y="2" width="340" height="71.3333">
diff --git a/assets/maps/MapLvl2Zona1.tmx b/assets/maps/MapLvl2Zona1.tmx
index 14fd346..afad772 100644
--- a/assets/maps/MapLvl2Zona1.tmx
+++ b/assets/maps/MapLvl2Zona1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="170" height="104" tilewidth="64" tileheight="64" infinite="0" nextlayerid="24" nextobjectid="553">
+<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="170" height="104" tilewidth="64" tileheight="64" infinite="0" nextlayerid="24" nextobjectid="557">
  <tileset firstgid="1" name="Tileset" tilewidth="64" tileheight="64" tilecount="100" columns="10">
   <image source="Nivell 2/TL_Nivell_2_01.png" width="640" height="640"/>
   <tile id="0">
@@ -14073,11 +14073,11 @@
    <tile gid="12"/>
    <tile gid="12"/>
    <tile gid="12"/>
-   <tile gid="28"/>
-   <tile gid="3"/>
+   <tile gid="13"/>
    <tile/>
    <tile/>
-   <tile gid="35"/>
+   <tile gid="37"/>
+   <tile gid="40"/>
    <tile/>
    <tile/>
    <tile/>
@@ -14243,8 +14243,8 @@
    <tile gid="12"/>
    <tile gid="12"/>
    <tile gid="12"/>
-   <tile gid="12"/>
-   <tile gid="13"/>
+   <tile gid="28"/>
+   <tile gid="3"/>
    <tile/>
    <tile/>
    <tile/>
@@ -18040,12 +18040,6 @@
  </layer>
  <objectgroup id="18" name="Weapons"/>
  <objectgroup id="12" name="Entities">
-  <object id="370" name="EnemyStitchling" type="EnemyStitchling" x="8399" y="5989" width="32" height="32">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
   <object id="371" name="EnemyPlush" type="EnemyPlush" x="3774.67" y="6564" width="32" height="32">
    <properties>
     <property name="patrol_left" type="float" value="6000"/>
@@ -18058,16 +18052,14 @@
     <property name="patrol_right" type="float" value="6400"/>
    </properties>
   </object>
-  <object id="380" name="EnemyStitchling" type="EnemyStitchling" x="4374" y="1572" width="32" height="32"/>
+  <object id="380" name="EnemyStitchling" type="EnemyStitchling" x="4934" y="1574.67" width="32" height="32"/>
   <object id="499" name="Antagonist" type="Antagonist" x="2821.79" y="6499.75" width="59.4458" height="55.0424"/>
   <object id="500" name="EnemyPlush" type="EnemyPlush" x="9451.33" y="5995" width="32" height="32"/>
-  <object id="501" name="EnemyPlush" type="EnemyPlush" x="6500.67" y="5740.61" width="32" height="32"/>
   <object id="502" name="EnemyPlush" type="EnemyPlush" x="4590.67" y="6437.33" width="32" height="32"/>
-  <object id="503" name="EnemyPlush" type="EnemyPlush" x="1422.67" y="6054.67" width="32" height="32"/>
-  <object id="504" name="EnemyPlush" type="EnemyPlush" x="4938" y="1574" width="32" height="32"/>
-  <object id="552" type="Platform" x="7808" y="5952" width="192" height="64">
+  <object id="504" name="EnemyPlush" type="EnemyPlush" x="4598" y="1572.67" width="32" height="32"/>
+  <object id="552" type="Platform" x="7808" y="5999" width="128" height="61.1343">
    <properties>
-    <property name="path" value="7808,5952;7808,5376"/>
+    <property name="path" value="7808,5999;7808,5376"/>
     <property name="platform_name" value="Ascensor1"/>
     <property name="require_lever" type="bool" value="false"/>
     <property name="speed" type="float" value="4"/>
@@ -18075,6 +18067,10 @@
     <property name="trigger" type="bool" value="false"/>
    </properties>
   </object>
+  <object id="553" name="Enemy" type="EnemyWindUpScurry" x="8448" y="5961" width="64" height="64"/>
+  <object id="554" name="Enemy" type="EnemyWindUpScurry" x="6097" y="5706" width="64" height="64"/>
+  <object id="555" name="Enemy" type="EnemyWindUpScurry" x="1358" y="6030" width="64" height="64"/>
+  <object id="556" name="Tirachinas" type="Tirachinas" x="5781.33" y="507.238" width="40" height="38.0952"/>
  </objectgroup>
  <objectgroup id="22" name="Spawns">
   <object id="487" type="Spawn" x="10218.7" y="5968">
diff --git a/assets/maps/MapTemplate.tmx b/assets/maps/MapTemplate.tmx
index 7d40889..6c8894d 100644
--- a/assets/maps/MapTemplate.tmx
+++ b/assets/maps/MapTemplate.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="160" height="138" tilewidth="64" tileheight="64" infinite="0" nextlayerid="49" nextobjectid="2041">
+<map version="1.10" tiledversion="1.12.1" orientation="orthogonal" renderorder="right-down" width="160" height="138" tilewidth="64" tileheight="64" infinite="0" nextlayerid="49" nextobjectid="2044">
  <tileset firstgid="1" name="MapMetadata" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="2" columns="2">
   <image source="MapMetadata.png" width="67" height="34"/>
  </tileset>
@@ -373,151 +373,6 @@
  <objectgroup id="31" name="Fondo piedras" locked="1" parallaxx="0.2"/>
  <objectgroup id="42" name="AnimatedPlants" locked="1"/>
  <objectgroup id="33" name="AnimatedPlants Front" locked="1"/>
- <objectgroup id="9" name="Entities">
-  <object id="1332" name="Player" type="Player" x="7891.41" y="8523.97" width="52.8407" height="52.8407"/>
-  <object id="1333" name="Cape" type="Cape" x="4008.66" y="615.32"/>
-  <object id="1334" name="Enemy" type="SpiderCandy" x="5882.4" y="8528.02" width="64.1457" height="59.3942">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1336" name="Enemy" type="Bouncer" x="5777.81" y="6358.68" width="46.901" height="36.4786">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1337" name="Enemy" type="Bouncer" x="1598.56" y="6397.31" width="52.9365" height="41.1728">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1340" name="Enemy" type="Bouncer" x="4130.6" y="5228.05" width="108" height="84">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1341" name="Enemy" type="SpiderCandy" x="3264.6" y="4376.05" width="108" height="100">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1342" name="Enemy" type="SpiderCandy" x="3456.6" y="3488.05" width="108" height="100">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1345" name="Enemy" type="SpiderCandy" x="3626.3" y="536.045" width="108" height="100">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1806" name="Antagonist" type="Antagonist" x="643.277" y="6409.15" width="59.4458" height="55.0424"/>
-  <object id="1808" name="Antagonist" type="Antagonist" x="5043.55" y="2625.87" width="59.4458" height="55.0424"/>
-  <object id="1809" name="MemoryFragment" type="MemoryFragment" x="3784" y="2637" width="80" height="60">
-   <properties>
-    <property name="video_path" value="assets/video/Anchor_1.mp4"/>
-   </properties>
-  </object>
-  <object id="1811" name="HidingRock" type="HidingRock" x="6286.79" y="8529.7" width="64" height="64">
-   <properties>
-    <property name="rock_type" type="int" value="1"/>
-   </properties>
-  </object>
-  <object id="1817" name="HidingRock" type="HidingRock" x="840.727" y="6480.12" width="64" height="64">
-   <properties>
-    <property name="rock_type" type="int" value="1"/>
-   </properties>
-  </object>
-  <object id="1818" name="HidingRock" type="HidingRock" x="3964.97" y="3531.64" width="64" height="64">
-   <properties>
-    <property name="rock_type" type="int" value="1"/>
-   </properties>
-  </object>
-  <object id="1819" name="HidingRock" type="HidingRock" x="5155.88" y="3534.67" width="64" height="64">
-   <properties>
-    <property name="rock_type" type="int" value="1"/>
-   </properties>
-  </object>
-  <object id="1820" name="Enemy" type="SpiderCandy" x="9842" y="8482" width="108" height="100">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
-  <object id="1824" name="Enemy" type="Bouncer" x="3951.53" y="2579.41" width="52.9365" height="41.1728">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup id="48" name="Checkpoint">
-  <object id="1822" type="CheckPoint" x="5953.08" y="3336.67">
-   <point/>
-  </object>
-  <object id="1823" type="CheckPoint" x="385" y="5253">
-   <point/>
-  </object>
- </objectgroup>
- <objectgroup id="45" name="Portals" locked="1">
-  <object id="1403" type="Portal" x="2037" y="7913" width="212" height="468">
-   <properties>
-    <property name="spawnId" value="spawn_from_main"/>
-    <property name="target" value="MapLvl1ZonaBaja.tmx"/>
-   </properties>
-  </object>
-  <object id="1406" type="Portal" x="95.3333" y="4179.33" width="670.667" height="496">
-   <properties>
-    <property name="spawnId" value="spawn_from_main_puzzle"/>
-    <property name="target" value="MapLvl1ZonaPuzzle.tmx"/>
-   </properties>
-  </object>
-  <object id="1798" type="Portal" x="2842" y="2141" width="355" height="573">
-   <properties>
-    <property name="spawnId" value="Mapa2"/>
-    <property name="target" value="Map2"/>
-   </properties>
-  </object>
-  <object id="1821" type="Portal" x="1736.67" y="3012" width="402.667" height="648">
-   <properties>
-    <property name="spawnId" value="puzzle1"/>
-    <property name="target" value="MapLvl1ZonaPuzzle.tmx"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup id="46" name="Spawns" locked="1">
-  <object id="1405" type="Spawn" x="2179" y="7839">
-   <properties>
-    <property name="spawnId" value="spawn_return_room1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="1408" type="Spawn" x="408" y="4843">
-   <properties>
-    <property name="spawnId" value="spawn_return_puzzle"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="1799" type="Spawn" x="2319.06" y="3574.42">
-   <properties>
-    <property name="spawnId" value="spawn_return_puzzle_exit"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="1801" type="Spawn" x="3345" y="2553">
-   <properties>
-    <property name="spawnId" value="Mapa1"/>
-   </properties>
-   <point/>
-  </object>
- </objectgroup>
  <objectgroup id="28" name="Background">
   <object id="1454" gid="149" x="5905.87" y="8266.75" width="162.048" height="162.596"/>
   <object id="1455" gid="149" x="2960.25" y="7232.97" width="151.407" height="151.918"/>
@@ -549,7 +404,6 @@
   <object id="1481" gid="1073741977" x="6193.38" y="8596.66" width="248.447" height="255.627"/>
   <object id="1482" gid="155" x="8747" y="8601.07" width="163.476" height="134.854"/>
   <object id="1484" gid="155" x="3912.73" y="6429.53" width="162.845" height="134.333"/>
-  <object id="1485" gid="155" x="386.106" y="4893.17" width="145.575" height="120.087"/>
   <object id="1486" gid="155" x="596.608" y="6550.9" width="145.575" height="120.087"/>
   <object id="1487" gid="155" x="3356.51" y="1642.37" width="297" height="245"/>
   <object id="1489" gid="157" x="4991.54" y="2714.02" width="364" height="302"/>
@@ -22847,18 +22701,75 @@
    <tile gid="16"/>
   </data>
  </layer>
- <objectgroup id="48" name="Checkpoint" locked="1">
+ <objectgroup id="48" name="Checkpoint">
   <object id="1822" type="CheckPoint" x="5824.03" y="3277.17">
    <point/>
   </object>
-  <object id="1823" type="CheckPoint" x="385" y="5253">
+ </objectgroup>
+ <objectgroup id="48" name="Checkpoint">
+  <object id="1822" type="CheckPoint" x="5953.08" y="3336.67">
+   <point/>
+  </object>
+  <object id="1823" type="CheckPoint" x="384" y="5268">
+   <point/>
+  </object>
+ </objectgroup>
+ <objectgroup id="45" name="Portals" locked="1">
+  <object id="1403" type="Portal" x="2037" y="7913" width="212" height="468">
+   <properties>
+    <property name="spawnId" value="spawn_from_main"/>
+    <property name="target" value="MapLvl1ZonaBaja.tmx"/>
+   </properties>
+  </object>
+  <object id="1406" type="Portal" x="95.3333" y="4179.33" width="670.667" height="496">
+   <properties>
+    <property name="spawnId" value="spawn_from_main_puzzle"/>
+    <property name="target" value="MapLvl1ZonaPuzzle.tmx"/>
+   </properties>
+  </object>
+  <object id="1798" type="Portal" x="2842" y="2141" width="355" height="573">
+   <properties>
+    <property name="spawnId" value="Mapa2"/>
+    <property name="target" value="Map2"/>
+   </properties>
+  </object>
+  <object id="1821" type="Portal" x="1736.67" y="3012" width="402.667" height="648">
+   <properties>
+    <property name="spawnId" value="puzzle1"/>
+    <property name="target" value="MapLvl1ZonaPuzzle.tmx"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="46" name="Spawns" locked="1">
+  <object id="1405" type="Spawn" x="2179" y="7839">
+   <properties>
+    <property name="spawnId" value="spawn_return_room1"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="1408" type="Spawn" x="408" y="4843">
+   <properties>
+    <property name="spawnId" value="spawn_return_puzzle"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="1799" type="Spawn" x="2319.06" y="3574.42">
+   <properties>
+    <property name="spawnId" value="spawn_return_puzzle_exit"/>
+   </properties>
+   <point/>
+  </object>
+  <object id="1801" type="Spawn" x="3345" y="2553">
+   <properties>
+    <property name="spawnId" value="Mapa1"/>
+   </properties>
    <point/>
   </object>
  </objectgroup>
  <objectgroup id="9" name="Entities">
   <object id="1332" name="Player" type="Player" x="7891.41" y="8523.97" width="52.8407" height="52.8407"/>
   <object id="1333" name="Cape" type="Cape" x="4008.66" y="615.32"/>
-  <object id="1334" name="Enemy" type="SpiderCandy" x="6032.4" y="8476.02" width="64.1457" height="59.3942">
+  <object id="1334" name="Enemy" type="SpiderCandy" x="4747.4" y="8479.02" width="64.1457" height="59.3942">
    <properties>
     <property name="patrol_left" type="float" value="6000"/>
     <property name="patrol_right" type="float" value="6400"/>
@@ -22870,7 +22781,7 @@
     <property name="patrol_right" type="float" value="6400"/>
    </properties>
   </object>
-  <object id="1337" name="Enemy" type="Bouncer" x="1598.56" y="6397.31" width="52.9365" height="41.1728">
+  <object id="1337" name="Enemy" type="Bouncer" x="1378.56" y="6494.64" width="52.9365" height="41.1728">
    <properties>
     <property name="patrol_left" type="float" value="6000"/>
     <property name="patrol_right" type="float" value="6400"/>
@@ -22900,19 +22811,19 @@
     <property name="patrol_right" type="float" value="6400"/>
    </properties>
   </object>
-  <object id="1806" name="Antagonist" type="Antagonist" x="526.944" y="6480.48" width="59.4458" height="55.0424"/>
+  <object id="1806" name="Antagonist" type="Antagonist" x="3975.28" y="6337.15" width="59.4458" height="55.0424"/>
   <object id="1808" name="Antagonist" type="Antagonist" x="5043.55" y="2625.87" width="59.4458" height="55.0424"/>
   <object id="1809" name="MemoryFragment" type="MemoryFragment" x="3784" y="2637" width="80" height="60">
    <properties>
     <property name="video_path" value="assets/video/Anchor_1.mp4"/>
    </properties>
   </object>
-  <object id="1811" name="HidingRock" type="HidingRock" x="6527.46" y="8525.03" width="64" height="64">
+  <object id="1811" name="HidingRock" type="HidingRock" x="4892.79" y="8523.7" width="64" height="64">
    <properties>
     <property name="rock_type" type="int" value="1"/>
    </properties>
   </object>
-  <object id="1817" name="HidingRock" type="HidingRock" x="815.394" y="6471.45" width="64" height="64">
+  <object id="1817" name="HidingRock" type="HidingRock" x="1684.73" y="6480.12" width="64" height="64">
    <properties>
     <property name="rock_type" type="int" value="1"/>
    </properties>
@@ -22940,6 +22851,67 @@
    </properties>
   </object>
  </objectgroup>
+ <objectgroup id="9" name="Entities">
+  <object id="1332" name="Player" type="Player" x="7891.41" y="8523.97" width="52.8407" height="52.8407"/>
+  <object id="1333" name="Cape" type="Cape" x="4008.66" y="615.32"/>
+  <object id="1334" name="Enemy" type="SpiderCandy" x="6011.4" y="8490.02" width="64.1457" height="59.3942">
+   <properties>
+    <property name="patrol_left" type="float" value="6000"/>
+    <property name="patrol_right" type="float" value="6400"/>
+   </properties>
+  </object>
+  <object id="1337" name="Enemy" type="Bouncer" x="1027.89" y="6493.31" width="52.9365" height="41.1728">
+   <properties>
+    <property name="patrol_left" type="float" value="6000"/>
+    <property name="patrol_right" type="float" value="6400"/>
+   </properties>
+  </object>
+  <object id="1345" name="Enemy" type="SpiderCandy" x="3626.3" y="536.045" width="108" height="100">
+   <properties>
+    <property name="patrol_left" type="float" value="6000"/>
+    <property name="patrol_right" type="float" value="6400"/>
+   </properties>
+  </object>
+  <object id="1806" name="Antagonist" type="Antagonist" x="526.944" y="6480.48" width="59.4458" height="55.0424"/>
+  <object id="1808" name="Antagonist" type="Antagonist" x="5043.55" y="2625.87" width="59.4458" height="55.0424"/>
+  <object id="1809" name="MemoryFragment" type="MemoryFragment" x="3784" y="2637" width="80" height="60">
+   <properties>
+    <property name="video_path" value="assets/video/Anchor_1.mp4"/>
+   </properties>
+  </object>
+  <object id="1811" name="HidingRock" type="HidingRock" x="6415.46" y="8534.36" width="64" height="64">
+   <properties>
+    <property name="rock_type" type="int" value="1"/>
+   </properties>
+  </object>
+  <object id="1817" name="HidingRock" type="HidingRock" x="807.394" y="6480.78" width="64" height="64">
+   <properties>
+    <property name="rock_type" type="int" value="1"/>
+   </properties>
+  </object>
+  <object id="1818" name="HidingRock" type="HidingRock" x="3964.97" y="3531.64" width="64" height="64">
+   <properties>
+    <property name="rock_type" type="int" value="1"/>
+   </properties>
+  </object>
+  <object id="1819" name="HidingRock" type="HidingRock" x="5155.88" y="3534.67" width="64" height="64">
+   <properties>
+    <property name="rock_type" type="int" value="1"/>
+   </properties>
+  </object>
+  <object id="1820" name="Enemy" type="SpiderCandy" x="9842" y="8482" width="108" height="100">
+   <properties>
+    <property name="patrol_left" type="float" value="6000"/>
+    <property name="patrol_right" type="float" value="6400"/>
+   </properties>
+  </object>
+  <object id="2043" name="Enemy" type="SpiderCandy" x="3101" y="7528" width="108" height="100">
+   <properties>
+    <property name="patrol_left" type="float" value="6000"/>
+    <property name="patrol_right" type="float" value="6400"/>
+   </properties>
+  </object>
+ </objectgroup>
  <objectgroup id="25" name="Foreground">
   <object id="1411" gid="204" x="6151.5" y="6470.05" width="495" height="736"/>
   <object id="1412" gid="204" x="9041.5" y="8696.05" width="495" height="736"/>
@@ -22953,7 +22925,7 @@
   <object id="1421" gid="1073742031" x="8173.51" y="7617.44" width="874.934" height="1086" rotation="87.4232"/>
   <object id="1422" gid="1073742019" x="5026.04" y="8109.94" width="170.461" height="176.401" rotation="180"/>
   <object id="1423" gid="200" x="3337.5" y="4591.05" width="251" height="209"/>
-  <object id="1441" gid="218" x="1894.28" y="6752.62" width="241.44" height="242.105"/>
+  <object id="1441" gid="218" x="1943.61" y="6733.95" width="153.44" height="153.863"/>
   <object id="1447" gid="199" x="4218.2" y="3644.02" width="183.011" height="153.333"/>
   <object id="1448" gid="220" x="2262" y="3646.73" width="299" height="205"/>
   <object id="1449" gid="1073742026" x="4017.67" y="3373.64" width="240" height="342"/>
@@ -22981,12 +22953,6 @@
   <object id="1770" gid="165" x="5507.71" y="6410.83" width="33.4387" height="56.4549"/>
   <object id="1771" gid="165" x="4645.28" y="1621.33" width="77" height="130"/>
   <object id="1774" gid="184" x="7690.84" y="8591.09" width="26.9708" height="56.6937"/>
-  <object id="1775" name="Enemy" type="SpiderCandy" x="3139.46" y="7505.73" width="108" height="100">
-   <properties>
-    <property name="patrol_left" type="float" value="6000"/>
-    <property name="patrol_right" type="float" value="6400"/>
-   </properties>
-  </object>
   <object id="1778" gid="208" x="4156.55" y="5479.54" width="904" height="719"/>
   <object id="1779" gid="197" x="8901.69" y="7362.55" width="273.278" height="251.353"/>
   <object id="1781" gid="206" x="4836.51" y="8593.61" width="72.7976" height="234.57"/>