diff --git a/core/assets/levels/level1.tmx b/core/assets/levels/level1.tmx index c226eb1..630da21 100644 --- a/core/assets/levels/level1.tmx +++ b/core/assets/levels/level1.tmx @@ -8,7 +8,7 @@ - eJztk8EKACAIQzX//5/rOEKWktGhHgxPy5kl8qmggSLokE31FprsH53xFYyIeRAVvofV+dmdNEcMdYS5mA/rLl6GarJ/OeLP3PVJsH/03bLsHTB3AJM= + eJxjYBgFo2AUDARgIoAHC2AmgKkB0P2Oyy5GApge4YnL7pEIALMwAF8= diff --git a/core/assets/levels/level10.tmx b/core/assets/levels/level10.tmx new file mode 100644 index 0000000..630da21 --- /dev/null +++ b/core/assets/levels/level10.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFo2AUDARgIoAHC2AmgKkB0P2Oyy5GApge4YnL7pEIALMwAF8= + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level2.tmx b/core/assets/levels/level2.tmx index 099e802..9eda0ee 100644 --- a/core/assets/levels/level2.tmx +++ b/core/assets/levels/level2.tmx @@ -8,7 +8,7 @@ - eJxjYBgFo2B4ACYK9TMSqQaGKTWLFECJeUxYMDJghmJk9aS4B5t55AJK9A60HZSmv6EIAF6cACk= + eJxjYBgFo2AUDBbAhIZBgBENEwPQ9WDDIMCMBWNzB8wtxNhFCSDWTkoBNj9TyyxKzRtKAACkFABW diff --git a/core/assets/levels/level3.tmx b/core/assets/levels/level3.tmx new file mode 100644 index 0000000..e106351 --- /dev/null +++ b/core/assets/levels/level3.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFQwEwo2EQYELDuNQxomFcerGpI9ZedIBuFiMOdaNg4AB6POKKy4EG5KYhbGkQV/rHlX9w5SFyzRluAACcKwCU + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level4.tmx b/core/assets/levels/level4.tmx new file mode 100644 index 0000000..fdfe0a3 --- /dev/null +++ b/core/assets/levels/level4.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFIwkwDbQDqARo4Q9qm8mEhEGAEQsGyTFjwYTMw+dWbHLo9mIDxLqDWDtJsRuXmcToJSZMSLGTEoAtDIdzngMA3GQAZw== + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level5.tmx b/core/assets/levels/level5.tmx new file mode 100644 index 0000000..2a8a752 --- /dev/null +++ b/core/assets/levels/level5.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFQxkwQTE6YEbDIMCIhpH1I5tDrF5KALr5QwngCvPBBNDjkBrxh08/rrjEpR5XGKKnRXoAQm5BB6T6dTgDAE5DAG8= + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level6.tmx b/core/assets/levels/level6.tmx new file mode 100644 index 0000000..8aac1ac --- /dev/null +++ b/core/assets/levels/level6.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgF2AAjFA8FwISE0cFg9gcjA373MWLB1AC4wopUwIyEKQFMDNjjENlcQuGA7A5GPGbispdUwMxAPf+TAmiRHkYB+QAA8XAAVA== + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level7.tmx b/core/assets/levels/level7.tmx new file mode 100644 index 0000000..4655376 --- /dev/null +++ b/core/assets/levels/level7.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFlAJmKKYGYETC2OxAt4cJCRNSj24uLr3DHSCHAylhOtBgsLqLWEBttzNiwcj2wOzClg/Q3UNqvhsFEAAAL3cAZA== + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level8.tmx b/core/assets/levels/level8.tmx new file mode 100644 index 0000000..630da21 --- /dev/null +++ b/core/assets/levels/level8.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFo2AUDARgIoAHC2AmgKkB0P2Oyy5GApge4YnL7pEIALMwAF8= + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/levels/level9.tmx b/core/assets/levels/level9.tmx new file mode 100644 index 0000000..630da21 --- /dev/null +++ b/core/assets/levels/level9.tmx @@ -0,0 +1,32 @@ + + + + + + + + + + + eJxjYBgFo2AUDARgIoAHC2AmgKkB0P2Oyy5GApge4YnL7pEIALMwAF8= + + + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/textures/player_yellow.png b/core/assets/textures/player_yellow.png new file mode 100644 index 0000000..69e6a98 Binary files /dev/null and b/core/assets/textures/player_yellow.png differ diff --git a/core/src/com/game/Actor/Base.java b/core/src/com/game/Actor/Base.java index 6bee386..301cf45 100644 --- a/core/src/com/game/Actor/Base.java +++ b/core/src/com/game/Actor/Base.java @@ -24,6 +24,7 @@ public abstract class Base { RED, GREEN, BLUE, + YELLOW, NONE, } diff --git a/core/src/com/game/Actor/Player.java b/core/src/com/game/Actor/Player.java index a3635ac..0e33d17 100644 --- a/core/src/com/game/Actor/Player.java +++ b/core/src/com/game/Actor/Player.java @@ -105,6 +105,12 @@ public class Player extends Base { bits |= Vars.BIT_BLUE; texture = App.assets.get("textures/player_blue.png", Texture.class); break; + case YELLOW: + bits &= ~Vars.BIT_RED; + bits &= ~Vars.BIT_GREEN; + bits |= Vars.BIT_BLUE; + texture = App.assets.get("textures/player_yellow.png", Texture.class); + break; } filter.maskBits = bits; diff --git a/core/src/com/game/Screens/Play.java b/core/src/com/game/Screens/Play.java index 1446b98..a7293d6 100644 --- a/core/src/com/game/Screens/Play.java +++ b/core/src/com/game/Screens/Play.java @@ -216,6 +216,10 @@ public class Play extends AbstractScreen { colourchangeSound.play(); player.setCurColour(Base.Colours.BLUE); } + if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_4)) + { + player.setCurColour(Base.Colours.YELLOW); + } if(Gdx.input.isKeyJustPressed(Input.Keys.V)) { isDebug = !isDebug; } }