Level 1 fixes

DangerousD/Content/lvl.tmx

@@ -7,7 +7,7 @@
   <image source="doors.png" width="64" height="48"/>
  </tileset>
  <tileset firstgid="874" source="../../../../../Desktop/deathAnimation.tsx"/>
- <layer id="1" name="Collidable" class="StopTile" width="30" height="20" offsetx="-352.033" offsety="192.098">
+ <layer id="1" name="Collidable" class="StopTile" width="30" height="20" visible="0" offsetx="-352.033" offsety="192.098">
   <data encoding="csv">
    <chunk x="0" y="-16" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -147,7 +147,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,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,272,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,272,0,0,0,272,0,0,0,0,0,0,0,0,0,
 52,52,52,0,0,0,52,52,52,52,52,52,52,52,52,52,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -208,7 +208,7 @@
 0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
    <chunk x="-16" y="16" width="16" height="16">
-0,0,0,0,0,0,0,0,0,0,46,0,0,66,67,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,66,67,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,66,67,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,66,67,0,
 0,0,0,0,0,0,76,76,76,76,76,76,76,76,76,76,
@@ -317,7 +317,7 @@
 </chunk>
   </data>
  </layer>
- <layer id="6" name="Ladders" class="Platform" width="30" height="20">
+ <layer id="6" name="Ladders" class="Platform" width="30" height="20" visible="0" offsetx="-1" offsety="0">
   <data encoding="csv">
    <chunk x="-16" y="0" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -336,6 +336,24 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="0" y="0" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,696,697,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,696,697,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
    <chunk x="32" y="0" width="16" height="16">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -354,6 +372,24 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="-32" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,46,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
    <chunk x="-16" y="16" width="16" height="16">
 0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0,
@@ -372,6 +408,42 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="0" y="16" width="16" height="16">
+0,0,0,0,0,0,0,696,697,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="16" y="16" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,696,697,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
    <chunk x="32" y="16" width="16" height="16">
 0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0,
@@ -442,7 +514,7 @@
 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,
 157,157,157,157,157,157,157,157,157,157,157,157,157,157,157,157,
 157,157,157,157,157,157,258,157,157,157,149,152,157,157,157,157,
-157,157,157,157,157,157,271,157,157,157,150,153,157,696,697,157,
+157,157,157,157,157,157,271,157,157,157,150,153,157,0,0,157,
 157,157,0,204,204,204,284,204,204,204,151,154,204,709,710,204,
 157,157,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 157,157,144,144,144,144,144,144,144,144,144,144,144,144,144,144,
@@ -498,7 +570,7 @@
 29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,
 29,29,29,19,20,21,22,0,0,29,29,29,29,29,29,29,
 29,30,31,32,33,34,35,0,0,29,29,29,29,29,29,29,
-29,43,44,45,46,47,48,0,0,29,29,29,29,29,29,29,
+29,43,44,45,0,47,48,0,0,29,29,29,29,29,29,29,
 64,65,18,58,59,60,18,0,0,29,29,29,29,29,29,29,
 77,78,18,71,72,73,18,0,0,68,56,56,55,56,56,69,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -522,14 +594,14 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </chunk>
    <chunk x="16" y="0" width="16" height="16">
-157,157,157,157,267,268,157,696,697,157,157,193,157,157,235,236,
+157,157,157,157,267,268,157,0,0,157,157,193,157,157,235,236,
 157,0,204,204,280,281,204,709,710,204,204,204,204,204,204,204,
 157,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 157,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,
 157,157,157,178,179,157,157,157,157,157,157,157,157,157,157,157,
 157,157,157,191,192,157,248,249,157,157,157,157,157,157,157,157,
 157,157,157,157,157,157,250,251,157,217,261,262,263,264,217,157,
-272,204,204,204,204,204,239,240,204,230,274,275,276,277,230,204,
+0,204,204,204,204,204,239,240,204,230,274,275,276,277,230,204,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,
 157,157,157,157,157,157,157,157,243,157,157,209,210,211,212,157,
@@ -552,7 +624,7 @@
 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,
 157,157,178,179,157,157,157,157,157,157,157,157,157,157,157,157,
 157,157,191,192,157,157,157,157,258,157,157,157,248,249,157,157,
-157,157,157,157,157,696,697,157,271,157,157,157,250,251,157,157,
+157,157,157,157,157,0,0,157,271,157,157,157,250,251,157,157,
 204,204,204,204,204,709,710,204,284,204,204,204,239,240,204,204,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs

@@ -12,12 +12,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Slime : CoreEnemy
     {
-<<<<<<< HEAD
         private bool isGoRight = true;
         private bool isDown = true;
-=======
-        private bool isDown = false;
->>>>>>> main
         int leftBorder;
         int rightBorder;
         bool isAttaking = false;

DangerousD/GameCore/Managers/AppManager.cs

@@ -205,12 +205,8 @@ namespace DangerousD.GameCore
                 case GameState.Lobby:
                     break;
                 case GameState.Game:
-<<<<<<< HEAD
-                    GameManager.mapManager.LoadLevel("map");
-=======
                     GameManager.mapManager.LoadLevel("lvl");
                     GameManager.FindBorders();
->>>>>>> main
                     break;
                 case GameState.Death:
                     break;