From b30711e2cf11408f5e2b3d49fd327c3a7bfb748e Mon Sep 17 00:00:00 2001
From: marcus13345 <marcus13345@live.com>
Date: Sat, 21 Mar 2015 22:11:22 -0400
Subject: [PATCH] so these happened

---
 src/MAndApps/apps/spacewars/SpaceWars.java      | 17 ++++++++---------
 src/MAndApps/apps/spacewars/entity/Enemy.java   |  4 ----
 .../apps/spacewars/entity/enemy/BlueEnemy.java  |  5 -----
 .../apps/spacewars/entity/enemy/GreenEnemy.java |  5 -----
 .../spacewars/entity/enemy/NormalEnemy.java     |  5 -----
 .../apps/spacewars/entity/enemy/RedEnemy.java   |  5 -----
 6 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/MAndApps/apps/spacewars/SpaceWars.java b/src/MAndApps/apps/spacewars/SpaceWars.java
index 1215fa1..d2b3b2a 100644
--- a/src/MAndApps/apps/spacewars/SpaceWars.java
+++ b/src/MAndApps/apps/spacewars/SpaceWars.java
@@ -51,12 +51,12 @@ public class SpaceWars implements BasicApp {
 			if (e1.isCollidable()) {
 				for (int j = i + 1; j < entities.size(); j++) {
 					Entity e2 = entities.get(j);
-					if(e2.isCollidable()) {
-						
-						//because efficiency.
+					if (e2.isCollidable()) {
+
+						// because efficiency.
 						e1.collidedWith(e2);
 						e2.collidedWith(e1);
-						
+
 					}
 				}
 			}
@@ -88,7 +88,7 @@ public class SpaceWars implements BasicApp {
 
 			g.setFont(defaultFont);
 			g.drawImage(background, 0, 0, WIDTH, HEIGHT, null);
-			
+
 			for (int i = 0; i < entities.size(); i++)
 				entities.get(i).render(g);
 
@@ -123,11 +123,10 @@ public class SpaceWars implements BasicApp {
 	@Override
 	public void initialize() {
 		try {
-			background = ImageIO.read(new URL("http://wallpaperswiki.org/wallpapers/2012/11/Wallpaper-Abstract-Wallpaper-Background-Texture-Texture-Yellow-Pictures-600x1024.jpg"));
+			background = ImageIO.read(new URL("http://wallpaperswiki.org/2012/11/Wallpaper-Abstract-Wallpaper-Background-Texture-Texture-Yellow-Pictures-600x1024.jpg"));
 			entities.add(player);
-			entities.add(new NormalEnemy(0, 0));
-			entities.add(new NormalEnemy(0, 0));
-			entities.add(new NormalEnemy(0, 0));
+			for (int i = 0; i < 100; i++)
+				entities.add(new NormalEnemy(0, 0));
 		} catch (Exception e) {
 			background = (Image) new BufferedImage(1024, 600, BufferedImage.TRANSLUCENT);
 			Graphics g = background.getGraphics();
diff --git a/src/MAndApps/apps/spacewars/entity/Enemy.java b/src/MAndApps/apps/spacewars/entity/Enemy.java
index eeb5f14..03a0f17 100644
--- a/src/MAndApps/apps/spacewars/entity/Enemy.java
+++ b/src/MAndApps/apps/spacewars/entity/Enemy.java
@@ -51,10 +51,6 @@ public abstract class Enemy extends Entity {
 	public abstract boolean getAlive();
 	public abstract Color getColor();
 
-	public int getWorth() {
-		return 1;
-	}
-
 	public abstract void damage(int damage);
 
 	public abstract boolean isCollidable();
diff --git a/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java
index adc8cbc..9e0409c 100644
--- a/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java
+++ b/src/MAndApps/apps/spacewars/entity/enemy/BlueEnemy.java
@@ -171,11 +171,6 @@ public class BlueEnemy extends Enemy {
 		return color;
 	}
 	
-	@Override
-	public int getWorth(){
-		return r.nextInt(3)+1;
-	}
-	
 	public boolean isCollidable() {
 		return true;
 	}
diff --git a/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java
index 2ab3fe5..0241a63 100644
--- a/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java
+++ b/src/MAndApps/apps/spacewars/entity/enemy/GreenEnemy.java
@@ -178,11 +178,6 @@ public class GreenEnemy extends Enemy {
 		return color;
 	}
 
-	@Override
-	public int getWorth() {
-		return r.nextInt(3) + 1;
-	}
-
 	public boolean isCollidable() {
 		return true;
 	}
diff --git a/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java
index 96db885..f037f8e 100644
--- a/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java
+++ b/src/MAndApps/apps/spacewars/entity/enemy/NormalEnemy.java
@@ -172,11 +172,6 @@ public class NormalEnemy extends Enemy {
 		return color;
 	}
 
-	@Override
-	public int getWorth() {
-		return r.nextInt(3) + 1;
-	}
-
 	public boolean isCollidable() {
 		return true;
 	}
diff --git a/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java b/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java
index 163a39a..2946333 100644
--- a/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java
+++ b/src/MAndApps/apps/spacewars/entity/enemy/RedEnemy.java
@@ -168,11 +168,6 @@ public class RedEnemy extends Enemy {
         return color;
     }
 
-    @Override
-    public int getWorth(){
-        return (int)(Math.random() * 3)+1;
-    }
-
 	@Override
 	public boolean isCollidable() {
 		return true;