summaryrefslogtreecommitdiff
path: root/pacman/model/src/main
diff options
context:
space:
mode:
authormithe24 <mithe24@student.sdu.dk>2025-05-07 17:17:44 +0200
committermithe24 <mithe24@student.sdu.dk>2025-05-07 17:31:53 +0200
commitaec79e01ba110cc2145d3643fabc0af756c0d7ca (patch)
tree09e35571a96265a6d5ba0733a4e8e7411bd19eb5 /pacman/model/src/main
parentc164daed53574babb26796b05682432709e2c5c1 (diff)
downloadpacman-aec79e01ba110cc2145d3643fabc0af756c0d7ca.tar.gz
pacman-aec79e01ba110cc2145d3643fabc0af756c0d7ca.zip
fix/small-fixes (#14)
* fix(model/entities): entites start in center of tile * style(pacman): It should be width and height, not height and width. * refactor(view): Changing setting of background color
Diffstat (limited to 'pacman/model/src/main')
-rw-r--r--pacman/model/src/main/java/com/gr15/pacman/model/Board.java6
-rw-r--r--pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java5
-rw-r--r--pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java4
3 files changed, 8 insertions, 7 deletions
diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/Board.java b/pacman/model/src/main/java/com/gr15/pacman/model/Board.java
index 898ec3b..399ddfc 100644
--- a/pacman/model/src/main/java/com/gr15/pacman/model/Board.java
+++ b/pacman/model/src/main/java/com/gr15/pacman/model/Board.java
@@ -11,13 +11,13 @@ public class Board {
public enum TileType { WALL, EMPTY };
- public Board(int height, int width) {
+ public Board(int width, int height) {
this.width = width;
this.height = height;
}
- public Board(int height, int width, TileType[][] tileBoard) {
- this(height, width);
+ public Board(int width, int height, TileType[][] tileBoard) {
+ this(width, height);
this.tileBoard = tileBoard;
}
diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java b/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java
index aab7dd9..b9a64cd 100644
--- a/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java
+++ b/pacman/model/src/main/java/com/gr15/pacman/model/GameStateBuilder.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.json.JSONArray;
@@ -12,7 +13,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
-import com.gr15.pacman.model.Board.Direction;
+import com.gr15.pacman.model.entities.Entity.Direction;
import com.gr15.pacman.model.Board.TileType;
import com.gr15.pacman.model.entities.Entity;
import com.gr15.pacman.model.entities.Ghost;
@@ -106,7 +107,7 @@ public class GameStateBuilder {
pacmanJsonObject.getInt("y"));
Pacman pacman = new Pacman(pacmanStartPos, speed, Direction.NONE, radius);
- ArrayList<Entity> entities = new ArrayList<>();
+ List<Entity> entities = new ArrayList<>();
Map<Position, Items> items = new HashMap<>();
return new GameState(board, pacman, entities, items);
diff --git a/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java b/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java
index daf0eef..0792219 100644
--- a/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java
+++ b/pacman/model/src/main/java/com/gr15/pacman/model/entities/Entity.java
@@ -9,8 +9,8 @@ import com.gr15.pacman.model.Position;
public abstract class Entity {
private Position position;
- private float subTileX = 0.0f;
- private float subTileY = 0.0f;
+ private float subTileX = 0.5f;
+ private float subTileY = 0.5f;
private double radius;