TMGE updates:

- RandomMaze regenerates few times so all characters can reach player
- Player sloweness
- MazeCharacter can have random movement when not following/escaping
- Force maze background redraw

Author: Muusssi

src/tge/TGE.java

@@ -19,7 +19,7 @@
 
 public class TGE {
 
-  public static final String VERSION = "0.19.1";
+  public static final String VERSION = "0.20.0";
 
   public static void log_version() {
     System.out.println("TGE version: " + VERSION);

src/tmge/Maze.java

@@ -10,6 +10,8 @@
 
 public class Maze extends SerializableObject {
 
+  public static int REGENERATION_ATTEMPTS_ALLOWED = 10;
+
   public int width = 0;
   public int height = 0;
 
@@ -93,15 +95,36 @@ public JSONObject save_object() {
   public void cell_init(MazeCell cell) {}
 
   public void reset_cells() {
-    cells = new MazeCell[this.width][this.height];
-    for (int i = 0; i < this.width; i++) {
-      for (int j = 0; j < this.height; j++) {
-        MazeCell cell = new MazeCell(this, i, j);
-        cells[i][j] = cell;
-        cell_init(cell);
+    for (int attempt = 0; attempt < Maze.REGENERATION_ATTEMPTS_ALLOWED; attempt++) {
+      cells = new MazeCell[this.width][this.height];
+      for (int i = 0; i < this.width; i++) {
+        for (int j = 0; j < this.height; j++) {
+          MazeCell cell = new MazeCell(this, i, j);
+          cells[i][j] = cell;
+          cell_init(cell);
+        }
       }
+      if (this.maze_ok()) break;
     }
     maze_layer_dirty = true;
+    for (MazeCharacter character : this.characters) {
+      character.path = null;
+    }
+  }
+
+  protected boolean maze_ok() {
+    return true;
+  }
+
+  public void refresh_background() {
+    maze_layer_dirty = true;
+  }
+
+  public void set_background_color(int r, int g, int b) {
+    this.r = r;
+    this.g = g;
+    this.b = b;
+    this.refresh_background();
   }
 
   public void update_maze_layer() {
@@ -175,5 +198,4 @@ public MazeCell pointed_cell() {
   }
 
 
-
 }

src/tmge/MazeCharacter.java

@@ -18,6 +18,7 @@ public class MazeCharacter extends SerializableObject {
   public int max_path = -1;
   public int safe_distance = 10;
   public int minimum_distance = 1;
+  public boolean move_randomly = false;
 
   protected MazeCell target_cell;
   protected MazeCell escape_cell;
@@ -68,17 +69,27 @@ public JSONObject save_object() {
   }
 
   public void set_target(MazeCell target) {
+    if (this.target_cell == target) return;
     this.target_cell = target;
     this.escape_cell = null;
     this.path = this.path_to(this.target_cell);
   }
 
+  public void chase_player() {
+    this.set_target(TMGE.current_cell());
+  }
+
   public void set_escape_target(MazeCell target) {
+    if (this.escape_cell == target) return;
     this.escape_cell = target;
     this.target_cell = null;
     this.path = this.escape_path(this.escape_cell);
   }
 
+  public void escape_player() {
+    this.set_escape_target(TMGE.current_cell());
+  }
+
   public ArrayList<Integer> path_to(MazeCell target) {
     return path_to(target, this.current_cell(), false);
   }
@@ -189,9 +200,13 @@ protected void draw_path() {
     TMGE.papplet().popStyle();
   }
 
+  public boolean ready_to_act() {
+    return TMGE.papplet().frameCount - slowness > last_acted;
+  }
+
   public void act() {
     // This is to slow the movement of the character
-    if (TMGE.papplet().frameCount - slowness < last_acted) return;
+    if (!this.ready_to_act()) return;
     if (this.path == null || this.path.isEmpty() || this.maze.maze_layer_dirty) {
       if (escape_cell != null) {
         this.path = this.escape_path(this.target_cell);
@@ -203,6 +218,9 @@ else if (target_cell != null) {
     if (this.path != null && !this.path.isEmpty()) {
       this.move_in_direction(this.path.remove(0));
     }
+    else if (this.move_randomly) {
+      this.move_in_direction((int)(Math.random() * 5));
+    }
     last_acted = TMGE.papplet().frameCount;
   }
 
@@ -223,7 +241,9 @@ public boolean move_in_direction(int direction) {
 
   public boolean move_up() {
     if (this.maze == null) return false;
+    if (!this.ready_to_act()) return false;
     if (!current_cell().wall_up()) {
+      last_acted = TMGE.papplet().frameCount;
       y--;
       return true;
     }
@@ -232,7 +252,9 @@ public boolean move_up() {
 
   public boolean move_down() {
     if (maze == null) return false;
+    if (!this.ready_to_act()) return false;
     if (!current_cell().wall_down()) {
+      last_acted = TMGE.papplet().frameCount;
       y++;
       return true;
     }
@@ -241,7 +263,9 @@ public boolean move_down() {
 
   public boolean move_left() {
     if (maze == null) return false;
+    if (!this.ready_to_act()) return false;
     if (!current_cell().wall_left()) {
+      last_acted = TMGE.papplet().frameCount;
       x--;
       return true;
     }
@@ -250,7 +274,9 @@ public boolean move_left() {
 
   public boolean move_right() {
     if (maze == null) return false;
+    if (!this.ready_to_act()) return false;
     if (!current_cell().wall_right()) {
+      last_acted = TMGE.papplet().frameCount;
       x++;
       return true;
     }

src/tmge/RandomMaze.java

@@ -24,6 +24,16 @@ public JSONObject save_object() {
     return json;
   }
 
+  @Override
+  protected boolean maze_ok() {
+    for (MazeCharacter character : this.characters) {
+      if (character.path_to(TMGE.current_cell()) == null) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   @Override
   public void cell_init(MazeCell cell) {
     if (TMGE.papplet().random(1) < wall_factor) {

src/tmge/TMGE.java

@@ -113,10 +113,19 @@ public static void draw_player() {
     TMGE.papplet().pushStyle();
     if (player_image == null) {
       TMGE.papplet().fill(255);
-      TMGE.papplet().ellipse((TMGE.player_x + 0.5f)*TMGE.maze_scale, (TMGE.player_y + 0.5f)*TMGE.maze_scale, TMGE.maze_scale*0.8f, TMGE.maze_scale*0.8f);
+      TMGE.papplet().ellipse(
+          (TMGE.player_x + 0.5f)*TMGE.maze_scale,
+          (TMGE.player_y + 0.5f)*TMGE.maze_scale,
+          TMGE.maze_scale*0.8f,
+          TMGE.maze_scale*0.8f);
     }
     else {
-      TMGE.papplet().image(player_image, TMGE.player_x*TMGE.maze_scale, TMGE.player_y*TMGE.maze_scale, TMGE.maze_scale, TMGE.maze_scale);
+      TMGE.papplet().image(
+          player_image,
+          TMGE.player_x*TMGE.maze_scale + 3,
+          TMGE.player_y*TMGE.maze_scale + 3,
+          TMGE.maze_scale - 6,
+          TMGE.maze_scale - 6);
     }
     TMGE.papplet().popStyle();
   }