Skip to content
Snippets Groups Projects
Commit 9cbc5acf authored by Schlütter Yannik's avatar Schlütter Yannik
Browse files

IEntity.java & GameSceneController.java & NetworkPlayerTwo.java: Add: second...

IEntity.java & GameSceneController.java & NetworkPlayerTwo.java: Add: second Identity for placeBomb Method
Player.java: Add: Logic Comments for future Fixes and Added second Identity coordinates
parent d22c8c2f
No related branches found
No related tags found
6 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!27Player can now place bombs that have a explosion radius that dont go through the wall.,!24Player can now place bombs that have a explosion radius that dont go through the wall.,!22Gameplay update
......@@ -109,8 +109,8 @@ public class GameSceneController implements Initializable {
enemy.attack(player, graphicsContext2D);
player.checkHealTile(player, graphicsContext2D);
enemy.checkHealTile(enemy, graphicsContext2D);
player.placeBomb(player, graphicsContext2D);
enemy.placeBomb(enemy, graphicsContext2D);
player.placeBomb(player, enemy, graphicsContext2D);
enemy.placeBomb(enemy, player, graphicsContext2D);
}
private void renderContent(GraphicsContext graphicsContext) {
......
......@@ -14,7 +14,7 @@ public interface IEntity {
void checkHealTile(IEntity entity, GraphicsContext graphicsContext);
void placeBomb(IEntity entity, GraphicsContext graphicsContext);
void placeBomb(IEntity entity, IEntity entity2, GraphicsContext graphicsContext);
void attack(IEntity entity, GraphicsContext graphicsContext);
......
......@@ -42,7 +42,7 @@ class NetworkPlayerTwo implements IEntity{
}
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
public void placeBomb(IEntity entity, IEntity entity2, GraphicsContext graphicsContext) {
}
......
......@@ -292,31 +292,39 @@ class Player implements IEntity {
}
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext){
public void placeBomb(IEntity entity, IEntity entity2, GraphicsContext graphicsContext){
boolean isDestructible;
int xTile = entity.getMapPosX() / gameSceneController.getScaledTileSize();
int yTile = entity.getMapPosY() / gameSceneController.getScaledTileSize();
int xTile2 = entity2.getMapPosX() / gameSceneController.getScaledTileSize();
int yTile2 = entity2.getMapPosY() / gameSceneController.getScaledTileSize();
if(inputHandler.isBomb() && PLAYER_MODE == PlayerMode.PLAYER_ONE ||
inputHandler.isSdBomb() && PLAYER_MODE == PlayerMode.PLAYER_TWO) {
isDestructible = checkTileNon_Destructible(yTile, xTile);
if(isDestructible){
TileManager.tileMap[yTile][xTile] = 7;
for (int i=0;i<3; i++){
isDestructible = checkTileNon_Destructible(yTile +1 +i, xTile);
if(isDestructible && (yTile < 18 && xTile <18)){
isDestructible = checkTileNon_Destructible(yTile +1 +i, xTile); //If Tile solid , -> should stop comparing,
if(isDestructible && (yTile < 18 && xTile <18)){ //because for now, Tile behind gets destroyed aswell
TileManager.tileMap[yTile +1 + i][xTile] = 8;
/*if(entity || entity2) {
entity2.gotHit(2); //See if enemy or player hit
}*/
}
isDestructible = checkTileNon_Destructible(yTile -1 -i, xTile);
if(isDestructible && (yTile < 18 && xTile <18)){
TileManager.tileMap[yTile -1 -i][xTile] = 8;
entity.gotHit(2);
}
isDestructible = checkTileNon_Destructible(yTile , xTile +1 +i);
if(isDestructible && (yTile < 18 && xTile <18)){
TileManager.tileMap[yTile][xTile +1 +i] = 8;
entity.gotHit(2);
}
isDestructible = checkTileNon_Destructible(yTile, xTile -1 -i);
if(isDestructible && (yTile < 18 && xTile <18)){
TileManager.tileMap[yTile][xTile -1 -i] = 8;
entity.gotHit(2);
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment