diff --git a/core/assets/levels/level4.tmx b/core/assets/levels/level4.tmx index d7707dc..36ce74c 100644 --- a/core/assets/levels/level4.tmx +++ b/core/assets/levels/level4.tmx @@ -1,5 +1,5 @@ - + @@ -32,9 +32,9 @@ - - - - - + + + eJxjYBgFo2BoAFYSxUfB0AOjcTm0AAAyAAAQ + + diff --git a/core/assets/levels/level6.tmx b/core/assets/levels/level6.tmx index 8aac1ac..c198aa1 100644 --- a/core/assets/levels/level6.tmx +++ b/core/assets/levels/level6.tmx @@ -6,9 +6,12 @@ + + + - eJxjYBgF2AAjFA8FwISE0cFg9gcjA373MWLB1AC4wopUwIyEKQFMDNjjENlcQuGA7A5GPGbispdUwMxAPf+TAmiRHkYB+QAA8XAAVA== + eJxjYBgFQx0wIeGhBBiRMCF5fOpIBdQKK2YkTAlgYsAeh8jmEgoHZHcw4jETl72kAmYG6vmfFECL9DAKyAcA3mgAUA== @@ -29,4 +32,9 @@ + + + eJxjYBgFwxmwQvFIB8SGwWhYjYJRQDwAAFKUABU= + + diff --git a/core/assets/levels/level7.tmx b/core/assets/levels/level7.tmx index 4655376..52e6025 100644 --- a/core/assets/levels/level7.tmx +++ b/core/assets/levels/level7.tmx @@ -6,6 +6,9 @@ + + + eJxjYBgFlAJmKKYGYETC2OxAt4cJCRNSj24uLr3DHSCHAylhOtBgsLqLWEBttzNiwcj2wOzClg/Q3UNqvhsFEAAAL3cAZA== @@ -29,4 +32,9 @@ + + + eJxjYBj+gJUG6kk1cxQMLBiNr1EwCqgPAGTIABU= + + diff --git a/core/assets/levels/level8.tmx b/core/assets/levels/level8.tmx index e88c945..f3d1813 100644 --- a/core/assets/levels/level8.tmx +++ b/core/assets/levels/level8.tmx @@ -6,6 +6,9 @@ + + + eJxjYBgFgwEwAzHjQDuCQsCExGZEwuiAGYoHIyAUB0wMqP4kxjxkM4n1NyVhRIr78JlBql9BAFeckwIGMn1QGnbU8P9AAHLiGgQAlYAAOA== @@ -30,4 +33,9 @@ + + + eJxjYBgFo2AUUBOw0lnfKBhYMJLjDQAnTAAQ + + diff --git a/core/assets/levels/level9.tmx b/core/assets/levels/level9.tmx index 630da21..748488f 100644 --- a/core/assets/levels/level9.tmx +++ b/core/assets/levels/level9.tmx @@ -1,31 +1,29 @@ - + - + - eJxjYBgFo2AUDARgIoAHC2AmgKkB0P2Oyy5GApge4YnL7pEIALMwAF8= + eJxjYBgFo2AUDCRgRMPk6h3JgAmKYYAZCY+CUTAKRsFAAABsiAAV - + - - + + - - - + - + diff --git a/core/src/com/game/Actor/Spike.java b/core/src/com/game/Actor/Spike.java index a79fd41..36e51f8 100644 --- a/core/src/com/game/Actor/Spike.java +++ b/core/src/com/game/Actor/Spike.java @@ -11,15 +11,18 @@ import static com.game.misc.Vars.PPM; /** * Created by Elliot on 22/02/2016. */ + public class Spike extends Base { - public Spike(World world, Vector2 pos, Vector2 size, Colours curColour, short categoryBits, short maskBits) { + public Spike(World world, Vector2 pos, Vector2 size, Colours curColour, short categoryBits) { super(world, pos, size, "STATIC", curColour); body = Box2dUtils.makeBody(world, BodyDef.BodyType.StaticBody, pos ); + + short maskBits = 0; Box2dUtils.makePolygon(body, size, "", false, categoryBits, maskBits); Box2dUtils.makeChain(body, new Vector2[]{ diff --git a/core/src/com/game/Screens/Play.java b/core/src/com/game/Screens/Play.java index ff50f22..389177c 100644 --- a/core/src/com/game/Screens/Play.java +++ b/core/src/com/game/Screens/Play.java @@ -322,7 +322,7 @@ public class Play extends AbstractScreen { if(cell == null) { continue; } if(cell.getTile() == null) { continue; } - if(cell.getTile().getId() == 0) { spikes.add(new Spike(world, new Vector2((col + 0.5f) * tileSize.x, (row + 0.5f) * tileSize.y), new Vector2(tileSize.x, tileSize.y), Base.Colours.RED, Vars.BIT_RED, Vars.BIT_PLAYER)); } + if(cell.getTile().getId() == 0) { spikes.add(new Spike(world, new Vector2((col + 0.5f) * tileSize.x, (row + 0.5f) * tileSize.y), new Vector2(tileSize.x, tileSize.y), Base.Colours.RED, Vars.BIT_RED)); } } } } @@ -520,6 +520,15 @@ public class Play extends AbstractScreen { return; } + if(fa.getUserData().equals("PLAYER") && fb.getUserData().equals("SPIKES") || + fb.getUserData().equals("PLAYER") && fa.getUserData().equals("SPIKES")) + { + isEnd = true; + isSuccess = false; + System.out.println("Failure"); + return; + } + } @Override