nessar/Civilisation-2D
Archived
1
0 Fork 0
Code Issues 4 Packages Projects Releases Wiki Activity

right click destroys building and refunds half

Browse Source
This commit is contained in:
Abdoulaye Diallo committed 2023-12-08 00:20:20 +01:00
1 parent 1a8b071c7e
commit fc2dc1297b
5 files changed
+71 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.vscode/settings.json
Vendored
+9
View File
@@ -1,4 +1,13 @@
{
"java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "automatic",
"spellright.language": [
"en-US-10-1."
],
"spellright.documentTypes": [
"markdown",
"latex",
"plaintext",
"java"
],
}
app/src/main/java/projet/approche/objet/domain/aggregates/Manager.java
+3
View File
@@ -143,6 +143,9 @@ public class Manager {
}
public void destroyBuilding(Coordinate c) throws NotInGridException, NoBuildingHereException {
// refund half the resources it took to build the building
ResourceList buildingBuildResources = this.grid.getBuilding(c).type.getConstructionNeeds().multiplyResourceList(0.5f);
this.resources = this.resources.add(buildingBuildResources);
this.grid = this.grid.removeBuilding(c);
}
app/src/main/java/projet/approche/objet/domain/valueObject/grid/Grid.java
+1
View File
@@ -7,6 +7,7 @@ import projet.approche.objet.domain.entities.building.Building;
import projet.approche.objet.domain.valueObject.grid.exceptions.NoBuildingHereException;
import projet.approche.objet.domain.valueObject.grid.exceptions.NotFreeException;
import projet.approche.objet.domain.valueObject.grid.exceptions.NotInGridException;
import projet.approche.objet.domain.valueObject.resource.ResourceList;
public class Grid {
app/src/main/java/projet/approche/objet/ui/view/GameView.java
+1 -1
View File
@@ -17,7 +17,7 @@ public class GameView extends BorderPane {
private final GridView gridView;
private final InfoBar infoBar;
private AnimationTimer gameLoop;
private Timer timer = new Timer(1500);
private Timer timer = new Timer(10000);
public GameView(Stage stage, App app) {
// Tile picker
app/src/main/java/projet/approche/objet/ui/view/GridView.java
+57 -33
View File
@@ -7,12 +7,16 @@ import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Tooltip;
import javafx.scene.effect.ColorAdjust;
import javafx.scene.layout.BorderPane;
import javafx.scene.input.MouseButton;
import projet.approche.objet.application.App;
import projet.approche.objet.domain.entities.building.Building;
import projet.approche.objet.domain.valueObject.building.BuildingType;
import projet.approche.objet.domain.valueObject.building.exceptions.NotEnoughNeedsException;
import projet.approche.objet.domain.valueObject.game.exceptions.GameEnded;
import projet.approche.objet.domain.valueObject.game.exceptions.GameNotStarted;
import projet.approche.objet.domain.valueObject.game.exceptions.NotEnoughInhabitants;
import projet.approche.objet.domain.valueObject.game.exceptions.NotEnoughWorkers;
import projet.approche.objet.domain.valueObject.grid.Coordinate;
import projet.approche.objet.domain.valueObject.grid.exceptions.NoBuildingHereException;
import projet.approche.objet.domain.valueObject.grid.exceptions.NotFreeException;
@@ -55,15 +59,15 @@ public class GridView extends BorderPane implements Updateable {
getChildren().add(tile);
tile.setOnMouseClicked(e -> {
try {
update(tile, i, j);
} catch (NoBuildingHereException | NotInGridException e1) {
e1.printStackTrace();
}
updateables.forEach(updateable -> {
if (updateable != this)
updateable.update();
});
try {
update(tile, i, j, e.getButton());
} catch (NoBuildingHereException | NotInGridException e1) {
e1.printStackTrace();
}
updateables.forEach(updateable -> {
if (updateable != this)
updateable.update();
});
});
ColorAdjust colorAdjust = new ColorAdjust();
colorAdjust.setBrightness(-0.2);
@@ -75,7 +79,7 @@ public class GridView extends BorderPane implements Updateable {
});
}
private void update(Tile tile, int i, int j) throws NoBuildingHereException, NotInGridException {
private void update(Tile tile, int i, int j, MouseButton button) throws NoBuildingHereException, NotInGridException {
String kind;
try {
kind = app.getBuildingType(i, j);
@@ -84,30 +88,50 @@ public class GridView extends BorderPane implements Updateable {
} catch (NotInGridException e) {
throw new RuntimeException(e); // should not happen
}
if (pickerView.getSelected() != null && !pickerView.getSelected().equals(kind)) {
getChildren().remove(tile);
try {
app.buildBuilding(pickerView.getSelected(), i, j);
} catch (GameNotStarted e) {
// Open a window saying that the game is not started
this.popUp("Game not started", "Game not started...",
"You must start a new game before building.");
} catch (GameEnded e) {
// Open a window saying that the game is ended
this.popUp("Game ended", "Game ended...",
"You must start a new game before building.");
} catch (NotInGridException e) {
throw new RuntimeException(e); // should not happen
} catch (NotFreeException e) {
// Open a window saying that the tile is not free
this.popUp("Tile not free", "Tile not free...",
"You must build on a free tile.");
} catch (NotEnoughNeedsException e) {
// Open a window saying that the tile is not free
this.popUp("Not enough needs", "Not enough needs...",
"You must have enough needs to build this building.");
if (button == MouseButton.PRIMARY){
if (pickerView.getSelected() != null && !pickerView.getSelected().equals(kind)) {
getChildren().remove(tile);
try {
app.buildBuilding(pickerView.getSelected(), i, j);
} catch (GameNotStarted e) {
// Open a window saying that the game is not started
this.popUp("Game not started", "Game not started...",
"You must start a new game before building.");
} catch (GameEnded e) {
// Open a window saying that the game is ended
this.popUp("Game ended", "Game ended...",
"You must start a new game before building.");
} catch (NotInGridException e) {
throw new RuntimeException(e); // should not happen
} catch (NotFreeException e) {
// Open a window saying that the tile is not free
this.popUp("Tile not free", "Tile not free...",
"You must build on a free tile.");
} catch (NotEnoughNeedsException e) {
// Open a window saying that the tile is not free
this.popUp("Not enough needs", "Not enough needs...",
"You must have enough needs to build this building.");
}
createTile(i, j);
}
} else if (button == MouseButton.SECONDARY) {
if (kind != null) {
getChildren().remove(tile);
try {
app.DestroyBuilding(i, j);
} catch (GameNotStarted e) {
// Open a window saying that the game is not started
this.popUp("Game not started", "Game not started...",
"You must start a new game before destroying.");
} catch (GameEnded e) {
// Open a window saying that the game is ended
this.popUp("Game ended", "Game ended...",
"You must start a new game before destroying.");
} catch (NotInGridException e) {
throw new RuntimeException(e); // should not happen
}
createTile(i, j);
}
createTile(i, j);
}
}