From 5baeff583f28fe3316a850eacee83db37c6adb6e Mon Sep 17 00:00:00 2001
From: JJTCM <jjtcm@gulli.com>
Date: Tue, 18 Nov 2014 13:51:10 +0100
Subject: [PATCH] Replace Player Iritaion with getPlayer() Added a Boss Fix
 Item Pickup

---
 res/images/boss.png                           | Bin 0 -> 715 bytes
 res/images/enemybossminion.png                | Bin 0 -> 580 bytes
 .../spacescooter/entity/Entity.java           |  12 ++++
 .../spacescooter/entity/ShootingEntity.java   |  14 ++++
 .../spacescooter/entity/enemy/EnemyBoss.java  |  61 ++++++++++++++++++
 .../entity/enemy/EnemyBossMinion.java         |  59 +++++++++++++++++
 .../spacescooter/entity/enemy/EnemyThree.java |  27 +++-----
 .../spacescooter/entity/item/Item.java        |  14 +---
 .../spacescooter/gui/BossBar.java             |  48 ++++++++++++++
 .../spacescooter/screen/GameScreen.java       |   8 ++-
 10 files changed, 208 insertions(+), 35 deletions(-)
 create mode 100644 res/images/boss.png
 create mode 100644 res/images/enemybossminion.png
 create mode 100644 src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java
 create mode 100644 src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java
 create mode 100644 src/de/teamteamteam/spacescooter/gui/BossBar.java

