From 172ffbc4aa5789f2d376abaf2b91d646f84ad45d Mon Sep 17 00:00:00 2001 From: Marcus Gosselin Date: Tue, 3 Mar 2015 14:45:24 -0500 Subject: [PATCH] Revert "i made a booboo" This reverts commit bac8633be7a3c15e92f86def1158c1168a19a48a. --- .classpath | 2 +- .gitignore | 1 - src/MAndApps/apps/spacewars/SpaceWars.java | 3 +-- src/MAndApps/apps/spacewars/entity/Player.java | 2 +- .../apps/spacewars/entity/bullet/BasicPlayerBullet.java | 8 ++------ .../apps/spacewars/entity/bullet/PlayerExplodeBullet.java | 8 ++------ .../apps/spacewars/entity/bullet/PlayerImpactBullet.java | 8 ++------ .../spacewars/entity/bullet/PlayerPiercingBullet.java | 7 ++----- src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java | 2 +- src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java | 2 +- src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java | 2 +- src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java | 8 +++----- src/MAndApps/apps/spacewars/shop/Shop.java | 4 ++-- src/MAndApps/apps/spacewars/tools/CollisionParticle.java | 6 ++---- src/MAndApps/apps/spacewars/tools/Particle.java | 8 +++----- 15 files changed, 24 insertions(+), 47 deletions(-) diff --git a/.classpath b/.classpath index b31d595..f5785bc 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,7 @@ - + diff --git a/.gitignore b/.gitignore index 033c73a..9869677 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,3 @@ Icon Network Trash Folder Temporary Items .apdisk -/bin/ diff --git a/src/MAndApps/apps/spacewars/SpaceWars.java b/src/MAndApps/apps/spacewars/SpaceWars.java index 8b537d4..6c41ab9 100644 --- a/src/MAndApps/apps/spacewars/SpaceWars.java +++ b/src/MAndApps/apps/spacewars/SpaceWars.java @@ -8,7 +8,6 @@ import java.awt.Graphics2D; import java.awt.Image; import java.awt.Rectangle; import java.awt.RenderingHints; -import java.awt.Transparency; import java.awt.event.KeyEvent; import java.awt.image.BufferedImage; import java.net.URL; @@ -190,7 +189,7 @@ public class SpaceWars implements BasicApp { try { background = ImageIO.read(new URL("http://wallpapersus.com/wallpapers/2012/10/Cool-Wave-600x1024.jpg")); } catch (Exception e) { - background = new BufferedImage(1024, 600, Transparency.TRANSLUCENT); + background = (Image) new BufferedImage(1024, 600, BufferedImage.TRANSLUCENT); Graphics g = background.getGraphics(); g.setColor(Color.BLUE); g.fillRect(0, 0, 1024, 600); diff --git a/src/MAndApps/apps/spacewars/entity/Player.java b/src/MAndApps/apps/spacewars/entity/Player.java index e48f981..18604b3 100644 --- a/src/MAndApps/apps/spacewars/entity/Player.java +++ b/src/MAndApps/apps/spacewars/entity/Player.java @@ -21,7 +21,7 @@ public class Player extends Entity { private boolean goBoom = false; public Player() { - super(512, 550, WIDTH, HEIGHT); + super((int) 512, (int) 550, WIDTH, HEIGHT); } @Override diff --git a/src/MAndApps/apps/spacewars/entity/bullet/BasicPlayerBullet.java b/src/MAndApps/apps/spacewars/entity/bullet/BasicPlayerBullet.java index 6adf5b5..120a85d 100644 --- a/src/MAndApps/apps/spacewars/entity/bullet/BasicPlayerBullet.java +++ b/src/MAndApps/apps/spacewars/entity/bullet/BasicPlayerBullet.java @@ -30,7 +30,6 @@ public class BasicPlayerBullet extends Bullet { updateBoundingBox((int) this.x, (int) this.y, WIDTH, HEIGHT); } - @Override public int tick() { if (alive) { if (direction == Direction.UP) { @@ -59,7 +58,6 @@ public class BasicPlayerBullet extends Bullet { return 0; } - @Override public void render(Graphics g) { g.setColor(Color.BLACK); if (alive) @@ -76,13 +74,11 @@ public class BasicPlayerBullet extends Bullet { return 1; } - @Override - public int getWIDTH(){ + public int getWIDTH(){ return WIDTH; } - @Override - public int getHEIGHT(){ + public int getHEIGHT(){ return HEIGHT; } diff --git a/src/MAndApps/apps/spacewars/entity/bullet/PlayerExplodeBullet.java b/src/MAndApps/apps/spacewars/entity/bullet/PlayerExplodeBullet.java index 20c79c8..f890f2e 100644 --- a/src/MAndApps/apps/spacewars/entity/bullet/PlayerExplodeBullet.java +++ b/src/MAndApps/apps/spacewars/entity/bullet/PlayerExplodeBullet.java @@ -19,13 +19,11 @@ public class PlayerExplodeBullet extends Bullet { private final int size; private static final double PHI = 1.618033988749894848204586; - @Override - public int getWIDTH(){ + public int getWIDTH(){ return WIDTH; } - @Override - public int getHEIGHT(){ + public int getHEIGHT(){ return HEIGHT; } @@ -47,7 +45,6 @@ public class PlayerExplodeBullet extends Bullet { } - @Override public int tick() { if (alive) { if (direction == Direction.UP) { @@ -78,7 +75,6 @@ public class PlayerExplodeBullet extends Bullet { return 0; } - @Override public void render(Graphics g) { g.setColor(Color.BLACK); if (alive) diff --git a/src/MAndApps/apps/spacewars/entity/bullet/PlayerImpactBullet.java b/src/MAndApps/apps/spacewars/entity/bullet/PlayerImpactBullet.java index 00ddaa4..92db12d 100644 --- a/src/MAndApps/apps/spacewars/entity/bullet/PlayerImpactBullet.java +++ b/src/MAndApps/apps/spacewars/entity/bullet/PlayerImpactBullet.java @@ -16,13 +16,11 @@ public class PlayerImpactBullet extends Bullet { private boolean alive = true; private final int level; - @Override - public int getWIDTH(){ + public int getWIDTH(){ return WIDTH; } - @Override - public int getHEIGHT(){ + public int getHEIGHT(){ return HEIGHT; } @@ -42,7 +40,6 @@ public class PlayerImpactBullet extends Bullet { this.level = level; } - @Override public int tick() { if (alive) { if (direction == Direction.UP) { @@ -71,7 +68,6 @@ public class PlayerImpactBullet extends Bullet { return 0; } - @Override public void render(Graphics g) { g.setColor(Color.BLACK); if (alive) diff --git a/src/MAndApps/apps/spacewars/entity/bullet/PlayerPiercingBullet.java b/src/MAndApps/apps/spacewars/entity/bullet/PlayerPiercingBullet.java index 275b754..c7f593f 100644 --- a/src/MAndApps/apps/spacewars/entity/bullet/PlayerPiercingBullet.java +++ b/src/MAndApps/apps/spacewars/entity/bullet/PlayerPiercingBullet.java @@ -17,13 +17,11 @@ public class PlayerPiercingBullet extends Bullet { private final boolean INFINISHOT; final boolean lolface = true; - @Override - public int getWIDTH(){ + public int getWIDTH(){ return WIDTH; } - @Override - public int getHEIGHT(){ + public int getHEIGHT(){ return HEIGHT; } @@ -44,7 +42,6 @@ public class PlayerPiercingBullet extends Bullet { INFINISHOT = b; } - @Override public int tick() { oldX = x; oldY = y; diff --git a/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java index c7d73f5..62400f3 100644 --- a/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java +++ b/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java @@ -137,7 +137,7 @@ public class BlueEnemy extends Enemy { g.setColor(color); int temp; try{ - temp = r.nextInt((int)(0-(absoluteTime/20d))+5); + temp = r.nextInt((int)(0-((double)absoluteTime/20d))+5); }catch(Exception e){ temp = 0; } diff --git a/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java index b4db502..62f8bfe 100644 --- a/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java +++ b/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java @@ -142,7 +142,7 @@ public class GreenEnemy extends Enemy { g.setColor(color); int temp; try{ - temp = r.nextInt((int)(0-(absoluteTime/20d))+5); + temp = r.nextInt((int)(0-((double)absoluteTime/20d))+5); }catch(Exception e){ temp = 0; } diff --git a/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java index d41a8f9..fa1df78 100644 --- a/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java +++ b/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java @@ -137,7 +137,7 @@ public class NormalEnemy extends Enemy { g.setColor(color); int temp; try{ - temp = r.nextInt((int)(0-(absoluteTime/20d))+5); + temp = r.nextInt((int)(0-((double)absoluteTime/20d))+5); }catch(Exception e){ temp = 0; } diff --git a/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java index abf2e5b..7b9a412 100644 --- a/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java +++ b/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java @@ -27,8 +27,7 @@ public class RedEnemy extends Enemy { } - @Override - public int tick() { + public int tick() { // epic AI if((int)healthBar <= 0){ alive = false; @@ -131,12 +130,11 @@ public class RedEnemy extends Enemy { private Random r = new Random(); private int absoluteTime = 0; - @Override - public void render(Graphics g) { + public void render(Graphics g) { g.setColor(color); int temp; try{ - temp = r.nextInt((int)(0-(absoluteTime/20d))+5); + temp = r.nextInt((int)(0-((double)absoluteTime/20d))+5); }catch(Exception e){ temp = 0; } diff --git a/src/MAndApps/apps/spacewars/shop/Shop.java b/src/MAndApps/apps/spacewars/shop/Shop.java index bf2019d..d318857 100644 --- a/src/MAndApps/apps/spacewars/shop/Shop.java +++ b/src/MAndApps/apps/spacewars/shop/Shop.java @@ -22,9 +22,9 @@ public class Shop { public void tick(){ if(state == ON && !(animationTime > BOX_WIDTH)){ - animationTime+=(MAX_ANIMATION_TIME-animationTime)/6; + animationTime+=(double)(MAX_ANIMATION_TIME-animationTime)/6; }else if(state == OFF && !(animationTime < 0)){ - animationTime+=(0-animationTime)/6; + animationTime+=(double)(0-animationTime)/6; } if(animationTime < 0.49d){ selection = 0; diff --git a/src/MAndApps/apps/spacewars/tools/CollisionParticle.java b/src/MAndApps/apps/spacewars/tools/CollisionParticle.java index 50c6f75..4ee169c 100644 --- a/src/MAndApps/apps/spacewars/tools/CollisionParticle.java +++ b/src/MAndApps/apps/spacewars/tools/CollisionParticle.java @@ -70,11 +70,10 @@ public class CollisionParticle extends Entity { this.damage = damage; } - @Override public int tick() { if (life < moveLife) { - x += Math.cos((angleDeg * Math.PI) / 180d) * speed; - y += Math.sin((angleDeg * Math.PI) / 180d) * speed; + x += Math.cos(((double) angleDeg * Math.PI) / 180d) * speed; + y += Math.sin(((double) angleDeg * Math.PI) / 180d) * speed; } speed /= DECAY; if (life > renderLife) @@ -101,7 +100,6 @@ public class CollisionParticle extends Entity { return 0; } - @Override public void render(Graphics g) { if (alive) { g.setColor(color); diff --git a/src/MAndApps/apps/spacewars/tools/Particle.java b/src/MAndApps/apps/spacewars/tools/Particle.java index b5ffaf2..65cc29f 100644 --- a/src/MAndApps/apps/spacewars/tools/Particle.java +++ b/src/MAndApps/apps/spacewars/tools/Particle.java @@ -63,17 +63,16 @@ public class Particle extends Entity{ } else { color = new Color(rand(0, 256), rand(0, 256), rand(0, 256)); } - updateBoundingBox(x, y, size , size); + updateBoundingBox((int)x, (int)y, size , size); } private static final double PHI = 1.618033988749894848204586; - @Override public int tick() { if (life < moveLife) { - x += Math.cos((angleDeg * Math.PI) / 180d) * speed; - y += Math.sin((angleDeg * Math.PI) / 180d) * speed; + x += Math.cos(((double) angleDeg * Math.PI) / 180d) * speed; + y += Math.sin(((double) angleDeg * Math.PI) / 180d) * speed; } speed /= PHI; if (life > renderLife) @@ -88,7 +87,6 @@ public class Particle extends Entity{ return 0; } - @Override public void render(Graphics g) { if (alive) { g.setColor(color);