now character can die

UoB-COMSM0166 · Apr 12, 2024 · 0068305 · 0068305
1 parent 6130586
commit 0068305
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 32 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Code/src/main/java/org/example/Bomb.java b/Code/src/main/java/org/example/Bomb.java
@@ -2,6 +2,8 @@
 import processing.core.PApplet;
 import processing.core.PImage;
 
+import java.util.Iterator;
+
 public class Bomb extends Objects{
     PApplet parent;
     PImage bombImage;
@@ -71,10 +73,14 @@ public static int encodeCoordinate(int x, int y) {
     }
 
     public static void bombRender(){
-        for (Bomb bomb : bombs) {
+        Iterator<Bomb> iterator = bombs.iterator();
+        while (iterator.hasNext()) {
+            Bomb bomb = iterator.next();
             int packedNumber = bomb.update();
             if (bomb.showed) {
                 bomb.render();
+            } else {
+                iterator.remove();  // 删除showed为false的元素
             }
             if (packedNumber != 0) {
                 int x = packedNumber / 10000;

diff --git a/Code/src/main/java/org/example/Character.java b/Code/src/main/java/org/example/Character.java
@@ -9,6 +9,7 @@ public class Character extends GameLoop{
     int px, py;
     int health;
     int speed;
+    boolean exist;
     public static ArrayList<Player> players;
     public static ArrayList<Enemy> enemies;
     public static int enemyNumber = 5;
@@ -71,6 +72,15 @@ public boolean collisionDetect() {
         if (bomb.showed && bomb.bombActive && dist(x, y, bomb.x() + (float) tile / 2, bomb.y() + (float) tile / 2) < tile) {
         }
     }*/
+    public void ifDamageCharacter(){
+        //handle the interaction between rocks and flames
+        if (Flame.flameCheck(this.x(), this.y())) {
+            this.health -= 1;
+            if (this.health == 0) {
+                this.exist = false;
+            }
+        }
+    }
 
     int x(){return px;}
     int y(){return py;}

diff --git a/Code/src/main/java/org/example/Enemy.java b/Code/src/main/java/org/example/Enemy.java
@@ -3,6 +3,7 @@
 import processing.core.PImage;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.Random;
 
 public class Enemy extends Character{
@@ -17,6 +18,7 @@ public class Enemy extends Character{
         this.enemyImage = enemy;
         this.health = 1;
         this.speed = 3;
+        this.exist = true;
     }
 
     public static ArrayList<Enemy> generateEnemies(PApplet parent) {
@@ -39,13 +41,24 @@ public static ArrayList<Enemy> generateEnemies(PApplet parent) {
         return enemies;
     }
 
+    public void enemyMovement(){
+
+    }
+
     void render(){
         parent.image(enemyImage,px,py,30,30);
     }
 
-    public static void enemiesRender(){
-        for (Enemy enemy : enemies) {
-            enemy.render();
+    public static void enemiesRender() {
+        Iterator<Enemy> iterator = enemies.iterator();
+        while (iterator.hasNext()) {
+            Enemy enemy = iterator.next();
+            enemy.ifDamageCharacter();
+            if (enemy.exist) {
+                enemy.render();
+            } else {
+                iterator.remove();
+            }
         }
     }
 }
diff --git a/Code/src/main/java/org/example/GameLoop.java b/Code/src/main/java/org/example/GameLoop.java
@@ -12,6 +12,7 @@ public class GameLoop extends PApplet{
     public static boolean move=false, up=false, down=false, left=false, right=false;
     public static int rows = 15, cols = 31;
     public static boolean gameWon = false;
+    public static boolean gameLost = false;
 
     public void settings() {
         size(width, height);
@@ -86,8 +87,10 @@ public void draw() {
             BreakableRock.rocksRender();
             DoorKey.doorKeyRender(this);
             Door.doorRender(this);
+
             Player.player1Render();
 
+
             gameEndDetect();
 
             BombPowerUp.getPowerUp(this);
@@ -146,6 +149,9 @@ public void keyReleased() {
     }
 
     private static void gameEndDetect(){
+        if(gameLost){
+            System.out.println("GameOver");
+        }
         if (Items.doorKey != null && !Items.doorKey.collected && Items.doorKey.visible) {
             Player player = Character.players.get(0);
             float distance = dist(player.px, player.py, Items.doorKey.x, Items.doorKey.y);

diff --git a/Code/src/main/java/org/example/Player.java b/Code/src/main/java/org/example/Player.java
@@ -16,10 +16,11 @@ public class Player extends Character {
         this.px=x;
         this.py=y;
         this.playerImage = playerImage;
-        this.health = 3;
+        this.health = 1;
         this.explosionDistance = 1;
         this.maxBombs = 1;
         this.speed = 3;
+        this.exist = true;
     }
 
     public static ArrayList<Player> setPlayer1(PApplet parent) {
@@ -96,6 +97,11 @@ public int getMaxBombs() {
     public void increaseLife() {this.health += 1;}
 
     public static void player1Render(){
-        Character.players.get(0).render();
+        players.get(0).ifDamageCharacter();
+        if(Character.players.get(0).exist){
+            Character.players.get(0).render();
+        }else {
+            GameLoop.gameLost = true;
+        }
     }
 }