quentinlegot/turn-based-strategy-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add support to grid elements using a countdown like bomb

Browse Source
This commit is contained in:
Quentin Legot 2021-12-06 13:02:55 +01:00
parent 7dde04303c
commit e7740739d9
6 changed files with 64 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/src/main/java/fr/lnl/game/server/games/Game.java
View File

@ -3,10 +3,10 @@ package fr.lnl.game.server.games;
import fr.lnl.game.server.games.action.*;
import fr.lnl.game.server.games.grid.Grid;
import fr.lnl.game.server.games.grid.build.BuildStrategy;
import fr.lnl.game.server.games.grid.elements.CountdownBox;
import fr.lnl.game.server.games.player.ComputerPlayer;
import fr.lnl.game.server.games.player.Player;
import fr.lnl.game.server.listener.ModelListener;
import fr.lnl.game.server.utils.CrashException;
import java.util.ArrayList;
import java.util.Arrays;
@ -46,6 +46,7 @@ public class Game {
selectedAction = player.choseAction();
}
selectedAction.doAction();
countdownGridElementsUpdate();
nextCurrentPlayer();
currentPlayer.setActions(generateAndGetPlayerActions(currentPlayer));
if(isOver()) {
@ -54,21 +55,9 @@ public class Game {
}
private void waitForInterfaceEvent() {
synchronized (this){
try {
wait();
} catch (InterruptedException e) {
throw new CrashException(e.getMessage(), e);
}
}
}
public void resumeThread() {
synchronized (this) {
notifyAll();
}
private void countdownGridElementsUpdate() {
List<CountdownBox> countdownBoxes = this.getGrid().getAllCountdownElements();
countdownBoxes.forEach(CountdownBox::update);
}
public List<Action> generateAndGetPlayerActions(Player player) {
@ -111,20 +100,17 @@ public class Game {
/**
* Change player to the next available in the list
*/
public boolean nextCurrentPlayer() {
if(isOver())
return false;
public void nextCurrentPlayer() {
do {
int index = players.indexOf(currentPlayer) + 1;
if(index == players.size())
index = 0;
currentPlayer = players.get(index);
setCurrentPlayer(players.get(index));
} while(!currentPlayer.isAlive()); // On arrête la boucle dès qu'on trouve un joueur en vie
currentPlayer.setShieldDeploy(false); // on reset son état
return true;
}
public void setCurrent_player(Player current_player) {
public void setCurrentPlayer(Player current_player) {
this.currentPlayer = current_player;
}

7
server/src/main/java/fr/lnl/game/server/games/action/DropBomb.java
View File

@ -12,14 +12,9 @@ public class DropBomb extends DropObject {
@Override
public void doAction() {
game.getGrid().getBoard().get(point).setB(new Bomb());
game.getGrid().getBoard().get(point).setB(new Bomb(point, game));
player.decrementEnergy(player.getClassPlayer().getBombCost());
}
@Override
public boolean isPossible() {
return super.isPossible();
}
}

4
server/src/main/java/fr/lnl/game/server/games/action/DropMine.java
View File

@ -11,10 +11,6 @@ public class DropMine extends DropObject {
}
/**
* @deprecated même principe que {@link Shot#doAction()}
*/
@Deprecated
@Override
public void doAction() {
game.getGrid().getBoard().get(point).setB(new Mine());

10
server/src/main/java/fr/lnl/game/server/games/grid/Grid.java
View File

@ -4,6 +4,7 @@ import fr.lnl.game.server.games.player.Player;
import fr.lnl.game.server.utils.Pair;
import fr.lnl.game.server.utils.Point;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -96,4 +97,13 @@ public class Grid {
return column;
}
public List<CountdownBox> getAllCountdownElements() {
List<CountdownBox> list = new ArrayList<>();
for(Pair<Player, Box> element : getBoard().values()) {
if(element.getB() instanceof CountdownBox box) {
list.add(box);
}
}
return list;
}
}

39
server/src/main/java/fr/lnl/game/server/games/grid/elements/Bomb.java
View File

@ -1,15 +1,50 @@
package fr.lnl.game.server.games.grid.elements;
import fr.lnl.game.server.games.Game;
import fr.lnl.game.server.games.grid.Grid;
import fr.lnl.game.server.games.player.Player;
import fr.lnl.game.server.utils.Point;
public class Bomb extends Explosive {
public class Bomb extends Explosive implements CountdownBox {
private final Point point;
private final Game game;
private int counter = 3;
private static int EXPLOSION_SIZE = 4;
public Bomb(Point point, Game game) {
this.point = point;
this.game = game;
counter = counter * game.getPlayers().size();
}
@Override
public void interact(Grid grid, Player player, Point position) {
public void interact(Grid grid, /* Nullable */ Player player, Point position) {
if(player != null)
player.decrementEnergy(player.getClassPlayer().getPenaltyBomb());
super.interact(grid, player, position);
}
@Override
public void update() {
counter--;
if(counter == 0) {
for(int i = -EXPLOSION_SIZE; i < EXPLOSION_SIZE; i++) {
for(int j = -EXPLOSION_SIZE; j < EXPLOSION_SIZE; j++) {
if(pythagoras(i, j) <= EXPLOSION_SIZE) { // recherche en cercle, pas en carré
Grid grid = game.getGrid();
Point position = new Point(point.getA() + i, point.getB() + j);
if(position.getA() >= 0 && position.getA() < grid.getRow()
&& position.getB() >= 0 && position.getB() < grid.getColumn()) {
interact(grid, null, position);
}
}
}
}
}
}
public double pythagoras(double a, double b) {
return Math.sqrt(Math.pow(a, 2) + Math.pow(b, 2));
}
}

7
server/src/main/java/fr/lnl/game/server/games/grid/elements/CountdownBox.java Normal file
View File

@ -0,0 +1,7 @@
package fr.lnl.game.server.games.grid.elements;
public interface CountdownBox {
void update();
}