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

Merge branch 'master' into conflit-2

Browse Source
This commit is contained in:
Quentin Legot 2021-12-08 19:11:18 +01:00 committed by GitHub
commit 3e2252a5ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 213 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/fr/lnl/game/client/App.java
View File

@ -106,6 +106,15 @@ public class App extends Application {
}
playerClass = RandomComputerPlayer.class;
}
case "computerS" -> {
if(playerClass != null) {
playerList.add(createNewPlayer(playerClass,
classPlayer != null ? classPlayer : ClassPlayer.DEFAULT, playerList.size())
);
classPlayer = null;
}
playerClass = StrategyComputerPlayer.class;
}
case "default" -> classPlayer = ClassPlayer.DEFAULT;
case "tank" -> classPlayer = ClassPlayer.TANK;
case "dps" -> classPlayer = ClassPlayer.DPS;
@ -113,6 +122,7 @@ public class App extends Application {
default -> throw new IllegalArgumentException("Unknown argument: " + str);
}
}
System.out.println("oui");
if(playerClass != null)
playerList.add(createNewPlayer(playerClass,
classPlayer != null ? classPlayer : ClassPlayer.DEFAULT, playerList.size())

20
client/src/main/java/fr/lnl/game/client/view/AbstractView.java
View File

@ -1,12 +1,9 @@
package fr.lnl.game.client.view;
import fr.lnl.game.server.games.Game;
import fr.lnl.game.server.games.action.Action;
import fr.lnl.game.server.games.action.ReunionSameAction;
import fr.lnl.game.server.games.player.Player;
import fr.lnl.game.server.utils.Maths;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
@ -20,23 +17,6 @@ public abstract class AbstractView implements View {
this.player = player;
}
protected List<ReunionSameAction> generateAvailableActions() {
List<ReunionSameAction> actions = new ArrayList<>();
for (Action a : player.getActions()) {
ReunionSameAction reunionFilter = actions.stream()
.filter(r -> r.getActionName().equals(a.getClass().getSimpleName()))
.findFirst()
.orElse(null);
if(reunionFilter != null){
reunionFilter.addAction(a);
}
else{
actions.add(new ReunionSameAction(a.getClass().getSimpleName(),a));
}
}
return actions;
}
protected ReunionSameAction choseReunionSameAction(List<ReunionSameAction> actions) {
ReunionSameAction reunion = null;
String error = "Veuillez renseigner une valeur numérique comprise entre 1 et " + actions.size();

6
client/src/main/java/fr/lnl/game/client/view/Cell.java
View File

@ -17,6 +17,7 @@ import javafx.scene.shape.Rectangle;
public class Cell extends Rectangle {
private static final Image PLAYER_IMAGE = new Image("player.png");
private static final Image PLAYER_SHIELD_IMAGE = new Image("player_shield.png");
private static final Image ENERGY_BALL_IMAGE = new Image("energyBall.png");
private static final Image BOMB_IMAGE = new Image("bomb.png");
private static final Image MINE_IMAGE = new Image("mine.png");
@ -36,7 +37,12 @@ public class Cell extends Rectangle {
StackPane sp = new StackPane();
Image in;
if(object instanceof Player){
if(((Player) object).isShieldDeploy()){
in = PLAYER_SHIELD_IMAGE;
}
else{
in = PLAYER_IMAGE;
}
} else if(object instanceof EnergyBall){
in = ENERGY_BALL_IMAGE;
} else if(object instanceof Bomb){

4
client/src/main/java/fr/lnl/game/client/view/Terminal.java
View File

@ -24,12 +24,12 @@ public class Terminal extends AbstractView {
@Override
public void displayWinner(Player winner) {
System.out.println("Le joueur " + winner + " a gagné la partie");
System.out.println(winner + " " + winner.getId() + " a gagné la partie");
}
@Override
public Action choseAction() {
List<ReunionSameAction> actions = generateAvailableActions();
List<ReunionSameAction> actions = player.generateAvailableActions();
List<Action> listActions = choseReunionSameAction(actions).getActions();
Action action = null;
String error = "Veuillez renseigner une valeur numérique comprise entre 1 et " + listActions.size();

2
client/src/main/java/fr/lnl/game/client/view/ViewManager.java
View File

@ -27,7 +27,7 @@ public record ViewManager(
}
boolean isOver = game.play();
System.out.println("Le joueur ordinateur numéro " + player.getId() + " a joué");
System.out.println("Il a joué l'action: " + game.getSelectedAction());
System.out.println("Il a joué l'action: " + game.getSelectedAction().getClass().getSimpleName());
if (isOver) {
displayWinnerEvent.updateModel(game.getWinner());
System.exit(0);

13
client/src/main/java/fr/lnl/game/client/view/Window.java
View File

@ -62,7 +62,7 @@ public class Window extends AbstractView {
@Override
public Action choseAction() {
List<ReunionSameAction> actions = generateAvailableActions();
List<ReunionSameAction> actions = player.generateAvailableActions();
List<Action> listActions = choseReunionSameAction(actions).getActions();
Action action = null;
do {
@ -125,7 +125,7 @@ public class Window extends AbstractView {
public void putStatePlayerPane(Pane principalPane){
int Y = 0;
for(int i=0;i<game.getPlayers().size();i++){
StackPane sp = showStatePlayer(i);
StackPane sp = showStatePlayer(game.getPlayers().get(i).toString(),i);
sp.setLayoutX(480);
sp.setLayoutY(Y);
Y+=90;
@ -133,9 +133,9 @@ public class Window extends AbstractView {
}
}
public StackPane showStatePlayer(int playerNumber){
public StackPane showStatePlayer(String type, int playerNumber){
StackPane subSp = new StackPane();
String s = "Joueur " + (playerNumber+1) + "\n" +
String s = type + " " + (playerNumber+1) + "\n" +
"Energie : " + game.getPlayers().get(playerNumber).getEnergy() + "\n" +
"Arme : " + game.getPlayers().get(playerNumber).getWeapon().getClass().getSimpleName() + "\n";
Text t = new Text(s);
@ -161,8 +161,9 @@ public class Window extends AbstractView {
public StackPane showMoveText(){
StackPane subSp = new StackPane();
String s = "Joueur : " + (player.getId()+1) + "\n" +
"Vient de jouer : " + game.getSelectedAction() + "\n";
String action = game.getSelectedAction() == null ? "null" : game.getSelectedAction().getClass().getSimpleName();
String s = player + " : " + (player.getId()+1) + "\n" +
"Vient de jouer : " + action + "\n";
Text t = new Text(s);
Rectangle r = new Rectangle();
r.setWidth(478);

BIN
client/src/main/resources/player_shield.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

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

@ -47,7 +47,7 @@ public class Game {
public boolean play() {
if(currentPlayer instanceof ComputerPlayer computer)
// si le joueur est humain alors le choix se fait avant l'appel de play()
selectedAction = computer.choseAction();
selectedAction = computer.choseAction(this);
selectedAction.doAction();
countdownGridElementsUpdate();
gridPlayersUpdate();

1
server/src/main/java/fr/lnl/game/server/games/action/Action.java
View File

@ -22,6 +22,7 @@ public interface Action {
* Used by {@link Move}, {@link Shot} and {@link DropObject} to list all direction where the action is possible
* @return a list a point where the action is possible (not block by a wall per example)
*/
Point getPoint();
List<Point> getValidPoint();
}

5
server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java
View File

@ -32,6 +32,11 @@ public class DeployShield extends AbstractAction {
return true;
}
@Override
public Point getPoint() {
return null;
}
@Override
public List<Point> getValidPoint() {
return null;

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

@ -71,4 +71,8 @@ public abstract class DropObject extends AbstractAction {
return direction;
}
@Override
public Point getPoint() {
return point;
}
}

6
server/src/main/java/fr/lnl/game/server/games/action/Move.java
View File

@ -60,6 +60,7 @@ public class Move extends AbstractAction {
* We add a point to the list where there is nothing on the board.
* @see Action#getValidPoint()
*/
@Override
public List<Point> getValidPoint() {
List<Point> listMoves = new ArrayList<>();
@ -81,6 +82,11 @@ public class Move extends AbstractAction {
return listMoves;
}
@Override
public Point getPoint() {
return point;
}
public Direction getDirection() {
return direction;
}

5
server/src/main/java/fr/lnl/game/server/games/action/Nothing.java
View File

@ -29,6 +29,11 @@ public class Nothing extends AbstractAction {
return true;
}
@Override
public Point getPoint() {
return null;
}
@Override
public List<Point> getValidPoint() {
return null;

1
server/src/main/java/fr/lnl/game/server/games/action/ReunionSameAction.java
View File

@ -1,7 +1,6 @@
package fr.lnl.game.server.games.action;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**

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

@ -90,7 +90,7 @@ public class Grid {
str.append(" \033[0;34m").append(value.getA().getId()).append("\033[0m");
}
else if (value.getB() instanceof Wall) {
str.append(" \033[0;32m□\033[0m");
str.append(" \033[0;32m#\033[0m");
}
else if(value.getB() instanceof EnergyBall){
str.append(" \033[0;31mE\033[0m");
@ -119,7 +119,7 @@ public class Grid {
str.append(" \033[0;34m").append(value.getA().getId()).append("\033[0m");
}
else if (value.getB() instanceof Wall) {
str.append(" \033[0;32m□\033[0m");
str.append(" \033[0;32m#\033[0m");
}
else if(value.getB() instanceof EnergyBall){
str.append(" \033[0;31mE\033[0m");
@ -149,6 +149,14 @@ public class Grid {
return board;
}
public Player getGridPlayer(Point point){
return getBoard().get(point).getA();
}
public Box getGridBox(Point point){
return getBoard().get(point).getB();
}
public List<Player> getPlayers() {
return players;
}

24
server/src/main/java/fr/lnl/game/server/games/player/AbstractPlayer.java
View File

@ -1,9 +1,11 @@
package fr.lnl.game.server.games.player;
import fr.lnl.game.server.games.action.Action;
import fr.lnl.game.server.games.action.ReunionSameAction;
import fr.lnl.game.server.games.weapon.Weapon;
import fr.lnl.game.server.utils.Point;
import java.util.ArrayList;
import java.util.List;
public abstract class AbstractPlayer implements Player {
@ -25,6 +27,24 @@ public abstract class AbstractPlayer implements Player {
this.position = position;
}
@Override
public List<ReunionSameAction> generateAvailableActions() {
List<ReunionSameAction> actions = new ArrayList<>();
for (Action a : getActions()) {
ReunionSameAction reunionFilter = actions.stream()
.filter(r -> r.getActionName().equals(a.getClass().getSimpleName()))
.findFirst()
.orElse(null);
if(reunionFilter != null){
reunionFilter.addAction(a);
}
else{
actions.add(new ReunionSameAction(a.getClass().getSimpleName(),a));
}
}
return actions;
}
@Override
public boolean isAlive(){
return energy > 0;
@ -85,6 +105,7 @@ public abstract class AbstractPlayer implements Player {
return position;
}
@Override
public void setPosition(/* NotNull */ Point position){
if(position == null){
@ -95,8 +116,11 @@ public abstract class AbstractPlayer implements Player {
@Override
public void decrementEnergy(int energy){
if(!isShieldDeploy()){
this.energy -= energy;
}
shieldDeploy = false;
}
@Override
public void incrementEnergy(int energy){

16
server/src/main/java/fr/lnl/game/server/games/player/ComputerPlayer.java
View File

@ -1,6 +1,8 @@
package fr.lnl.game.server.games.player;
import fr.lnl.game.server.games.Game;
import fr.lnl.game.server.games.action.Action;
import fr.lnl.game.server.games.action.Nothing;
import fr.lnl.game.server.utils.Point;
/**
@ -16,5 +18,17 @@ public abstract class ComputerPlayer extends AbstractPlayer {
* Call when an AI need to choose an action to execute
* @return the chosen action
*/
public abstract Action choseAction();
public Action choseAction(Game game){
Action action;
switch (getActions().size()){
case 0 -> action = new Nothing();
case 1 -> action = getActions().get(0);
default -> {
return strategy(game);
}
}
return action;
}
public abstract Action strategy(Game game);
}

4
server/src/main/java/fr/lnl/game/server/games/player/HumanPlayer.java
View File

@ -14,4 +14,8 @@ public class HumanPlayer extends AbstractPlayer {
}
@Override
public String toString() {
return "Human";
}
}

3
server/src/main/java/fr/lnl/game/server/games/player/Player.java
View File

@ -1,6 +1,7 @@
package fr.lnl.game.server.games.player;
import fr.lnl.game.server.games.action.Action;
import fr.lnl.game.server.games.action.ReunionSameAction;
import fr.lnl.game.server.games.weapon.Weapon;
import fr.lnl.game.server.utils.Point;
@ -8,6 +9,8 @@ import java.util.List;
public interface Player {
List<ReunionSameAction> generateAvailableActions();
Point getPosition();
boolean isAlive();

15
server/src/main/java/fr/lnl/game/server/games/player/RandomComputerPlayer.java
View File

@ -1,7 +1,9 @@
package fr.lnl.game.server.games.player;
import fr.lnl.game.server.games.Game;
import fr.lnl.game.server.games.action.Action;
import fr.lnl.game.server.games.action.Nothing;
import fr.lnl.game.server.games.grid.Grid;
import fr.lnl.game.server.utils.Point;
import java.util.Random;
@ -17,18 +19,17 @@ public class RandomComputerPlayer extends ComputerPlayer {
* @return an action between all available
*/
@Override
public Action choseAction() {
public Action strategy(Game game) {
Action action = null;
switch (getActions().size()){
case 0 -> action = new Nothing();
case 1 -> action = getActions().get(0);
default -> {
Random random = new Random();
while (action == null || !action.isPossible()) {
action = getActions().get(random.nextInt(0, getActions().size()));
}
}
}
return action;
}
@Override
public String toString() {
return "Random";
}
}

99
server/src/main/java/fr/lnl/game/server/games/player/StrategyComputerPlayer.java
View File

@ -1,8 +1,16 @@
package fr.lnl.game.server.games.player;
import fr.lnl.game.server.games.action.Action;
import fr.lnl.game.server.games.Game;
import fr.lnl.game.server.games.action.*;
import fr.lnl.game.server.games.grid.Grid;
import fr.lnl.game.server.games.grid.elements.Box;
import fr.lnl.game.server.games.grid.elements.EnergyBall;
import fr.lnl.game.server.games.grid.elements.Explosive;
import fr.lnl.game.server.utils.Point;
import java.util.List;
import java.util.Random;
public class StrategyComputerPlayer extends ComputerPlayer {
public StrategyComputerPlayer(Integer id, Point point, ClassPlayer classPlayer) {
@ -10,7 +18,92 @@ public class StrategyComputerPlayer extends ComputerPlayer {
}
@Override
public Action choseAction() {
return null;
public Action strategy(Game game) {
Action action = null;
Grid grid = game.getGrid();
for (Player player : game.getPlayers()) {
boolean danger = player.getActions().stream().anyMatch(a -> a instanceof Shot && a.getPoint().equals(getPosition()));
if(danger && (getEnergy() - getClassPlayer().getPenaltyShoot() <= 0)){
action = new DeployShield(this);
}
}
List<ReunionSameAction> actions = generateAvailableActions();
if(isInReunion(actions, Shot.class)){
ReunionSameAction reunion = extractReunionSameAction(actions, Shot.class);
List<Action> actionList = reunion.getActions();
action = actionList.get(0);
if(actionList.size() > 1){
for (int i = 1; i < actionList.size(); i++) {
Point point = actionList.get(i).getPoint();
if(grid.getGridPlayer(point).getEnergy() < grid.getGridPlayer(action.getPoint()).getEnergy()){
action = actionList.get(i);
}
}
}
return action;
}
if(isInReunion(actions, Move.class)){
ReunionSameAction reunion = extractReunionSameAction(actions, Move.class);
List<Action> actionList = reunion.getActions();
for (Action value : actionList) {
Point point = value.getPoint();
Box box = grid.getGridBox(point);
if(box instanceof EnergyBall){
return value;
}
System.out.println("after move " + action);
}
Random random = new Random();
int value = random.nextInt(0,2);
System.out.println(value);
if(value == 0){
System.out.println("oui");
do{
action = actionList.get(random.nextInt(0, actionList.size()));
Box box = game.getGrid().getGridBox(action.getPoint());
if(box instanceof Explosive) {
if (!((Explosive) box).getPlayer().equals(this)) {
action = null;
}
}
}while(action == null);
return action;
}
if(isInReunion(actions, Explosive.class)){
List<Action> explosiveActions = extractReunionSameAction(actions, Move.class).getActions();
if(explosiveActions.size() > 1){
action = explosiveActions.get(random.nextInt(0, explosiveActions.size()));
return action;
}
System.out.println("explo " + action);
}
}
if(isInReunion(actions, Explosive.class)){
Random random = new Random();
List<Action> explosiveActions = extractReunionSameAction(actions, Move.class).getActions();
if(explosiveActions.size() > 1){
action = explosiveActions.get(random.nextInt(0, explosiveActions.size()));
}
return action;
}
else {
action = new Nothing();
System.out.println("nothing " + action);
}
System.out.println("end " + action);
return action;
}
public boolean isInReunion(List<ReunionSameAction> actions, Class clazz){
return actions.stream().anyMatch(r -> r.getActionName().equals(clazz.getSimpleName()));
}
public ReunionSameAction extractReunionSameAction(List<ReunionSameAction> actions, Class clazz){
return actions.stream().filter(r -> r.getActionName().equals(clazz.getSimpleName())).findFirst().get();
}
@Override
public String toString() {
return "AI";
}
}