added concept for monsters
This commit is contained in:
@@ -48,6 +48,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
public Player player = new Player(this, keyH);
|
||||
public Entity[] obj = new Entity[10];
|
||||
public Entity[] npc = new Entity[10];
|
||||
public Entity[] monster = new Entity[20];
|
||||
ArrayList<Entity> entityList = new ArrayList<>();
|
||||
|
||||
// GAME STATE
|
||||
@@ -64,7 +65,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
public void setupGame() {
|
||||
assetSetter.setObject();
|
||||
assetSetter.setNPC();
|
||||
//playMusic(0); //Play main theme
|
||||
assetSetter.setMonster();
|
||||
gameState = GameState.TITLE;
|
||||
}
|
||||
|
||||
@@ -107,6 +108,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
case PLAY:
|
||||
player.update();
|
||||
for(Entity entity : npc) if(entity != null) entity.update();
|
||||
for(Entity entity : monster) if(entity != null) entity.update();
|
||||
break;
|
||||
case PAUSE:
|
||||
break;
|
||||
@@ -134,6 +136,7 @@ public class GamePanel extends JPanel implements Runnable {
|
||||
entityList.add(player);
|
||||
for(Entity entity : npc) if(entity != null) entityList.add(entity);
|
||||
for(Entity entity : obj) if(entity != null) entityList.add(entity);
|
||||
for(Entity entity : monster) if(entity != null) entityList.add(entity);
|
||||
entityList.sort(Comparator.comparingInt(o -> o.worldY));
|
||||
for(Entity entity : entityList) entity.draw(graphics2d);
|
||||
entityList.clear();
|
||||
|
||||
Reference in New Issue
Block a user