change entity structure, add death sprite

src/CDC/Cdc.java

@@ -24,7 +24,7 @@ public class Cdc {
     private final static int CHANGEWEAPON = 5;
     private final static int BLOODPACKGEINDEX = 30;
     private final static int BULLETPACKGEINDEX = 31;
-    private final static int VEL = 2;
+    private final static int VEL = 4;
     private final static double ANGLEVEL = 7;// degree
     private static Cdc instance;
     private static RealTcpServer realTcpServer;

src/renderer/data/DynamicObjectManager.java

@@ -7,7 +7,6 @@
 import java.awt.Point;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-
 public class DynamicObjectManager {
     private List<Character> characterList = new CopyOnWriteArrayList<>();
     private List<Item> itemList = new CopyOnWriteArrayList<>();
@@ -71,12 +70,10 @@ public List<Entity> getAllDynamicObjects() {
     }
 
     public List<Character> getCharacterList() {
-        assert characterList.size() > 0;
         return characterList;
     }
 
     public List<Item> getItemList() {
-        assert itemList.size() > 0;
         return itemList;
     }
 

src/renderer/data/entity/AmmoPackage.java

@@ -7,7 +7,6 @@
  */
 public class AmmoPackage extends Item{
     public AmmoPackage(int type, int index, boolean isDead, int x, int y) {
-        super(type, index, isDead, x, y);
-        this.sprite = Sprite.AMMO_PACKAGE;
+        super(type, index, isDead, x, y, Sprite.AMMO_PACKAGE);
     }
 }

src/renderer/data/entity/BloodPackage.java

@@ -7,7 +7,6 @@
  */
 public class BloodPackage extends Item {
     public BloodPackage(int type, int index, boolean isDead, int x, int y) {
-        super(type, index, isDead, x, y);
-        this.sprite = Sprite.BLOOD_PACKAGE;
+        super(type, index, isDead, x, y, Sprite.BLOOD_PACKAGE );
     }
 }

src/renderer/data/entity/Character.java

@@ -23,6 +23,7 @@ public class Character extends Entity {
     private Sword sword = new Sword();
 
     public Character(int clientno, String nickName) {
+        super(Sprite.PLAYER);
         this.clientno = clientno;
         this.nickName = nickName;
         Initialize();
@@ -34,8 +35,8 @@ public void Initialize() {
         this.dir = 0;
         this.HP = 100;
 
-        sprite = Sprite.PLAYER;
         sword.sprite = Sprite.EMPTY;
+        setDeadSprite(Sprite.DEAD_PLAYER);
     }
 
     public void set(int weaponType, String nickName, int x, int y,
@@ -60,7 +61,9 @@ public void set(int weaponType, String nickName, int x, int y,
         //this.sprite = Sprite.rotate(Sprite.PLAYER,angle);
     }
 
+    @Override
     public void update() {
+        super.update();
         timer++;
         if (timer % 6 == 0) {
             count++;
@@ -95,6 +98,7 @@ public void update() {
 
     }
 
+    @Override
     public void render(int[] pixels) {
         //TODO: If attack flag == true, draw addition animation
         //TODO: bullet should have additional class and draw additionally.

src/renderer/data/entity/Entity.java

@@ -16,24 +16,45 @@ public abstract class Entity {
     protected double dir;
     protected boolean isDead;
     protected Sprite sprite;
+    private Sprite deadSprite = Sprite.EMPTY;
+    private Sprite currentSprite;
 
-    public void update() {
+    public Entity(Sprite s){
+        sprite = s;
+        currentSprite = s;
+    }
+    public Entity(){
+        this.sprite=Sprite.EMPTY;
+        this.currentSprite=Sprite.EMPTY;
+    }
 
+    public void update() {
+        if (isDead) currentSprite = deadSprite;
+        else currentSprite = sprite;
     }
 
     public void render(int pixels[]) {
-        EntityRenderEngine.renderEntity(this,pixels);
+        EntityRenderEngine.renderEntity(this, pixels);
     }
 
 
+    protected void setDeadSprite(Sprite deadSprite) {
+        this.deadSprite = deadSprite;
+    }
+
     public void remove() {
         isDead = true;
     }
 
     public double getDirection() {
         return dir;
     }
-    public Sprite getSprite() {return sprite;}
+
+    public Sprite getSprite() {
+        assert currentSprite != null;
+        return currentSprite;
+    }
+
     public boolean isDead() {
         return isDead;
     }

src/renderer/data/entity/ExplosionParticle.java

@@ -10,7 +10,7 @@ public class ExplosionParticle extends Entity {
     final static int FAKEBOX_SIZE = Sprite.PLAYER.SIZE;
 
     public ExplosionParticle() {
-        this.sprite = Sprite.EMPTY;
+        super(Sprite.EMPTY);
     }
 
     @Override

src/renderer/data/entity/FakeBox.java

@@ -13,8 +13,8 @@ public class FakeBox extends Item {
     private int deadPosX = 0;
     private int deadPosY = 0;
     public FakeBox(int type, int index, boolean isDead, int x, int y) {
-        super(type, index, isDead, x, y);
-        this.sprite = Sprite.PLAYER;
+        super(type, index, isDead, x, y, Sprite.PLAYER);
+        //this.sprite = Sprite.PLAYER;
     }
 
     @Override
@@ -50,4 +50,5 @@ public void render(int[] pixels) {
         super.render(pixels);
         ep.render(pixels);
     }
+
 }

src/renderer/data/entity/Item.java

@@ -8,7 +8,8 @@ public class Item extends Entity {
     private int index;
     private int owner;
 
-    public Item(int type, int index, boolean isDead, int x, int y) {
+    public Item(int type, int index, boolean isDead, int x, int y, Sprite s) {
+        super(s);
         this.itemType = type;
         this.index = index;
         this.isDead = isDead;
@@ -18,6 +19,7 @@ public Item(int type, int index, boolean isDead, int x, int y) {
 
 
     public void update(boolean isDead, int owner, int x, int y) {
+        super.update();
         this.isDead = isDead;
         this.owner = owner;
         this.x = x;

src/renderer/data/entity/Sword.java

@@ -1,5 +1,7 @@
 package renderer.data.entity;
 
+import renderer.engine.EntityRenderEngine;
+
 /**
  * Created by TsunglinYang on 2016/12/20.
  */
@@ -11,6 +13,6 @@ public void update() {
 
     @Override
     public void render(int[] pixels) {
-        super.render(pixels);
+        EntityRenderEngine.renderEntity(x,y,pixels,sprite);
     }
 }

src/renderer/engine/EntityRenderEngine.java

@@ -2,8 +2,9 @@
 
 import pseudomain.Game;
 import renderer.data.DynamicObjectManager;
+import renderer.data.entity.Character;
 import renderer.data.entity.Entity;
-import renderer.data.entity.ExplosionParticle;
+import renderer.data.entity.Item;
 import renderer.graphics.Sprite;
 
 import java.util.List;
@@ -21,17 +22,24 @@ public EntityRenderEngine(){
 
     public void render(int pixels[]) {
         this.pixels = pixels;
-        List<Entity> allCharacter = dom.getAllDynamicObjects();
-        allCharacter.stream().filter(e -> !e.isDead()).forEach(e -> e.render(pixels));
+        List<Character> allCharacter = dom.getCharacterList();
+        List<Item> allItem = dom.getItemList();
+        for(Item i : allItem){
+            i.render(pixels);
+        }
+        for(Character c : allCharacter){
+            c.render(pixels);
+        }
+        //allCharacter.stream().filter(e -> !e.isDead()).forEach(e -> e.render(pixels));
     }
-    public static void renderEntity(Entity character, int pixels[]){
+    public static void renderEntity(Entity entity, int pixels[]){
         int offsetX = DynamicObjectManager.getInstance().getVirtualCharacterXY().x - Game.WIDTH / 2;
         int offsetY = DynamicObjectManager.getInstance().getVirtualCharacterXY().y - Game.HEIGHT / 2;
-        int xp = character.x;
-        int yp = character.y;
+        int xp = entity.x;
+        int yp = entity.y;
         xp -= offsetX;
         yp -= offsetY;
-        Sprite s = character.getSprite();
+        Sprite s = entity.getSprite();
         for (int y = 0; y < s.SIZE; y++) {
             int ya = y + yp;
             for (int x = 0; x < s.SIZE; x++) {

src/renderer/engine/SceneRenderEngine.java

@@ -16,15 +16,15 @@ public SceneRenderEngine() {
 
 	public void renderScene(int[] pixels) {
 		this.pixels = pixels;
-		// real x,y position need to get from renderer.data.DynamicObjectManager
+
 		int xScroll = DynamicObjectManager.getInstance().getVirtualCharacterXY().x - Game.WIDTH / 2;
 		int yScroll = DynamicObjectManager.getInstance().getVirtualCharacterXY().y - Game.HEIGHT / 2;
 
 		renderLevel(xScroll, yScroll);
 	}
 
 	public void renderTile(int xp, int yp, int xOffset, int yOffset, Tile tile) {
-		xp -= xOffset; // TODO: offsets should get from renderer.data.DynamicObjectManager
+		xp -= xOffset;
 		yp -= yOffset;
 		for (int y = 0; y < tile.sprite.SIZE; y++) {
 			int ya = y + yp;

src/renderer/graphics/Sprite.java

@@ -16,15 +16,16 @@ public class Sprite {
     //for demo
     public static Sprite BLOOD_PACKAGE = new Sprite(16, 4, 0, SpriteSheet.character);
     public static Sprite AMMO_PACKAGE = new Sprite(16, 3, 0, SpriteSheet.character);
-    public static Sprite PLAYER = new Sprite(16, 0, 0, SpriteSheet.character);
+    public static Sprite PLAYER = new Sprite(16, 1, 0, SpriteSheet.character);
+    public static Sprite DEAD_PLAYER = new Sprite(16, 3, 2, SpriteSheet.character);
 
     //Spawn Level Sprites here:
-    public static Sprite SPWAN_GRASS = new Sprite(16, 0, 0, SpriteSheet.SPWAN_LEVEL);
-    public static Sprite SPWAN_GRASS_2 = new Sprite(16, 1, 0, SpriteSheet.SPWAN_LEVEL);
-    public static Sprite SPWAN_HEDGE = new Sprite(16, 0, 1, SpriteSheet.SPWAN_LEVEL);
-    public static Sprite SPWAN_WATER = new Sprite(16, 2, 2, SpriteSheet.SPWAN_LEVEL);
-    public static Sprite SPWAN_WALL = new Sprite(16, 1, 1, SpriteSheet.SPWAN_LEVEL);
-    public static Sprite SPWAN_FLOOR = new Sprite(16, 2, 1, SpriteSheet.SPWAN_LEVEL);
+    public static Sprite SPAWN_GRASS = new Sprite(16, 0, 0, SpriteSheet.SPWAN_LEVEL);
+    public static Sprite SPAWN_GRASS_2 = new Sprite(16, 1, 0, SpriteSheet.SPWAN_LEVEL);
+    public static Sprite SPAWN_HEDGE = new Sprite(16, 0, 1, SpriteSheet.SPWAN_LEVEL);
+    public static Sprite SPAWN_WATER = new Sprite(16, 2, 2, SpriteSheet.SPWAN_LEVEL);
+    public static Sprite SPAWN_WALL = new Sprite(16, 1, 1, SpriteSheet.SPWAN_LEVEL);
+    public static Sprite SPAWN_FLOOR = new Sprite(16, 2, 1, SpriteSheet.SPWAN_LEVEL);
 
     // below is for animation, dear StanleyLin.
 

src/renderer/graphics/SpriteSheet.java

@@ -12,7 +12,7 @@ public class SpriteSheet {
 
 	public static SpriteSheet tiles = new SpriteSheet("/textures/spritesheet.png", 256);
 	public static SpriteSheet character = new SpriteSheet("/textures/character.png", 256);
-	public static SpriteSheet SPWAN_LEVEL = new SpriteSheet("/levels/spwanLevel.png", 48);
+	public static SpriteSheet SPWAN_LEVEL = new SpriteSheet("/levels/spawnLevel.png", 48);
 
 
 	public SpriteSheet(String path, int size){

src/renderer/level/tile/Tile.java

@@ -9,12 +9,12 @@ public class Tile {
 	public Sprite sprite;
 
 	public static Tile VOID_TILE = new VoidTile(Sprite.VOID_SPRITE);
-	public static Tile SPAWN_GRASS = new SpawnLevelGrassTile(Sprite.SPWAN_GRASS);
-	public static Tile SPAWN_GRASS_2 = new SpawnLevelGrassTile(Sprite.SPWAN_GRASS_2);
-	public static Tile SPAWN_HEDGE = new SpawnLevelHedgeTile(Sprite.SPWAN_HEDGE);
-	public static Tile SPAWN_WATER = new SpawnLevelWaterTile(Sprite.SPWAN_WATER);
-	public static Tile SPAWN_WALL = new SpawnLevelWallTile(Sprite.SPWAN_WALL);
-	public static Tile SPAWN_FLOOR = new SpawnLevelFloorTile(Sprite.SPWAN_FLOOR);
+	public static Tile SPAWN_GRASS = new SpawnLevelGrassTile(Sprite.SPAWN_GRASS);
+	public static Tile SPAWN_GRASS_2 = new SpawnLevelGrassTile(Sprite.SPAWN_GRASS_2);
+	public static Tile SPAWN_HEDGE = new SpawnLevelHedgeTile(Sprite.SPAWN_HEDGE);
+	public static Tile SPAWN_WATER = new SpawnLevelWaterTile(Sprite.SPAWN_WATER);
+	public static Tile SPAWN_WALL = new SpawnLevelWallTile(Sprite.SPAWN_WALL);
+	public static Tile SPAWN_FLOOR = new SpawnLevelFloorTile(Sprite.SPAWN_FLOOR);
 
 	public final static int COLOR_SPAWN_GRASS = 0xff00ff00;
 	public final static int COLOR_SPAWN_GRASS_2 = 0xffffff00;

src/udp/update/server/UDP_Server.java

@@ -64,7 +64,8 @@ private void parseData(String receiveString) {
 							player.isDead());
 					if(player.isAttackFlag())
 						System.out.println("ATTACK is true");
-
+					if(player.isAttackedFlag())
+						System.out.println("IsATTACKED is true");
 					break;
 				case "AddP":
 					player = gson.fromJson(eachEnData.getData(),
@@ -81,9 +82,6 @@ private void parseData(String receiveString) {
 					instance.updateItem(item.getItemID(), item.isDead(),
 										item.getItemOwner(), item.getLocX(), item.getLocY());
 
-					if(item.isDead())
-						System.out.println("Item dead");
-
 					break;
 				case "AddI":
 					item = gson.fromJson(eachEnData.getData(),