ItemTestingUpdate

res/bossshipGraphics

@@ -0,0 +1 @@
+50*30으로 추가할게요 보스쉽 여러가지 (default, destroyed, moved)

res/scores_1p

@@ -0,0 +1,2 @@
+AAA
+2280

src/engine/Core.java

@@ -36,25 +36,26 @@ public final class Core {
 
 	/** Difficulty settings for level 1. */
 	private static final GameSettings SETTINGS_LEVEL_1 =
-			new GameSettings(5, 4, 60, 2000, 5.5);
+			new GameSettings(5, 4, 60, 2000, 5.5,false);
 	/** Difficulty settings for level 2. */
 	private static final GameSettings SETTINGS_LEVEL_2 =
-			new GameSettings(5, 5, 50, 2500, 5.5);
+			new GameSettings(5, 5, 50, 2500, 5.5,false);
 	/** Difficulty settings for level 3. */
 	private static final GameSettings SETTINGS_LEVEL_3 =
-			new GameSettings(6, 5, 40, 1500, 5.5);
+			new GameSettings(6, 5, 40, 1500, 5.5,false);
 	/** Difficulty settings for level 4. */
 	private static final GameSettings SETTINGS_LEVEL_4 =
-			new GameSettings(6, 6, 30, 1500, 5);
+			new GameSettings(6, 6, 30, 1500, 5,true);
 	/** Difficulty settings for level 5. */
 	private static final GameSettings SETTINGS_LEVEL_5 =
-			new GameSettings(7, 6, 20, 1000,5);
+			new GameSettings(7, 6, 20, 1000,5,true);
 	/** Difficulty settings for level 6. */
 	private static final GameSettings SETTINGS_LEVEL_6 =
-			new GameSettings(7, 7, 10, 1000,4.8);
+			new GameSettings(7, 7, 10, 1000,4.8,true);
 	/** Difficulty settings for level 7. */
 	private static final GameSettings SETTINGS_LEVEL_7 =
-			new GameSettings(8, 7, 2, 500,4.8);
+			new GameSettings(8, 7, 2, 500,4.8,true);
+
 	private static int LEVEL;
 
 	/** Frame to draw the screen on. */

src/engine/DrawManager.java

@@ -89,6 +89,12 @@ public static enum SpriteType {
 		/** Bonus ship. */
 		EnemyShipSpecial,
 		/** Destroyed enemy ship. */
+		BossShip,
+		/** Boss enemy ship. */
+		BossShipDestroyed,
+		/** Boss enemy ship destroyed */
+		BossShipMoved,
+		/** Boss enemy ship movement */
 		Explosion,
 		Item,
 
@@ -138,6 +144,9 @@ private DrawManager() {
 			spriteMap.put(SpriteType.InvincibleShape, new boolean[5][5]);
 			spriteMap.put(SpriteType.SpeedUpShape, new boolean[5][4]);
 			spriteMap.put(SpriteType.AuxiliaryShape, new boolean[5][4]);
+			spriteMap.put(SpriteType.BossShip, new boolean[50][30]);
+			spriteMap.put(SpriteType.BossShipDestroyed, new boolean[50][30]);
+			spriteMap.put(SpriteType.BossShipMoved, new boolean[50][30]);
 
 			fileManager.loadSprite(spriteMap);
 
@@ -880,7 +889,7 @@ public void drawGameOver(final Screen screen, final boolean acceptsInput,
 				Ship dummyShip2 = new Ship(0, 0, Color.RED, SpriteType.Ship, true);
 				shipskin[i] = dummyShip;
 				shipskin2[i] = dummyShip2;
-				// 예: ships[i] = new Ship(i * 50, 100, Color.GREEN, SpriteType.Ship, spriteData, false);
+				// ?��: ships[i] = new Ship(i * 50, 100, Color.GREEN, SpriteType.Ship, spriteData, false);
 				drawEntity(shipskin[i], screen.getWidth() / 4 - 13, 172 + 50*i);
 				drawEntity(shipskin2[i], 3*screen.getWidth() / 4 - 13, 172 + 50*i);
 				if(i !=5) {
@@ -997,7 +1006,7 @@ public void drawGameOver(final Screen screen, final boolean acceptsInput,
 			for (int i = 0; i < 6; i++) {
 				Ship dummyShip = new Ship(0, 0, Color.GREEN, SpriteType.Ship, false);
 				shipskin[i] = dummyShip;
-				// 예: ships[i] = new Ship(i * 50, 100, Color.GREEN, SpriteType.Ship, spriteData, false);
+				// ?��: ships[i] = new Ship(i * 50, 100, Color.GREEN, SpriteType.Ship, spriteData, false);
 				drawEntity(shipskin[i], screen.getWidth() / 2 - 13, 172 + 50*i);
 				if(i !=5) {
 					try {

src/engine/FileManager.java

@@ -191,6 +191,15 @@ public InputStream checkSpriteType(SpriteType spriteType) {
         } else if (spriteType == SpriteType.EnemyShipSpecial) {
             inputStream = DrawManager.class.getClassLoader()
                     .getResourceAsStream("specialenemyGraphics");
+        } else if (spriteType == SpriteType.BossShip) {
+            inputStream = DrawManager.class.getClassLoader()
+                    .getResourceAsStream("bossshipGraphics");
+        } else if (spriteType == SpriteType.BossShipDestroyed) {
+            inputStream = DrawManager.class.getClassLoader()
+                    .getResourceAsStream("bossshipGraphics");
+        } else if (spriteType == SpriteType.BossShipMoved) {
+            inputStream = DrawManager.class.getClassLoader()
+                    .getResourceAsStream("bossshipGraphics");
         }
         return inputStream;
     }

src/engine/GameSettings.java

@@ -18,6 +18,7 @@ public class GameSettings {
 	private int shootingFrecuency;
 	/** Speed of item dropping. */
 	private double itemSpeed;
+	private boolean bossStage;
 	/**
 	 * Constructor.
 	 * 
@@ -31,12 +32,13 @@ public class GameSettings {
 	 *            Frecuency of enemy shootings, +/- 30%.
 	 */
 	public GameSettings(final int formationWidth, final int formationHeight,
-			final int baseSpeed, final int shootingFrecuency, final double itemSpeed) {
+			final int baseSpeed, final int shootingFrecuency, final double itemSpeed, final boolean bossStage) {
 		this.formationWidth = formationWidth;
 		this.formationHeight = formationHeight;
 		this.baseSpeed = baseSpeed;
 		this.shootingFrecuency = shootingFrecuency;
 		this.itemSpeed = itemSpeed;
+		this.bossStage = bossStage;
 	}
 
 	/**
@@ -67,4 +69,14 @@ public final int getShootingFrecuency() {
 		return shootingFrecuency;
 	}
 
+	/**
+	 * @return the bossStage
+	 */
+	public final boolean getBossStage(){return bossStage;}
+
+	/**
+	 * @return the itemSpeed
+	 */
+	public final double getItemSpeed(){return itemSpeed;}
+
 }

src/engine/GameState.java

@@ -153,7 +153,4 @@ public final int getShipsDestroyed2() {
 		return shipsDestroyed2;
 	}
 
-	public int livesRemaining1() {
-		return 0;
-	}
 }

src/entity/BossShip.java

@@ -0,0 +1,159 @@
+package entity;
+
+import engine.DrawManager;
+import engine.GameState;
+
+import java.util.List;
+
+
+public class BossShip extends EnemyShip {
+    private final int SpeedY = -2;
+    /** Width of current screen. */
+    private static final int WIDTH = 448;
+    /** Height of current screen. */
+    private static final int HEIGHT = 520;
+    /** Width of boss ship. */
+    private static final int BOSS_WIDTH = 50;
+    /** Height of boss ship. */
+    private static final int BOSS_HEIGHT = 30;
+    private int splitLevel;
+
+    public BossShip (final int positionX, final int positionY,
+                     final DrawManager.SpriteType spriteType, final GameState gameState, int splitLevel){
+        super(positionX, positionY, spriteType, gameState);
+        super.HP = splitLevel;//따로 수정;
+        super.pointValue = 100*splitLevel; //따로수정
+        this.splitLevel = splitLevel;
+        this.Move();
+    }
+
+    /**
+     * when slime Boss dead this function
+     */
+    public void split(List<EnemyShip> enemyShipList) {
+        int currentX = this.positionX, currentY = this.positionY;
+        if (splitLevel <= 0) return;
+        currentX += 10;
+        if (currentX < 20) currentX += 50;
+        if (WIDTH - 20 < currentX) currentX -= 50;
+        int firstX = currentX - 20, secondX = currentX + 20;
+        BossShip first = new BossShip(firstX, currentY, DrawManager.SpriteType.EnemyShipA1, this.gameState, this.splitLevel - 1);
+        BossShip second = new BossShip(secondX, currentY, DrawManager.SpriteType.EnemyShipA1, this.gameState, this.splitLevel - 1);
+        enemyShipList.add(first);
+        enemyShipList.add(second);
+    }
+    /**
+     * when Boss Die this function execute
+     */
+    public void Death(List<EnemyShip> enemyShipList){
+        split(enemyShipList);
+    }
+
+    /**
+     * when Boss attack this function execute
+     */
+    public void Attack() {
+
+    }
+
+    /**
+     * when Boss attack this function execute
+     */
+    public void Move(){
+        while (this.HP > 0) {
+            int select = (int) (Math.random() * 7);
+            switch (select) {
+                case 0:
+                case 1:
+                    moveCircle();
+                case 2:
+                case 3:
+                    moveCross();
+                case 4:
+                case 5:
+                    moveDiamond();
+                case 6:
+                case 7:
+                    moveTeleport();
+            }
+        }
+    }
+
+    /**
+     * tell the direction of boss ship in perspective of gamer
+     * @return true if turn right
+     */
+    public boolean isRight(){
+        double dValue = Math.random();
+        int lr = (int)(dValue * 2);
+        if (lr != 0){return true;} // right
+        else {return false;} // left
+    }
+
+    public int moveTrackSize(int nowShipX, int nowShipY){
+        double dValue = Math.random();
+        int minimX = Math.min((WIDTH - nowShipX - BOSS_WIDTH), nowShipX);
+        return (int)(dValue * Math.min(minimX, (HEIGHT - nowShipY - BOSS_HEIGHT)));
+    }
+
+    /**
+     * move along the circle track
+     */
+    public void moveCircle() {
+        int r = moveTrackSize(positionX, positionY);
+        if (r <= 0){moveTeleport();}
+        else {
+            if(isRight()){int x = 1, y = -1;}
+            else {int x = -1, y = -1;}
+            for (int i = 1; i <= 360; i++) {
+                positionX += (int)(r * Math.sin((double) (i / (double) 360)));
+                positionY += (int)(r * Math.sin((double) (i / (double) 360)));
+                // 특정 조건에서 총도 쏘면 좋을 듯
+            }
+        }
+    }
+
+    /**
+     * move along the cross track
+     */
+    public void moveCross() {
+        int r = moveTrackSize(positionX, positionY);
+        if (r <= 0){moveTeleport();}
+        else {
+            int forward;
+            if(isRight()){forward = 1;}
+            else {forward = -1;}
+            int i;
+            for (i = 1; i < r; i++){positionX += 1;}
+            for (i = 1; i < r; i++){positionX -= 1;}
+            for (i = 1; i < r; i++){positionY += forward;}
+            for (i = 1; i < 2*r-1; i++){positionY -= forward;}
+            for (i = 1; i < r; i++){positionY += forward;}
+        }
+    }
+
+    /**
+     * move along the diamond track
+     */
+    public void moveDiamond() {
+        int r = moveTrackSize(positionX, positionY);
+        if (r <= 0){moveTeleport();}
+        else {
+            int i;
+            for (i = 1; i < r/2; i++){positionX += 1;positionY += 1;}
+            for (i = 1; i < r/2; i++){positionX -= 1;positionY += 1;}
+            for (i = 1; i < r/2; i++){positionX -= 1;positionY -= 1;}
+            for (i = 1; i < r/2; i++){positionX += 1;positionY -= 1;}
+        }
+    }
+
+    /**
+     * Teleport randomly
+     */
+    public void moveTeleport() {
+        double randomX = Math.random();
+        double randomY = Math.random();
+        positionX = (int) (randomX * (WIDTH - BOSS_WIDTH));
+        positionY = (int) (randomY * (HEIGHT - BOSS_HEIGHT));
+    }
+}

src/entity/EnemyShip.java

@@ -27,9 +27,9 @@ public class EnemyShip extends Entity {
 	/** Cooldown between sprite changes. */
 	protected Cooldown animationCooldown;
 	/** Checks if the ship has been hit by a bullet. */
-	private boolean isDestroyed;
+	protected boolean isDestroyed;
 	/** 난이도 조절에 사용할 현재 스테이트 */
-	private GameState gameState;
+	protected GameState gameState;
 	/** Values of the ship, in points, when destroyed. */
 	protected int pointValue;
 

src/entity/EnemyShipA.java

@@ -3,38 +3,50 @@
 import engine.Cooldown;
 import engine.DrawManager;
 import engine.GameState;
-
 import java.util.Set;
 
 public class EnemyShipA extends EnemyShip {
-    /** HP의 배율 */
-    private final double HPPOWER = .8;
-    /** 총알의 속도 배율 */
-    private final double BULLETSPEEDPOWER = 0.5;
-    /** 슈팅 쿨다운 배율 */
-    private final double BULLETCOOLDOWN = 0;
-    /** 제거시 올라가는 점수 */
-    private final int POINT = 30;
-    public EnemyShipA(final int positionX, final int positionY,
-                      final DrawManager.SpriteType spriteType, final GameState gameState) {
-        super(positionX, positionY, spriteType, gameState);
-        super.HP = (int)(super.HP * HPPOWER);
-        super.pointValue = POINT;
-    }
+  /** HPÀÇ ¹èÀ² */
+  private final double HPPOWER = .8;
+  /** ÃѾËÀÇ ¼Óµµ ¹èÀ² */
+  private final double BULLETSPEEDPOWER = .5;
+  /** ½´Æà Äð´Ù¿î ¹èÀ² */
+  private final double BULLETCOOLDOWN = 0;
+  /** Á¦°Å½Ã ¿Ã¶ó°¡´Â Á¡¼ö */
+  private final int POINT = 30;
 
-    public final void update() {
-        if (this.animationCooldown.checkFinished()) {
-            this.animationCooldown.reset();
-            if (spriteType == DrawManager.SpriteType.EnemyShipA1)
-                spriteType = DrawManager.SpriteType.EnemyShipA2;
-            else
-                spriteType = DrawManager.SpriteType.EnemyShipA1;
-        }
-    }
-    public final void shoot(final Set<Bullet> bullets, Cooldown shootingCooldown) {
-        bullets.add(BulletPool.getBullet(positionX
-                + width / 2, positionY, (int)(super.BULLET_SPEED * BULLETSPEEDPOWER),0));
-        shootingCooldown.timedown(BULLETCOOLDOWN);
+  public EnemyShipA(
+    final int positionX,
+    final int positionY,
+    final DrawManager.SpriteType spriteType,
+    final GameState gameState
+  ) {
+    super(positionX, positionY, spriteType, gameState);
+    super.HP = (int) (super.HP * HPPOWER);
+    super.pointValue = POINT;
+  }
+
+  public final void update() {
+    if (this.animationCooldown.checkFinished()) {
+      this.animationCooldown.reset();
+      if (spriteType == DrawManager.SpriteType.EnemyShipA1) spriteType =
+        DrawManager.SpriteType.EnemyShipA2; else spriteType =
+        DrawManager.SpriteType.EnemyShipA1;
     }
+  }
 
+  public final void shoot(
+    final Set<Bullet> bullets,
+    Cooldown shootingCooldown
+  ) {
+    bullets.add(
+      BulletPool.getBullet(
+        positionX + width / 2,
+        positionY,
+        (int) (super.BULLET_SPEED * BULLETSPEEDPOWER),
+        0
+      )
+    );
+    shootingCooldown.timedown(BULLETCOOLDOWN);
+  }
 }