mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
Merge remote-tracking branch 'origin/Alpha' into UI
# Conflicts: # app/src/main/java/org/toop/app/menu/MainMenu.java # app/src/main/java/org/toop/app/menu/QuitMenu.java
This commit is contained in:
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -13,7 +13,7 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_24" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
BIN
app/src/main/resources/image/game/battleship.png
Normal file
BIN
app/src/main/resources/image/game/battleship.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
BIN
app/src/main/resources/image/game/other.png
Normal file
BIN
app/src/main/resources/image/game/other.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 189 KiB |
BIN
app/src/main/resources/image/game/reversi.png
Normal file
BIN
app/src/main/resources/image/game/reversi.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 MiB |
BIN
app/src/main/resources/image/game/sudoku.png
Normal file
BIN
app/src/main/resources/image/game/sudoku.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/resources/image/game/tictactoe.png
Normal file
BIN
app/src/main/resources/image/game/tictactoe.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
33
app/src/main/resources/style/main.css
Normal file
33
app/src/main/resources/style/main.css
Normal file
@@ -0,0 +1,33 @@
|
||||
.main-button {
|
||||
-fx-background-color: transparent;
|
||||
-fx-background-image: url("card-default.jpg"); /* fallback image */
|
||||
-fx-background-size: cover;
|
||||
-fx-background-position: center;
|
||||
-fx-pref-width: 250px;
|
||||
-fx-pref-height: 180px;
|
||||
-fx-border-radius: 15;
|
||||
-fx-background-radius: 15;
|
||||
-fx-effect: dropshadow(gaussian, rgba(0,0,0,0.3), 15, 0.4, 0, 4);
|
||||
-fx-cursor: hand;
|
||||
-fx-padding: 0;
|
||||
}
|
||||
|
||||
.card-label {
|
||||
-fx-background-color: rgba(0, 0, 0, 0.5);
|
||||
-fx-font-size: 20px;
|
||||
-fx-font-weight: bold;
|
||||
-fx-text-fill: white;
|
||||
-fx-padding: 10px;
|
||||
-fx-alignment: top-center;
|
||||
-fx-background-radius: 15 15 0 0;
|
||||
-fx-opacity: 0;
|
||||
-fx-transition: all 0.3s ease;
|
||||
}
|
||||
|
||||
.main-button:hover {
|
||||
-fx-effect: dropshadow(gaussian, #00ffff, 15, 0.5, 0, 0);
|
||||
}
|
||||
|
||||
.main-button:hover .card-label {
|
||||
-fx-opacity: 1;
|
||||
}
|
||||
33
app/src/main/resources/style/quit.css
Normal file
33
app/src/main/resources/style/quit.css
Normal file
@@ -0,0 +1,33 @@
|
||||
.quit-background {
|
||||
-fx-background-color: rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
.quit-box {
|
||||
-fx-background-color: rgba(30, 30, 30, 0.95);
|
||||
-fx-background-radius: 15;
|
||||
-fx-padding: 30;
|
||||
-fx-effect: dropshadow(gaussian, black, 20, 0.6, 0, 4);
|
||||
}
|
||||
|
||||
.quit-text {
|
||||
-fx-fill: white;
|
||||
-fx-font-size: 28px;
|
||||
-fx-font-weight: 600;
|
||||
-fx-font-family: "Segoe UI", sans-serif;
|
||||
}
|
||||
|
||||
.quit-button {
|
||||
-fx-font-size: 16px;
|
||||
-fx-text-fill: white;
|
||||
-fx-background-color: transparent;
|
||||
-fx-border-color: white;
|
||||
-fx-border-radius: 5;
|
||||
-fx-padding: 8 20;
|
||||
-fx-cursor: hand;
|
||||
}
|
||||
|
||||
.quit-button:hover {
|
||||
-fx-text-fill: #00ffff;
|
||||
-fx-border-color: #00ffff;
|
||||
-fx-effect: dropshadow(gaussian, #00ffff, 8, 0.5, 0, 0);
|
||||
}
|
||||
20
app/src/main/resources/style/style.css
Normal file
20
app/src/main/resources/style/style.css
Normal file
@@ -0,0 +1,20 @@
|
||||
.root {
|
||||
-fx-background-color: #2d2d2d;
|
||||
|
||||
-fx-font-size: 28px;
|
||||
-fx-font-weight: 600;
|
||||
-fx-font-family: "Segoe UI", sans-serif;
|
||||
}
|
||||
|
||||
.button {
|
||||
-fx-background-color: transparent;
|
||||
-fx-text-fill: white;
|
||||
-fx-border-color: transparent;
|
||||
-fx-padding: 10 20;
|
||||
-fx-cursor: hand;
|
||||
-fx-effect: null;
|
||||
}
|
||||
|
||||
.button:hover {
|
||||
-fx-effect: dropshadow(gaussian, #00ffff, 10, 0.3, 0, 0);
|
||||
}
|
||||
@@ -44,11 +44,13 @@ public final class TicTacToe extends Game {
|
||||
return State.WIN;
|
||||
}
|
||||
|
||||
if (movesLeft <= 0) {
|
||||
nextPlayer();
|
||||
|
||||
if (movesLeft <= 2) {
|
||||
if (checkDraw(new TicTacToe(this))) {
|
||||
return State.DRAW;
|
||||
}
|
||||
|
||||
nextPlayer();
|
||||
}
|
||||
return State.NORMAL;
|
||||
}
|
||||
|
||||
@@ -81,4 +83,26 @@ public final class TicTacToe extends Game {
|
||||
// F-Slash
|
||||
return board[2] != EMPTY && board[2] == board[4] && board[2] == board[6];
|
||||
}
|
||||
|
||||
public boolean checkDraw(TicTacToe game) {
|
||||
if (game.checkForWin()) {
|
||||
return false;
|
||||
}
|
||||
if (game.movesLeft == 0) {
|
||||
return true;
|
||||
}
|
||||
// try every move on a legal copy
|
||||
for (Move move : game.getLegalMoves()) {
|
||||
TicTacToe copy = new TicTacToe(game);
|
||||
State result = copy.play(move);
|
||||
|
||||
if (result == State.WIN) {
|
||||
return false;
|
||||
}
|
||||
if (!checkDraw(copy)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user