From d91ee3946c4e1776fcb4c9d5d3dc9b7d83dfe1f0 Mon Sep 17 00:00:00 2001
From: ESloman <elliot.sloman@hotmail.com>
Date: Mon, 22 Feb 2016 14:30:33 +0000
Subject: [PATCH] Level Changes

Adding in a new layer in later levels caused old levels to crash due to
missing layer. Added empty layer for the older levels.
---
 core/assets/levels/level1.tmx       | 5 +++++
 core/assets/levels/level2.tmx       | 5 +++++
 core/assets/levels/level3.tmx       | 5 +++++
 core/assets/levels/level5.tmx       | 5 +++++
 core/src/com/game/Actor/Spike.java  | 5 ++---
 core/src/com/game/Screens/Play.java | 2 +-
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/core/assets/levels/level1.tmx b/core/assets/levels/level1.tmx
index d49126a..b28e2df 100644
--- a/core/assets/levels/level1.tmx
+++ b/core/assets/levels/level1.tmx
@@ -29,4 +29,9 @@
    <polyline points="0,0 0,640 128,640 128,0 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>
diff --git a/core/assets/levels/level2.tmx b/core/assets/levels/level2.tmx
index 9eda0ee..d07c016 100644
--- a/core/assets/levels/level2.tmx
+++ b/core/assets/levels/level2.tmx
@@ -29,4 +29,9 @@
    <polyline points="0,0 128,0 128,512 0,512 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>
diff --git a/core/assets/levels/level3.tmx b/core/assets/levels/level3.tmx
index e106351..abdf43d 100644
--- a/core/assets/levels/level3.tmx
+++ b/core/assets/levels/level3.tmx
@@ -29,4 +29,9 @@
    <polyline points="0,0 0,640 128,640 128,0 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>
diff --git a/core/assets/levels/level5.tmx b/core/assets/levels/level5.tmx
index 2a8a752..a7fd15f 100644
--- a/core/assets/levels/level5.tmx
+++ b/core/assets/levels/level5.tmx
@@ -29,4 +29,9 @@
    <polyline points="0,0 128,0 128,512 0,512 0,0"/>
   </object>
  </objectgroup>
+ <layer name="SPIKES" width="50" height="8">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMApIBwAGQAAB
+  </data>
+ </layer>
 </map>
diff --git a/core/src/com/game/Actor/Spike.java b/core/src/com/game/Actor/Spike.java
index 36e51f8..d89203c 100644
--- a/core/src/com/game/Actor/Spike.java
+++ b/core/src/com/game/Actor/Spike.java
@@ -29,10 +29,9 @@ public class Spike extends Base {
                             new Vector2((-size.x / 2 + 5) / PPM, (size.y / 2 + 5) / PPM),
                             new Vector2((size.x / 2 - 5) / PPM, (size.y / 2 + 5) / PPM)
                     },
-                    "SPIKE",
+                    "SPIKES",
                     true,
-                    Vars.BIT_MISC,
-                    Vars.BIT_PLAYER
+                    Vars.BIT_MISC, maskBits
             );
     }
 }
diff --git a/core/src/com/game/Screens/Play.java b/core/src/com/game/Screens/Play.java
index 389177c..de5d066 100644
--- a/core/src/com/game/Screens/Play.java
+++ b/core/src/com/game/Screens/Play.java
@@ -352,7 +352,7 @@ public class Play extends AbstractScreen {
     {
         introWindow = new Window("Level "+levelNumber, skin);
         introWindow.getTitleLabel().setPosition(350, 500);
-        introBackground = new Image(app.assets.get("textures/level1Intro.png", Texture.class));
+        introBackground = new Image(app.assets.get("textures/level" + levelNumber + "Intro.png", Texture.class));
         introWindow.setBackground(introBackground.getDrawable());
         introWindow.setSize(700, 500);
         introWindow.setPosition(280, 50);