Fixed some stuff.

This commit is contained in:
malik 2023-10-16 18:19:01 +02:00
parent 5f6ecae4fe
commit 8a316680c6
2 changed files with 24 additions and 19 deletions

View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="openjdk-21" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="corretto-19" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

View file

@ -3,7 +3,7 @@ import java.awt.Point
fun main() { fun main() {
println("Welcome to TicTacToe\nGamemode:\n 1) Singleplayer\n 2) Multiplayer\n") println("Welcome to TicTacToe\nGamemode:\n 1) Singleplayer\n 2) Multiplayer\n")
var menuInput = readLine() val menuInput = readlnOrNull()
if(menuInput != null) { if(menuInput != null) {
if (menuInput.toInt() == 1) if (menuInput.toInt() == 1)
@ -20,9 +20,13 @@ fun singleplayer() {
} }
fun multiplayer() { fun multiplayer() {
var again = true; var again = true
var playerOneCounter = 0 var playerOneCounter = 0
var playerTwoCounter = 0 var playerTwoCounter = 0
var playerOneInput: String?
var playerOneInput1: String?
var playerTwoInput: String?
var playerTwoInput1: String?
var playerOneField1 = Point(-1,-1) var playerOneField1 = Point(-1,-1)
var playerOneField2 = Point(-1,-1) var playerOneField2 = Point(-1,-1)
var playerOneField3 = Point(-1,-1) var playerOneField3 = Point(-1,-1)
@ -37,16 +41,16 @@ fun multiplayer() {
while(again){ while(again){
gameField(playerOneField1, playerOneField2, playerOneField3, playerOneField4, playerOneField5, playerTwoField1, playerTwoField2, playerTwoField3, playerTwoField4, playerTwoField5) gameField(playerOneField1, playerOneField2, playerOneField3, playerOneField4, playerOneField5, playerTwoField1, playerTwoField2, playerTwoField3, playerTwoField4, playerTwoField5)
println("Player 1: Choose your field:\nx: ") println("Player 1: Choose your field:\nx: ")
var playerOneInput = readLine() playerOneInput = readlnOrNull()
println("y: ") println("y: ")
var playerOneInput2 = readLine() playerOneInput1 = readlnOrNull()
if(playerOneInput != null && playerOneInput2 != null) { if(playerOneInput != null && playerOneInput1 != null) {
when(playerOneCounter){ when(playerOneCounter){
0 -> playerOneField1 = Point(playerOneInput.toInt(),playerOneInput2.toInt()) 0 -> playerOneField1 = Point(playerOneInput.toInt(),playerOneInput1.toInt())
1 -> playerOneField2 = Point(playerOneInput.toInt(),playerOneInput2.toInt()) 1 -> playerOneField2 = Point(playerOneInput.toInt(),playerOneInput1.toInt())
2 -> playerOneField3 = Point(playerOneInput.toInt(),playerOneInput2.toInt()) 2 -> playerOneField3 = Point(playerOneInput.toInt(),playerOneInput1.toInt())
3 -> playerOneField4 = Point(playerOneInput.toInt(),playerOneInput2.toInt()) 3 -> playerOneField4 = Point(playerOneInput.toInt(),playerOneInput1.toInt())
4 -> playerOneField5 = Point(playerOneInput.toInt(),playerOneInput2.toInt()) 4 -> playerOneField5 = Point(playerOneInput.toInt(),playerOneInput1.toInt())
else -> { else -> {
print("ERR: To many moves.") print("ERR: To many moves.")
} }
@ -57,16 +61,16 @@ fun multiplayer() {
gameField(playerOneField1, playerOneField2, playerOneField3, playerOneField4, playerOneField5, playerTwoField1, playerTwoField2, playerTwoField3, playerTwoField4, playerTwoField5) gameField(playerOneField1, playerOneField2, playerOneField3, playerOneField4, playerOneField5, playerTwoField1, playerTwoField2, playerTwoField3, playerTwoField4, playerTwoField5)
println("Player 2! Choose your field:\nx: ") println("Player 2! Choose your field:\nx: ")
var playerTwoInput = readLine() playerTwoInput = readlnOrNull()
println("y: ") println("y: ")
var playerTwoInput2 = readLine() playerTwoInput1 = readlnOrNull()
if(playerTwoInput != null && playerTwoInput2 != null) { if(playerTwoInput != null && playerTwoInput1 != null) {
when(playerOneCounter){ when(playerOneCounter){
0 -> playerTwoField1 = Point(playerTwoInput.toInt(),playerTwoInput2.toInt()) 0 -> playerTwoField1 = Point(playerTwoInput.toInt(),playerTwoInput1.toInt())
1 -> playerTwoField2 = Point(playerTwoInput.toInt(),playerTwoInput2.toInt()) 1 -> playerTwoField2 = Point(playerTwoInput.toInt(),playerTwoInput1.toInt())
2 -> playerTwoField3 = Point(playerTwoInput.toInt(),playerTwoInput2.toInt()) 2 -> playerTwoField3 = Point(playerTwoInput.toInt(),playerTwoInput1.toInt())
3 -> playerTwoField4 = Point(playerTwoInput.toInt(),playerTwoInput2.toInt()) 3 -> playerTwoField4 = Point(playerTwoInput.toInt(),playerTwoInput1.toInt())
4 -> playerTwoField5 = Point(playerTwoInput.toInt(),playerTwoInput2.toInt()) 4 -> playerTwoField5 = Point(playerTwoInput.toInt(),playerTwoInput1.toInt())
else -> { else -> {
print("ERR: To many moves.") print("ERR: To many moves.")
} }