From 02fb847075ea72d459520f25b89543b2386ba097 Mon Sep 17 00:00:00 2001 From: dwm10005 Date: Fri, 17 Apr 2015 10:33:18 -0400 Subject: [PATCH] Move minions to their own directory, refactor constructor for easier readability Refactor takeDamage method for towers and minion bar formatting --- src/MinionTypes.java | 24 ++++++++-------- src/MockGui.java | 4 +-- src/TowerMock.java | 26 ++++++++---------- src/{ => resources/images}/Basic Minion.png | Bin .../images}/Double Basic Minion.png | Bin .../images}/Juggernaut Minion.png | Bin .../images}/Moneybags Minion.png | Bin src/{ => resources/images}/Speedo Minion.png | Bin .../images}/Superkiller Minion.png | Bin .../images}/Superspeedo Minion.png | Bin .../images}/Unkillable Minion.png | Bin .../images}/Weakling Minion.png | Bin 12 files changed, 26 insertions(+), 28 deletions(-) rename src/{ => resources/images}/Basic Minion.png (100%) rename src/{ => resources/images}/Double Basic Minion.png (100%) rename src/{ => resources/images}/Juggernaut Minion.png (100%) rename src/{ => resources/images}/Moneybags Minion.png (100%) rename src/{ => resources/images}/Speedo Minion.png (100%) rename src/{ => resources/images}/Superkiller Minion.png (100%) rename src/{ => resources/images}/Superspeedo Minion.png (100%) rename src/{ => resources/images}/Unkillable Minion.png (100%) rename src/{ => resources/images}/Weakling Minion.png (100%) diff --git a/src/MinionTypes.java b/src/MinionTypes.java index 68c0000..5e53581 100644 --- a/src/MinionTypes.java +++ b/src/MinionTypes.java @@ -5,23 +5,23 @@ import javax.imageio.ImageIO; public enum MinionTypes { - //NAME (Health, Attack, Speed, goldValue) - WEAKLING(100, 1, 1, "Weakling Minion.png", 1), - BASIC (255, 1, 1, "Basic Minion.png", 2), - SPEEDO (100, 1, 4, "Speedo Minion.png", 3), - SUPERSPEEDO (255, 1, 4, "Superspeedo Minion.png", 5), - JUGGERNAUT (1000, 1, 1, "Juggernaut Minion.png", 10), - UNKILLABLE (10000,1,1, "Unkillable Minion.png", 100), - DOUBLEBASIC(255, 2, 1, "Double Basic Minion.png", 12), - SUPERKILLER(10, 20, 8, "Superkiller Minion.png", 100), - MONEYBAGS(350, 1, 2, "Moneybags Minion.png", 50); + //NAME (Health, Attack, Speed, goldValue, sprite file name) + WEAKLING (100, 1, 1, 1, "Weakling Minion.png"), + BASIC (255, 1, 1, 2, "Basic Minion.png"), + SPEEDO (100, 1, 4, 3, "Speedo Minion.png"), + SUPERSPEEDO (255, 1, 4, 5, "Superspeedo Minion.png"), + JUGGERNAUT (1000, 1, 1, 10, "Juggernaut Minion.png"), + UNKILLABLE (10000, 1, 1, 100, "Unkillable Minion.png"), + DOUBLEBASIC (255, 2, 1, 12, "Double Basic Minion.png"), + SUPERKILLER (10, 20, 8, 100, "Superkiller Minion.png"), + MONEYBAGS (350, 1, 2, 50, "Moneybags Minion.png"); private int health, attackDamage, movementSpeed, value; private BufferedImage sprite; - private static final String SPRITE_FILE_DIR = "src/"; + private static final String SPRITE_FILE_DIR = "src/resources/images/"; //Make sure that the directory name ends in a forward slash - MinionTypes(int health, int attackDamage, int movementSpeed, String spriteFileName, int value) { + MinionTypes(int health, int attackDamage, int movementSpeed, int value, String spriteFileName) { this.health = health; this.attackDamage = attackDamage; this.movementSpeed = movementSpeed; diff --git a/src/MockGui.java b/src/MockGui.java index f13cb88..e595044 100644 --- a/src/MockGui.java +++ b/src/MockGui.java @@ -180,9 +180,9 @@ public void drawMinion(int x, int y, int health, Graphics g) { public void drawMinion(MinionMock m, Graphics g) { g.drawImage(m.getSprite(), m.getX(), m.getY(), null); - String h = "[" + m.getHealth() + "/" + m.getMaxHealth() +"]"; + String healthBar = String.format("[%s/%s]", m.getHealth(), m.getMaxHealth()); g.setColor(Color.RED); - g.drawString(h, m.getX()-15, m.getY()-10); + g.drawString(healthBar, m.getX()-15, m.getY()-10); //g.drawString(m.getName(), m.getX()-15, m.getY()+45); //g.drawString(("V: " + m.getValue() + "\nD: " + m.getAttackDamage()), m.getX(), m.getY()+46); } diff --git a/src/TowerMock.java b/src/TowerMock.java index 3d590ca..dfd2683 100644 --- a/src/TowerMock.java +++ b/src/TowerMock.java @@ -36,24 +36,22 @@ public int dealDamage(int x, int y) { } } - public boolean takeDamage(int i) { - if (i > 1) { - takeDamage(); - return takeDamage(i-1); - } else { - return takeDamage(); + public boolean takeDamage(int damage) { + if (this.health <= damage) + { + health = 0; + return true; //gameover + } + else + { + health -= damage; + System.out.println(health); + return false; } } public boolean takeDamage() { - health--; - System.out.println(health); - if (health <= 0) { - return true; - // LOSE GAME TERMINATE - } else { - return false; - } + return takeDamage(1); } public int getHealth() { return health; diff --git a/src/Basic Minion.png b/src/resources/images/Basic Minion.png similarity index 100% rename from src/Basic Minion.png rename to src/resources/images/Basic Minion.png diff --git a/src/Double Basic Minion.png b/src/resources/images/Double Basic Minion.png similarity index 100% rename from src/Double Basic Minion.png rename to src/resources/images/Double Basic Minion.png diff --git a/src/Juggernaut Minion.png b/src/resources/images/Juggernaut Minion.png similarity index 100% rename from src/Juggernaut Minion.png rename to src/resources/images/Juggernaut Minion.png diff --git a/src/Moneybags Minion.png b/src/resources/images/Moneybags Minion.png similarity index 100% rename from src/Moneybags Minion.png rename to src/resources/images/Moneybags Minion.png diff --git a/src/Speedo Minion.png b/src/resources/images/Speedo Minion.png similarity index 100% rename from src/Speedo Minion.png rename to src/resources/images/Speedo Minion.png diff --git a/src/Superkiller Minion.png b/src/resources/images/Superkiller Minion.png similarity index 100% rename from src/Superkiller Minion.png rename to src/resources/images/Superkiller Minion.png diff --git a/src/Superspeedo Minion.png b/src/resources/images/Superspeedo Minion.png similarity index 100% rename from src/Superspeedo Minion.png rename to src/resources/images/Superspeedo Minion.png diff --git a/src/Unkillable Minion.png b/src/resources/images/Unkillable Minion.png similarity index 100% rename from src/Unkillable Minion.png rename to src/resources/images/Unkillable Minion.png diff --git a/src/Weakling Minion.png b/src/resources/images/Weakling Minion.png similarity index 100% rename from src/Weakling Minion.png rename to src/resources/images/Weakling Minion.png