diff --git a/res/images/boss.png b/res/images/boss.png
new file mode 100644
index 0000000000000000000000000000000000000000..95182c203392d0d719e24c4e10fb16ea947df427
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-3
z3>qPverg*4000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006eNkl<Z
zc-rloy-osA5QS%r(wV3+L@PRozJf-qY>X7fx1gu7wxQ=OjE%9egI6$t>~?g97&Wo8
z;9B4qciijVyT5ngOhxvGEcbkKW@g#-lu}e=w3-Ksh{z8np2_i_?Y7Yc)`mkb$@Q$!
zipP4<%9{o&UppI75>iZwSa||GTMw{R(l(y<>l9M{+VI31LB!*Ukw?G-Ob_gII_kGV
z99NsWsV?C5<0YG4B1oyxDB4p53Ge`T00_uOP$s3-JPd93gE5(Og4TV2q2eGQ?@ll)
zk6;Bc3siL$sMq%>OA_)55RiB7zrDW_5z+S6j*|-j0*cCgCIJL23jw;EpUs|gsRkgx
z6#}I4ve%cvy}zp@U>b~@2ICZub9b))Ou}D6CLRcIi2&0azkj%k+<ts?8cBf86S!)W
zMFI$50{E^k%{Tr%ft6Q{M)-@S(?}9b2`I}G&<E)5-RYE{4+aYY#D3N9he(K<{&+tV
zz(m;odkg|xnFdv_xA@TQCOTgd0S_pO0M4~IFSt0rT&&o)!t4b<E16JvSshRX%JKk7
zg02&kB<M)7CjgybHK#$_9LF?RH3HHS!OHV-Ww|{F$f^^R)k2rsX*~l3xIPQW95$UQ
zLBO&vfFF!weE|e4;{y1>#B-&#gMcEcfNAfawkqH$v8oZEyRVQ`dAu>=`ZSnz;AwGJ
xJpgZvzysg`ARtXha`48;su3Vbz}w@F#24*}I)@6;(s=*?002ovPDHLkV1iv;E%N{X

literal 0
HcmV?d00001

diff --git a/res/images/enemybossminion.png b/res/images/enemybossminion.png
new file mode 100644
index 0000000000000000000000000000000000000000..53ae9538f495b6ff64e1cf85f793f445b97167d4
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-3
z3?DNRu<sTC000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0004>Nkl<Z
zSi{|yv2uby5QhJA7-)5dCdo5k8mkmnnn|BZ<3psjjddQvXholi<rP*o!ZWCiGf9ih
zrI157Mc`%$GucMHLH7Iqz1s!AFublOK@hDblN$q2M$1Hf_ugv;fYN$n2PoB70;ofM
zWe0BWZkho|tKaYU%{Y)&PYGd_RleQqYAJ(Nlw9BS!8#;`U`2^_yIt2sunv>oVGy#s
zn@5}{4mv`xs}5XJJe$sw?~hOYOfN_|A$17(hB&b}!Qcp^gIIa(bvB*j84myeA4`0F
zE;10hYYO71I!-)3U1P^<5x7i4Sb51m@S0ikv4rcoXXV&#c38DL=yg50YIk7wMJ90)
z@tQprkQ2zmg2NGlH9ifk*t(1h!_fdQ)Az&$AIqyZ>HT~o3_|9_7TXs}fXVSgDOY7;
zWjEn)G&nnsYBTDaFydU=eUZ8Tu;3R@11o#}_2g8?keM{1Jmn;fsAvQ$AS!^Xvp^-F
zehf33hUvQhIRJ&#Bu_+jxKJ9PE*C1dVrmyE0o37wRrL>QcKn-nL*t-&QTYYLDa4Wf
SE!Hpq0000<MNUMnLSTa62kdG9

literal 0
HcmV?d00001

diff --git a/src/de/teamteamteam/spacescooter/entity/Entity.java b/src/de/teamteamteam/spacescooter/entity/Entity.java
index 51029c6..23c6e6b 100644
--- a/src/de/teamteamteam/spacescooter/entity/Entity.java
+++ b/src/de/teamteamteam/spacescooter/entity/Entity.java
@@ -39,6 +39,8 @@ public abstract class Entity implements Updateable, Paintable {
 	 */
 	private BufferedImage img;
 	
+	private boolean removed = false;
+	
 	
 	/**
 	 * Constructor.
@@ -148,11 +150,21 @@ public abstract class Entity implements Updateable, Paintable {
 		g.drawImage(this.img, this.x, this.y, null);
 	}
 	
+	/**
+	 * Returns Boolean If the Entity got Removed.
+	 * @return removed
+	 */
+	
+	public boolean isRemoved() {
+		return removed;
+	}
+	
 	/**
 	 * Removes entity from the game by telling the current Screen
 	 * to remove it from its list.
 	 */
 	public void remove() {
+		this.removed = true;
 		Screen.currentScreen.removeEntity(this);
 	}
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
index 2db136c..95ea24a 100644
--- a/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
+++ b/src/de/teamteamteam/spacescooter/entity/ShootingEntity.java
@@ -176,4 +176,18 @@ public abstract class ShootingEntity extends LivingEntity {
 			this.primaryShotImage
 		);
 	}
+	
+	/**
+	 * Custom Shoot for Custom Action!!!
+	 */
+	public void createCustomShot(int x, int y, int speed, int dmg, String filename) {
+		new Shot(
+				this.getX() + x,
+				this.getY() + y,
+				Shot.LEFT,
+				speed,
+				dmg,
+				filename
+			);
+	}
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java
new file mode 100644
index 0000000..b610f00
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBoss.java
@@ -0,0 +1,61 @@
+package de.teamteamteam.spacescooter.entity.enemy;
+
+import de.teamteamteam.spacescooter.entity.explosion.MultiExplosion;
+import de.teamteamteam.spacescooter.gui.BossBar;
+import de.teamteamteam.spacescooter.utility.GameConfig;
+import de.teamteamteam.spacescooter.utility.Random;
+
+public class EnemyBoss extends Enemy{
+	
+	private int move = 1;
+	
+	public EnemyBoss(int x, int y) {
+		super(x, y);
+		this.setImage("images/boss.png");
+		this.setPrimaryShotImage("images/shots/ballshot.png");
+		this.setShootSpeed(5);
+		this.setShootDelay(50);
+		this.setShootSpawn(-10, 30);
+		this.setShootDamage(8);
+		this.setHealthPoints(300);
+		this.setCollisionDamage(50);
+		this.setScore(5000);
+		this.willShoot = true;
+		this.setPosition(GameConfig.windowWidth, Random.nextInt(GameConfig.windowHeight - this.getHeight() - 50) +50);
+		new BossBar(10, 44, this);
+	}
+	
+	/**
+	 * This enemy spawns an Item on its death and causes another enemy to appear.
+	 */
+	@Override
+	public void die() {
+		super.die();
+	}
+	
+	/**
+	 * Custom MultiExplosion for this enemy.
+	 */
+	@Override
+	public void explode() {
+		new MultiExplosion(this.getX(), this.getY());
+	}
+	
+	@Override
+	public void update() {
+		super.update();
+		this.setPosition(750, this.getY()+move);
+		if(this.getY() == 51){
+			move = 1;
+		}
+		if(this.getY() == 560){
+			move = -1;
+		}
+		if(Random.nextInt(1000) < 5) new EnemyBossMinion(730, this.getY());
+		if(Random.nextInt(1000) < 50) {
+			createCustomShot(-10, 3, 8, 15, "images/shots/laser_red.png");
+			createCustomShot(-10, 59, 8, 15, "images/shots/laser_red.png");
+		}
+	}
+	
+}
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java
new file mode 100644
index 0000000..3ca1aff
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyBossMinion.java
@@ -0,0 +1,59 @@
+package de.teamteamteam.spacescooter.entity.enemy;
+
+import de.teamteamteam.spacescooter.entity.Player;
+import de.teamteamteam.spacescooter.entity.explosion.MultiExplosion;
+import de.teamteamteam.spacescooter.entity.item.Item;
+import de.teamteamteam.spacescooter.screen.GameScreen;
+import de.teamteamteam.spacescooter.utility.Random;
+
+public class EnemyBossMinion extends Enemy{
+
+	private double newY;
+	private double ySpeed = 0.4;
+	
+	public EnemyBossMinion(int x, int y) {
+		super(x, y);
+		this.setImage("images/enemybossminion.png");
+		this.setPrimaryShotImage("images/shots/laser_green.png");
+		this.setShootSpeed(4);
+		this.setShootDelay(42);
+		this.setShootSpawn(-10, 10);
+		this.setShootDamage(5);
+		this.setHealthPoints(15);
+		this.setCollisionDamage(10);
+		this.setScore(10);
+		this.newY = this.getY();
+	}
+	
+	/**
+	 * This enemy spawns an Item on its death and causes another enemy to appear.
+	 */
+	@Override
+	public void die() {
+		if(Random.nextInt(10) < 5) Item.create(getX(), getY());
+		new EnemyBossMinion(0, 0);
+		super.die();
+	}
+	
+	/**
+	 * Custom MultiExplosion for this enemy.
+	 */
+	@Override
+	public void explode() {
+		new MultiExplosion(this.getX(), this.getY());
+	}
+	
+	@Override
+	public void update() {
+		super.update();
+		this.setPosition(this.getX()-1, this.getY());
+		Player player = GameScreen.getPlayer();
+		if(this.getY() < player.getY()){
+			this.newY += ySpeed;
+			this.setPosition(this.getX(), (int) newY);
+		}else if(this.getY() > player.getY()){
+			this.newY -= ySpeed;
+			this.setPosition(this.getX(), (int) newY);
+		}
+	}
+}
diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
index 167ca86..4a538d4 100644
--- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
+++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
@@ -1,11 +1,9 @@
 package de.teamteamteam.spacescooter.entity.enemy;
 
-import de.teamteamteam.spacescooter.datastructure.ConcurrentIterator;
-import de.teamteamteam.spacescooter.entity.Entity;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.entity.explosion.MultiExplosion;
 import de.teamteamteam.spacescooter.entity.item.Item;
-import de.teamteamteam.spacescooter.screen.Screen;
+import de.teamteamteam.spacescooter.screen.GameScreen;
 import de.teamteamteam.spacescooter.utility.GameConfig;
 import de.teamteamteam.spacescooter.utility.Random;
 
@@ -13,7 +11,6 @@ public class EnemyThree extends Enemy{
 
 	private double newY;
 	private double ySpeed = 0.4;
-	private ConcurrentIterator<Entity> entityIterator;
 	
 	public EnemyThree(int x, int y) {
 		super(x, y);
@@ -28,7 +25,6 @@ public class EnemyThree extends Enemy{
 		this.setScore(30);
 		this.setPosition(GameConfig.windowWidth, Random.nextInt(GameConfig.windowHeight - this.getHeight() - 50) +50);
 		this.newY = this.getY();
-		this.entityIterator = Screen.currentScreen.createEntityIterator();
 	}
 	
 	/**
@@ -57,20 +53,13 @@ public class EnemyThree extends Enemy{
 			this.remove();
 			new EnemyThree(0, 0);
 		}
-		entityIterator.reset();
-		while (entityIterator.hasNext()) {
-			Entity entity = entityIterator.next();
-			if(entity instanceof Player){
-				Player player = (Player) entity;
-				if(this.getY() < player.getY()){
-					this.newY += ySpeed;
-					this.setPosition(this.getX(), (int) newY);
-				}else if(this.getY() > player.getY()){
-					this.newY -= ySpeed;
-					this.setPosition(this.getX(), (int) newY);
-				}
-			}
+		Player player = GameScreen.getPlayer();
+		if(this.getY() < player.getY()){
+			this.newY += ySpeed;
+			this.setPosition(this.getX(), (int) newY);
+		}else if(this.getY() > player.getY()){
+			this.newY -= ySpeed;
+			this.setPosition(this.getX(), (int) newY);
 		}
 	}
-	
 }
diff --git a/src/de/teamteamteam/spacescooter/entity/item/Item.java b/src/de/teamteamteam/spacescooter/entity/item/Item.java
index 8854bdc..b85ecba 100644
--- a/src/de/teamteamteam/spacescooter/entity/item/Item.java
+++ b/src/de/teamteamteam/spacescooter/entity/item/Item.java
@@ -1,21 +1,15 @@
 package de.teamteamteam.spacescooter.entity.item;
 
-import de.teamteamteam.spacescooter.datastructure.ConcurrentIterator;
 import de.teamteamteam.spacescooter.entity.CollidableEntity;
-import de.teamteamteam.spacescooter.entity.Entity;
 import de.teamteamteam.spacescooter.entity.Player;
 import de.teamteamteam.spacescooter.entity.spi.Collidable;
-import de.teamteamteam.spacescooter.screen.Screen;
 import de.teamteamteam.spacescooter.sound.SoundSystem;
 
 public abstract class Item extends CollidableEntity {
 	
-	private ConcurrentIterator<Entity> entityIterator;
-	
 	
 	public Item(int x, int y) {
 		super(x, y);
-		this.entityIterator = Screen.currentScreen.createEntityIterator();
 	}
 
 	/**
@@ -24,12 +18,7 @@ public abstract class Item extends CollidableEntity {
 	public void collideWith(Collidable entity) {
 		if(entity instanceof Player) {
 			SoundSystem.playSound("sounds/powerup_pickup.wav");
-			while(entityIterator.hasNext()) {
-				Entity e = entityIterator.next();
-				if(e instanceof Player){
-					itemCollected((Player) e);
-				}
-			}
+			itemCollected((Player) entity);
 			this.remove();
 		}
 	}
@@ -39,7 +28,6 @@ public abstract class Item extends CollidableEntity {
 		if(this.getX() < 0-this.getWidth()){
 			this.remove();
 		};
-		entityIterator.reset();
 	}
 	
 	public abstract void itemCollected(Player player);
diff --git a/src/de/teamteamteam/spacescooter/gui/BossBar.java b/src/de/teamteamteam/spacescooter/gui/BossBar.java
new file mode 100644
index 0000000..e853aca
--- /dev/null
+++ b/src/de/teamteamteam/spacescooter/gui/BossBar.java
@@ -0,0 +1,48 @@
+package de.teamteamteam.spacescooter.gui;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+
+import de.teamteamteam.spacescooter.entity.Entity;
+import de.teamteamteam.spacescooter.entity.enemy.Enemy;
+
+public class BossBar extends Entity {
+
+	private int width = 150;
+	private int height = 14;
+	private int health = 0;
+	private int fullhealth = 0;
+	private int healthwidth = 0;
+	private static Enemy boss;
+	
+	public BossBar(int x, int y, Enemy ent) {
+		super(x, y);
+		BossBar.boss = ent;
+		this.fullhealth = boss.getHealthPoints();
+	}
+
+	public void paint(Graphics2D g) {
+		try {
+			this.health = (int) (((double) boss.getHealthPoints() / (double) this.fullhealth) * 100);
+			this.healthwidth = ((this.width) * this.health) / 100;
+		} catch(Exception e) {
+			this.healthwidth = 0;
+		}
+		g.setColor(Color.WHITE);
+		g.setFont(new Font("Monospace", 0, 16));
+		g.drawString("Boss:", this.getX(), this.getY()+12);
+		g.setColor(Color.PINK);
+		g.fillRect(this.getX()+70, this.getY(), this.healthwidth, this.height);
+		g.setColor(Color.WHITE);
+		g.drawRect(this.getX()+70, this.getY(), this.width, this.height);
+	}
+	
+	public void update() {
+		if (boss.isAlive() == false || boss.isRemoved() == true) {
+			this.remove();
+		}
+		
+	}
+	
+}
diff --git a/src/de/teamteamteam/spacescooter/screen/GameScreen.java b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
index 646ad8c..205b4a1 100644
--- a/src/de/teamteamteam/spacescooter/screen/GameScreen.java
+++ b/src/de/teamteamteam/spacescooter/screen/GameScreen.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import de.teamteamteam.spacescooter.background.StarBackground;
 import de.teamteamteam.spacescooter.control.Keyboard;
 import de.teamteamteam.spacescooter.entity.Player;
+import de.teamteamteam.spacescooter.entity.enemy.EnemyBoss;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyFour;
 import de.teamteamteam.spacescooter.entity.enemy.EnemyThree;
 import de.teamteamteam.spacescooter.entity.item.ItemChance;
@@ -41,9 +42,10 @@ public class GameScreen extends Screen {
 		new HealthBar(10, 5);
 		new ShieldBar(10, 27);
 		new ScoreBar(575, 33);
-		new EnemyFour(800, 400, points);
-		new EnemyThree(650, 300);
-		new EnemyThree(450, 100);
+		//new EnemyFour(800, 400, points);
+		//new EnemyThree(650, 300);
+		//new EnemyThree(450, 100);
+		new EnemyBoss(200, 300);
 	}
 
 	@Override