From 061ca4ddda50c3167516f38835f9130a233a8d59 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 19 Jun 2022 17:53:52 -0700 Subject: [PATCH 1/3] Remove extraneous print statement --- src/WallSign.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/WallSign.java b/src/WallSign.java index d0a396f..d013d44 100644 --- a/src/WallSign.java +++ b/src/WallSign.java @@ -15,6 +15,5 @@ public class WallSign extends TextBox implements Serializable { newX -= GameFrame.game.camera.x; super.draw(g, new Color(0, 0, 0, 0), textColor); newX = oldX; - System.out.println(); } } From 06e81d4646caf7299c0af483477d57015833be27 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 19 Jun 2022 18:02:55 -0700 Subject: [PATCH 2/3] Allow left click to place steel --- src/Player.java | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/Player.java b/src/Player.java index 3b05898..48bddab 100644 --- a/src/Player.java +++ b/src/Player.java @@ -40,6 +40,8 @@ public class Player extends GenericSprite { // sA[2] is -x, y // sA[3] is x, y public BufferedImageWrapper[][][] spriteArray; + public boolean leftClickPlacedSteel; + public Player(int x, int y, BufferedImageWrapper[][][] sprites) throws UnsupportedAudioFileException, LineUnavailableException, IOException { super(x, y, PLAYER_HEIGHT, PLAYER_WIDTH); // jump = new Sound("sound/jump.wav"); @@ -306,13 +308,17 @@ public class Player extends GenericSprite { mouseX = e.getX(); mouseY = e.getY(); if(e.getButton()==MouseEvent.BUTTON1) { - leftMouseDown = true; + int x = (mouseX + GameFrame.game.camera.x + GamePanel.GAME_WIDTH / 2) / Tile.length; + int y = (mouseY / Tile.length); if (holdingSteel && ((GameFrame.game.map[x][y] == null || GameFrame.game.map[x][y].replaceAble) && canPlaceSteel)) { Tile temp = GameFrame.game.map[x][y]; GameFrame.game.map[x][y] = new SingleTile(x * Tile.length - (GamePanel.GAME_WIDTH / 2), y * Tile.length, new BufferedImageWrapper(("img/tiles/boxes/steel.png"))); GameFrame.game.map[x][y].movable = true; GameFrame.game.map[x][y].previousBlock = temp; holdingSteel = false; + leftClickPlacedSteel = true; + } else { + leftMouseDown = true; } } if(e.getButton()==MouseEvent.BUTTON3) { @@ -414,10 +420,14 @@ public class Player extends GenericSprite { mouseY = e.getY(); if(e.getButton()==MouseEvent.BUTTON1) { leftMouseDown = false; - if (GameFrame.game.bombs.size() < 2 && LevelManager.bombs>0 && !holdingSteel) { - LevelManager.bombs--; - GameFrame.game.bombs.add(new StickyBomb(GameFrame.game.player.x + GameFrame.game.camera.x + WIDTH/2, GameFrame.game.player.y+HEIGHT/2, - (mouseX - GameFrame.game.player.x) / 20, (mouseY - GameFrame.game.player.y) / 10, GameFrame.game.bomb, GameFrame.game.explosionArray)); + if (leftClickPlacedSteel) { + leftClickPlacedSteel = false; + } else { + if (GameFrame.game.bombs.size() < 2 && LevelManager.bombs > 0 && !holdingSteel) { + LevelManager.bombs--; + GameFrame.game.bombs.add(new StickyBomb(GameFrame.game.player.x + GameFrame.game.camera.x + WIDTH / 2, GameFrame.game.player.y + HEIGHT / 2, + (mouseX - GameFrame.game.player.x) / 20, (mouseY - GameFrame.game.player.y) / 10, GameFrame.game.bomb, GameFrame.game.explosionArray)); + } } } if(e.getButton()==MouseEvent.BUTTON3){ From 70746385f8c112841b2d0ba75d434779edb0b11e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 19 Jun 2022 18:18:08 -0700 Subject: [PATCH 3/3] Ensure unix compliance by ending every text file with a newline --- src/GameFrame.java | 2 +- src/GamePanel.java | 2 +- src/GenericSprite.java | 2 +- src/Main.java | 2 +- src/MenuPanel.java | 2 +- src/NonPlayer.java | 2 +- src/Player.java | 2 +- src/SettingPanel.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/GameFrame.java b/src/GameFrame.java index 4d16a54..60f2382 100644 --- a/src/GameFrame.java +++ b/src/GameFrame.java @@ -80,4 +80,4 @@ public class GameFrame extends JFrame{ this.setLocationRelativeTo(null);//set window in middle of screen } -} \ No newline at end of file +} diff --git a/src/GamePanel.java b/src/GamePanel.java index a05cb9d..0be5951 100644 --- a/src/GamePanel.java +++ b/src/GamePanel.java @@ -602,4 +602,4 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ return flippedImage; } -} \ No newline at end of file +} diff --git a/src/GenericSprite.java b/src/GenericSprite.java index d00d970..587aa5b 100644 --- a/src/GenericSprite.java +++ b/src/GenericSprite.java @@ -116,4 +116,4 @@ public class GenericSprite extends Rectangle implements Serializable { } -} \ No newline at end of file +} diff --git a/src/Main.java b/src/Main.java index 84f982f..cac4b9a 100644 --- a/src/Main.java +++ b/src/Main.java @@ -10,4 +10,4 @@ class Main { new GameFrame(); } -} \ No newline at end of file +} diff --git a/src/MenuPanel.java b/src/MenuPanel.java index f449e8e..53b9dc0 100644 --- a/src/MenuPanel.java +++ b/src/MenuPanel.java @@ -204,4 +204,4 @@ public class MenuPanel extends JPanel implements Runnable, KeyListener{ } -} \ No newline at end of file +} diff --git a/src/NonPlayer.java b/src/NonPlayer.java index cc73459..c685f76 100644 --- a/src/NonPlayer.java +++ b/src/NonPlayer.java @@ -101,4 +101,4 @@ public class NonPlayer extends GenericSprite implements Serializable { return 0; } } -} \ No newline at end of file +} diff --git a/src/Player.java b/src/Player.java index 48bddab..b23dfe3 100644 --- a/src/Player.java +++ b/src/Player.java @@ -461,4 +461,4 @@ public class Player extends GenericSprite { } //public int BfsDis() -} \ No newline at end of file +} diff --git a/src/SettingPanel.java b/src/SettingPanel.java index ccab594..83a113c 100644 --- a/src/SettingPanel.java +++ b/src/SettingPanel.java @@ -142,4 +142,4 @@ public class SettingPanel extends MenuPanel { currentBox = UtilityFunction.processBox(e, currentBox, textBoxArray); } } -} \ No newline at end of file +}