diff --git a/resources/sprite_sheet.png b/resources/sprite_sheet.png index ca98fca..d9264c6 100644 Binary files a/resources/sprite_sheet.png and b/resources/sprite_sheet.png differ diff --git a/src/main/Game.java b/src/main/Game.java index 7284e9b..0e56586 100644 --- a/src/main/Game.java +++ b/src/main/Game.java @@ -49,6 +49,7 @@ public class Game extends Canvas implements Runnable{ private Controller c; private Skins tp; private int numberOfPlayers = 2; + private boolean padraicmode = false; public void init() { @@ -262,4 +263,7 @@ public class Game extends Canvas implements Runnable{ public void setKills(int kills) { this.kills = kills; } + public boolean getPadraic(){ + return padraicmode; + } } diff --git a/src/main/Skins.java b/src/main/Skins.java index 01eab37..d584c52 100644 --- a/src/main/Skins.java +++ b/src/main/Skins.java @@ -13,21 +13,28 @@ public class Skins { public BufferedImage enemy1; public BufferedImage padraic; public BufferedImage player2; + Game game; private SpriteSheet ss = null; public Skins(Game game) { + this.game = game; ss = new SpriteSheet(game.getSpriteSheet()); getTextures(); } private void getTextures(){ + if(game.getPadraic()){ + player = ss.grabimage(2, 2, 64, 64); + laser = ss.grabimage(3, 2, 64, 64); + enemy1 = ss.grabimage(1, 3, 64, 64); + player2 = ss.grabimage(2, 2, 64, 64); + }else{ player = ss.grabimage(playerx, playery, 64, 64); laser = ss.grabimage(2, 3, 64, 64); enemy1 = ss.grabimage(2, 1, 64, 64); - padraic = ss.grabimage(2, 2, 64, 64); player2 = ss.grabimage(3, 1, 64, 64); - + } } public void setSelection(int x, int y){