From ed490d5cfc1313abe6d61e2415ceae33ce62ea01 Mon Sep 17 00:00:00 2001 From: Marcus Gosselin Date: Sat, 1 Nov 2014 12:30:32 -0400 Subject: [PATCH] i think it works now --- bin/.gitignore | 1 - src/MAndApps/apps/spacewars/SpaceWars.java | 20 +++++++++++--------- src/Main.java | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 8c2bbc4..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MAndApps/ diff --git a/src/MAndApps/apps/spacewars/SpaceWars.java b/src/MAndApps/apps/spacewars/SpaceWars.java index 9ce05fe..6c41ab9 100644 --- a/src/MAndApps/apps/spacewars/SpaceWars.java +++ b/src/MAndApps/apps/spacewars/SpaceWars.java @@ -24,7 +24,7 @@ import MAndEngine.BasicApp; import MAndEngine.Engine; public class SpaceWars implements BasicApp { - + // private static boolean paused = false, debug = false; private static int redPoints = 0, bluePoints = 0, greenPoints = 0, time = 0; @@ -38,7 +38,7 @@ public class SpaceWars implements BasicApp { private static int lvl = 1, xpToNextLVL = getMaxXPForLvl(lvl), xp = 0, expBar = 424; private static boolean shopping = false; private Shop shop = new Shop(); - + // public static final Font defaultFont = new Font("Ubuntu", Font.BOLD, 10); public static final Font moneyFont = new Font("Ubuntu", Font.BOLD, 20); @@ -81,7 +81,7 @@ public class SpaceWars implements BasicApp { log("You gained " + enemies.elementAt(i).getWorth() + " exp."); addEXP(enemies.elementAt(i).getWorth()); - //enemies.remove(i); + // enemies.remove(i); } else i++; @@ -112,15 +112,15 @@ public class SpaceWars implements BasicApp { public static Stack getEnemies() { return enemies; } - + @Override public void render(Graphics2D g) { - + try { g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); - + g.setFont(defaultFont); g.drawImage(background, 0, 0, WIDTH, HEIGHT, null); @@ -280,7 +280,7 @@ public class SpaceWars implements BasicApp { } private static int getMaxXPForLvl(int lvl) { - return (int)(Math.pow(lvl, 1.618)); + return (int) (Math.pow(lvl, 1.618)); } public void addEXP(int i) { @@ -333,12 +333,14 @@ public class SpaceWars implements BasicApp { @Override public void resized(int width, int height) { // TODO Auto-generated method stub - + } @Override public void click() { // TODO Auto-generated method stub - + + BOOM(75, 1.2, 100, 100, 100, 50, Engine.mouseX, Engine.mouseY, 550, true, true, 10); + } } diff --git a/src/Main.java b/src/Main.java index 957ee89..678daaa 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,7 +4,7 @@ import MAndEngine.Engine; public class Main { public static void main(String[] args) { - Engine engine = new Engine(new String[] {"MAndApps.apps.SpaceWars"}, false); + Engine engine = new Engine(new String[] {"MAndApps.apps.spacewars.SpaceWars"}, false); engine.run(); }