Changes to integrate new wall
This commit is contained in:
@@ -17,6 +17,7 @@ public class Tile extends Knoten {
|
|||||||
public static final int GRASS = 0;
|
public static final int GRASS = 0;
|
||||||
public static final int WALL_TOP = 1;
|
public static final int WALL_TOP = 1;
|
||||||
public static final int WALL_BOTTOM = 2;
|
public static final int WALL_BOTTOM = 2;
|
||||||
|
public static final int STONE_WALL = 3;
|
||||||
|
|
||||||
private Bild img; // Bild, das gerendert wird
|
private Bild img; // Bild, das gerendert wird
|
||||||
private int id; // Die id dises Tiles
|
private int id; // Die id dises Tiles
|
||||||
@@ -60,6 +61,8 @@ public class Tile extends Knoten {
|
|||||||
return "/res/images/tiles/wall_top.png";
|
return "/res/images/tiles/wall_top.png";
|
||||||
case WALL_BOTTOM:
|
case WALL_BOTTOM:
|
||||||
return "/res/images/tiles/wall_bottom.png";
|
return "/res/images/tiles/wall_bottom.png";
|
||||||
|
case STONE_WALL:
|
||||||
|
return "/res/images/tiles/stone_wall.png";
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -77,7 +80,7 @@ public class Tile extends Knoten {
|
|||||||
public boolean isCollidable() {
|
public boolean isCollidable() {
|
||||||
// Alle Tiles durch die man nicht laufen soll müssen hier true zurückgeben,
|
// Alle Tiles durch die man nicht laufen soll müssen hier true zurückgeben,
|
||||||
// sonst werden sie bei der Collisiondetection nicht berücksichtigt.
|
// sonst werden sie bei der Collisiondetection nicht berücksichtigt.
|
||||||
return id == WALL_TOP;
|
return id == WALL_TOP || id == STONE_WALL ;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import java.util.ArrayList;
|
|||||||
import ea.Knoten;
|
import ea.Knoten;
|
||||||
import main.entities.Entity;
|
import main.entities.Entity;
|
||||||
import main.entities.Player;
|
import main.entities.Player;
|
||||||
|
import main.maps.Corridor;
|
||||||
import main.entities.Spider;
|
import main.entities.Spider;
|
||||||
import main.maps.Map;
|
import main.maps.Map;
|
||||||
import main.maps.TestMap;
|
import main.maps.TestMap;
|
||||||
@@ -14,6 +15,7 @@ import main.maps.TestMap;
|
|||||||
*/
|
*/
|
||||||
public class World extends Knoten {
|
public class World extends Knoten {
|
||||||
|
|
||||||
|
|
||||||
public static final int SCALE_FACTOR = 4; // Der Basis Zoomfaktor
|
public static final int SCALE_FACTOR = 4; // Der Basis Zoomfaktor
|
||||||
public static final int SCALE = SCALE_FACTOR * Tile.getSize(); // Eine Gameunit ist so viele pixel lang
|
public static final int SCALE = SCALE_FACTOR * Tile.getSize(); // Eine Gameunit ist so viele pixel lang
|
||||||
|
|
||||||
@@ -25,8 +27,8 @@ public class World extends Knoten {
|
|||||||
entities = new ArrayList<>(100);
|
entities = new ArrayList<>(100);
|
||||||
|
|
||||||
// Map initialisieren
|
// Map initialisieren
|
||||||
currentMap = new TestMap();
|
currentMap = new Corridor();
|
||||||
// Map zu EA hinzufügen
|
// Map zu EA hinzuf<EFBFBD>gen
|
||||||
add(currentMap);
|
add(currentMap);
|
||||||
|
|
||||||
// und Entities auch
|
// und Entities auch
|
||||||
|
|||||||
BIN
Zoelda/src/res/images/Spider Sprite Sheet.png
Normal file
BIN
Zoelda/src/res/images/Spider Sprite Sheet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
Zoelda/src/res/images/tiles/stone_wall.png
Normal file
BIN
Zoelda/src/res/images/tiles/stone_wall.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 381 B |
Reference in New Issue
Block a user