Compare commits

...

13 Commits

Author SHA1 Message Date
Asecave
fc8d803d32 Update wordle.db 2022-03-26 00:38:09 +01:00
Asecave
68549bbc8b IT'S DONE! I think... 2022-03-25 20:45:13 +01:00
Asecave
92d4f15e75 fixed wrong game start message 2022-03-25 20:44:28 +01:00
Asecave
a78fac1baf added info <n> 2022-03-25 20:43:58 +01:00
Asecave
84a81bf2b4 info und saveGame funkt 2022-03-25 20:19:29 +01:00
Asecave
37736dbfad wotd finished requirement to play 2022-03-25 16:27:54 +01:00
Asecave
09ea7ea01e Spielstand wird gespeichert (und gelesen) 2022-03-25 15:42:22 +01:00
Tim Tersch
4d01389e2e working stats 2022-03-24 11:30:17 +01:00
Tim Tersch
f212bed8de fixed sql requests in user and replaced requests 2022-03-24 10:51:19 +01:00
Tim Tersch
93a419f10c removed unused DatabaseConnector 2022-03-24 10:18:31 +01:00
Asecave
e64344b5a2 wordle richtigkeits check 2022-03-23 20:08:09 +01:00
Alperen
1204f952c6 finished END_PHASE 2022-03-20 20:57:11 +01:00
Tim Tersch
bf90f74b03 asdasd 2022-03-17 11:37:10 +01:00
5 changed files with 452 additions and 250 deletions

View File

@@ -37,6 +37,8 @@ public class Game {
this.ip = pClientIP; this.ip = pClientIP;
this.port = pClientPort; this.port = pClientPort;
words = new String[5];
send("+OK Hello there"); send("+OK Hello there");
} }
@@ -45,9 +47,11 @@ public class Game {
msg = msg.toLowerCase().trim(); msg = msg.toLowerCase().trim();
if (msg.equals("quit")) { if (msg.equals("quit")) {
if (user != null) {
saveGame();
}
send("+OK bye"); send("+OK bye");
wordleServer.closeConnection(ip, port); wordleServer.closeConnection(ip, port);
System.exit(0); // TODO remove: Einfacher zum testen
} }
switch (phase) { switch (phase) {
@@ -91,7 +95,8 @@ public class Game {
String args = msg.substring(5); String args = msg.substring(5);
int pw = args.hashCode(); int pw = args.hashCode();
databaseConnector.executeStatement("SELECT * FROM User WHERE password = '" + pw + "' AND name = '" + tempLoginName + "'"); databaseConnector.executeStatement(
"SELECT * FROM User WHERE password = '" + pw + "' AND name = '" + tempLoginName + "'");
QueryResult result = databaseConnector.getCurrentQueryResult(); QueryResult result = databaseConnector.getCurrentQueryResult();
if (result != null && result.getData().length > 0) { if (result != null && result.getData().length > 0) {
user = new User(tempLoginName); user = new User(tempLoginName);
@@ -104,11 +109,15 @@ public class Game {
databaseConnector.executeStatement("SELECT word FROM words WHERE id = " + getWOTDIndex()); databaseConnector.executeStatement("SELECT word FROM words WHERE id = " + getWOTDIndex());
QueryResult result = databaseConnector.getCurrentQueryResult(); QueryResult result = databaseConnector.getCurrentQueryResult();
if (result != null && result.getData().length > 0) { if (result != null && result.getData().length > 0) {
wordle = result.getData()[0][0]; wordle = result.getData()[0][0].toLowerCase();
phase = GAME_PHASE; phase = GAME_PHASE;
send("+OK game ready"); if (user != null) {
loadGame();
} else { } else {
send("-ERR Fatal error: WOTD could not be generated."); send("+OK game ready");
}
} else {
send("-ERR fatal error: WOTD could not be generated.");
} }
} else if (msg.startsWith("play")) { } else if (msg.startsWith("play")) {
@@ -116,7 +125,16 @@ public class Game {
if (user == null) { if (user == null) {
send("-ERR not logged in."); send("-ERR not logged in.");
} else { } else {
databaseConnector
.executeStatement("SELECT lastFinishedWotdDay FROM User WHERE name = '" + user.getName() + "'");
QueryResult result = databaseConnector.getCurrentQueryResult();
if (result != null && result.getData().length > 0) {
if (result.getData()[0][0] != null && Integer.parseInt(result.getData()[0][0]) == currentDay()) {
playRandomWordle();
} else {
send("-ERR WOTD not finished.");
}
}
} }
} else { } else {
sendUniversalError(); sendUniversalError();
@@ -124,56 +142,274 @@ public class Game {
} }
private void gamePhase(String msg) { private void gamePhase(String msg) {
if (msg.startsWith("send")) {
if (msg.startsWith("send ")) {
String args = msg.substring(5); String args = msg.substring(5);
//vergleichen von wotd mit
//ja = spiel beendet und ausgabe word 11111 if (args.length() == 5) {
//nein = ausgabe 01102 oder so und pr<70>fen ob man noch ein wort eingebn kann
// ja game continues nein = game lost databaseConnector.executeStatement("SELECT word FROM words WHERE word LIKE '" + args + "'");
QueryResult result = databaseConnector.getCurrentQueryResult();
if (result.getData().length > 0) {
String input = result.getData()[0][0].toLowerCase();
String code = generateCode(input);
send("+OK " + code);
if (code.equals("22222")) { // und ein wordle ist 5 Buchstaben lang :D
send("game won");
wordle = null;
if (user != null) {
setLastPlayedTimestamp();
user.increaseCurrentStreak();
if (user.getMaxStreak() < user.getCurrentStreak()) {
user.setMaxStreak(user.getCurrentStreak());
}
user.increaseWonInTurn(count + 1);
updateStats();
phase = END_PHASE;
} else {
phase = LOGIN_PHASE;
}
count = 0;
clearWords();
} else if (count == 5) {
send("game lost");
wordle = null;
if (user != null) {
setLastPlayedTimestamp();
user.setCurrentStreak(0);
updateStats();
phase = END_PHASE;
} else {
phase = LOGIN_PHASE;
}
count = 0;
clearWords();
} else {
words[count] = input;
send("game continues");
count++;
}
} else {
send("-ERR word not in dictionary.");
}
} else {
send("-ERR wrong format.");
}
} else if (msg.startsWith("info")) { } else if (msg.startsWith("info")) {
if (msg.length() == 4) {
send("+OK");
for (int i = 0; i < words.length; i++) {
if (words[i] == null) {
break;
}
send(words[i] + " " + generateCode(words[i]));
}
send(".");
} else if (msg.length() == 6) {
String rawLine = msg.substring(5);
int line = -1;
try {
line = Integer.parseInt(rawLine) - 1;
} catch (NumberFormatException e) {
send("-ERR wrong argument.");
}
if (line >= 0 && line < 5) {
if (words[line] != null) {
send("+OK " + words[line] + " " + generateCode(words[line]));
} else {
send("-ERR game hasn't progressed to this line yet.");
}
} else {
send("-ERR couldn't parse line.");
}
} else {
sendUniversalError();
}
} else if (msg.startsWith("exit")) { } else if (msg.startsWith("exit")) {
if (user != null) {
saveGame();
phase = END_PHASE;
send("+OK");
} else {
send("-ERR not logged in.");
}
} else {
sendUniversalError();
} }
} }
private void endPhase(String msg) { private void endPhase(String msg) {
if (msg.startsWith("stat")) { if (msg.startsWith("stat")) {
send("+OK");
send("times Played: " + user.getTimesPlayed());
send("win Percentage: " + (int) user.getWinPercentage() + "%");
send("current Streak: " + user.getCurrentStreak());
send("max Streak: " + user.getMaxStreak());
for (int i = 1; i <= 6; i++) {
send("won in Turn" + i + ": " + user.getWonInTurn(i));
}
send(".");
} else if (msg.startsWith("play")) { } else if (msg.startsWith("play")) {
if (wordle == null) {
playRandomWordle();
} else {
loadGame();
phase = GAME_PHASE;
}
} else {
sendUniversalError();
}
}
private void saveGame() {
databaseConnector.executeStatement("SELECT * FROM Spielstand WHERE Username LIKE '" + user.getName() + "'");
QueryResult result = databaseConnector.getCurrentQueryResult();
if (result == null || result.getData().length == 0) {
databaseConnector.executeStatement("INSERT INTO Spielstand (Username) VALUES('" + user.getName() + "')");
}
for (int i = 0; i < words.length; i++) {
databaseConnector.executeStatement("UPDATE Spielstand SET word" + (i + 1) + " = '" + words[i]
+ "' WHERE Username LIKE '" + user.getName() + "'");
}
}
private void loadGame() {
databaseConnector.executeStatement("SELECT * FROM Spielstand WHERE Username = '" + user.getName() + "'");
QueryResult result = databaseConnector.getCurrentQueryResult();
if (result != null && result.getData().length > 0 && !result.getData()[0][0].equals("null")) {
boolean foundEnd = false;
for (int i = 0; i < 5; i++) {
if (!result.getData()[0][i].equals("null")) {
words[i] = result.getData()[0][i];
} else if (!foundEnd) {
count = i;
foundEnd = true;
}
}
send("+OK game running");
} else {
send("+OK game ready");
}
}
private void setLastPlayedTimestamp() {
databaseConnector.executeStatement(
"UPDATE User SET lastFinishedWotdDay = " + currentDay() + " WHERE name LIKE '" + user.getName() + "'");
}
private void clearWords() {
for (int i = 0; i < words.length; i++) {
words[i] = null;
}
}
private String generateCode(String input) {
String code = "";
outer: for (int i = 0; i < input.length(); i++) {
char c = input.charAt(i);
if (c == wordle.charAt(i)) {
code += "2";
} else {
for (int j = 0; j < wordle.length(); j++) {
if (c == wordle.charAt(j)) {
code += "1";
continue outer;
}
}
code += "0";
}
}
return code;
}
private void updateStats() {
user.increaseTimesPlayed();
int totalWins = 0;
for (int i = 1; i <= 6; i++) {
totalWins += user.getWonInTurn(i);
}
float winP = (float) totalWins / user.getTimesPlayed();
user.setWinPercentage(Math.round(winP * 100));
}
private void playRandomWordle() {
databaseConnector.executeStatement("SELECT word FROM words WHERE id = " + (int) (Math.random() * 950));
QueryResult result = databaseConnector.getCurrentQueryResult();
if (result != null && result.getData().length > 0) {
wordle = result.getData()[0][0].toLowerCase();
phase = GAME_PHASE;
send("+OK game ready");
} else {
send("-ERR fatal error: Wordle could not be generated.");
} }
} }
private void send(String msg) { private void send(String msg) {
wordleServer.send(ip, port, msg); wordleServer.send(ip, port, msg);
} }
private void sendUniversalError() { private void sendUniversalError() {
send("-ERR command not valid in this state"); send("-ERR command not valid in this state");
} }
private int getWOTDIndex() { private int getWOTDIndex() {
long days = ChronoUnit.DAYS.between(LocalDate.ofEpochDay(0), LocalDate.now());
int days = currentDay();
int hash = ("" + days).hashCode(); int hash = ("" + days).hashCode();
return hash % 949 + 1; return hash % 949 + 1;
} }
private int currentDay() {
return (int) ChronoUnit.DAYS.between(LocalDate.ofEpochDay(0), LocalDate.now());
}
public String getIp() { public String getIp() {
return ip; return ip;
} }
public void setIp(String ip) { public void setIp(String ip) {
this.ip = ip; this.ip = ip;
} }
public int getPort() { public int getPort() {
return port; return port;
} }
public void setPort(int port) { public void setPort(int port) {
this.port = port; this.port = port;
} }
} }

View File

@@ -5,150 +5,133 @@ public class User {
/** /**
* Konstruktor für Objekte der Klasse User * Konstruktor für Objekte der Klasse User
*/ */
public User(String name) public User(String name) {
{ this.name = name;
setName(name);
} }
public void setPassword(String password) {
Game.databaseConnector
public void setPassword(String password) .executeStatement("UPDATE User SET password = " + password + " Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("UPDATE User SET password = " + password + " Where name = " + this.name);
} }
public String getPassword() {
public String getPassword() Game.databaseConnector.executeStatement("SELECT password FROM User Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("SELECT password FROM User Where name =" + this.name);
String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0]; String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
return result; return result;
} }
public void setName(String name) {
Game.databaseConnector
public void setName(String name) .executeStatement("UPDATE User SET name = " + name + " Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("UPDATE User SET name = " + name + " Where name = " + this.name);
} }
public String getName() {
public String getName()
{
return name; return name;
} }
public void setWinPercentage(float winPercentage) {
Game.databaseConnector.executeStatement(
public void setWinPercentage(float winPercentage) "UPDATE User SET winPercentage = " + winPercentage + " Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("UPDATE User SET winPercentage = " + winPercentage + " Where name = " + this.name);
} }
public float getWinPercentage() {
public float getWinPercentage() Game.databaseConnector.executeStatement("SELECT winPercentage FROM User Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("SELECT winPercentage FROM User Where name =" + this.name);
String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0]; String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
if (result == null) {
return 0f;
} else {
return Float.parseFloat(result); return Float.parseFloat(result);
} }
public void setTimesPlayed(int timesPlayed)
{
Game.databaseConnector.executeStatement("UPDATE User SET timesPlayed = " + timesPlayed + " Where name = " + this.name);
} }
public void setTimesPlayed(int timesPlayed) {
Game.databaseConnector.executeStatement(
"UPDATE User SET timesPlayed = " + timesPlayed + " Where name LIKE '" + this.name + "'");
}
public int getTimesPlayed() public int getTimesPlayed() {
{ Game.databaseConnector.executeStatement("SELECT timesPlayed FROM User Where name LIKE '" + this.name + "'");
Game.databaseConnector.executeStatement("SELECT timesPlayed FROM User Where name =" + this.name);
String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0]; String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
if (result == null) {
return 0;
} else {
return Integer.parseInt(result); return Integer.parseInt(result);
} }
}
public void increaseTimesPlayed() {
public void increaseTimesPlayed()
{
int temp = getTimesPlayed(); int temp = getTimesPlayed();
temp++; temp++;
setTimesPlayed(temp); setTimesPlayed(temp);
} }
public void setCurrentStreak(int currentStreak) {
Game.databaseConnector.executeStatement(
public void setCurrentStreak(int currentStreak) "UPDATE User SET currentStreak = " + currentStreak + " Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("UPDATE User SET currentStreak = " + currentStreak + " Where name = " + this.name);
} }
public int getCurrentStreak() {
public int getCurrentStreak() Game.databaseConnector.executeStatement("SELECT currentStreak FROM User Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("SELECT currentStreak FROM User Where name =" + this.name);
String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0]; String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
if (result == null) {
return 0;
} else {
return Integer.parseInt(result); return Integer.parseInt(result);
} }
}
public void increaseCurrentStreak() {
public void increaseCurrentStreak()
{
int temp = getCurrentStreak(); int temp = getCurrentStreak();
temp++; temp++;
setCurrentStreak(temp); setCurrentStreak(temp);
} }
public void setMaxStreak(int maxStreak) {
Game.databaseConnector
public void setMaxStreak(int maxStreak) .executeStatement("UPDATE User SET maxStreak = " + maxStreak + " Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("UPDATE User SET maxStreak = " + maxStreak + " Where name = " + this.name);
} }
public int getMaxStreak() {
public int getMaxStreak() Game.databaseConnector.executeStatement("SELECT maxStreak FROM User Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("SELECT maxStreak FROM User Where name =" + this.name);
String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0]; String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
if (result == null) {
return 0;
} else {
return Integer.parseInt(result); return Integer.parseInt(result);
} }
}
public void increaseMaxStreak() {
public void increaseMaxStreak()
{
int temp = getMaxStreak(); int temp = getMaxStreak();
temp++; temp++;
setMaxStreak(temp); setMaxStreak(temp);
} }
public void setWonInTurn(int row, int value) {
Game.databaseConnector.executeStatement(
public void setWonInTurn(int row, int value) "UPDATE User SET wonInTurn" + row + " = " + value + " Where name LIKE '" + this.name + "'");
{
Game.databaseConnector.executeStatement("UPDATE User SET wonInTurn" + row + " = " + value + " Where name = " + this.name);
} }
public int getWonInTurn(int row) {
public int getWonInTurn(int row) Game.databaseConnector
{ .executeStatement("SELECT wonInTurn" + row + " FROM User Where name LIKE '" + this.name + "'");
Game.databaseConnector.executeStatement("SELECT wonInTurn" + row + " FROM User Where name =" + this.name);
String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0]; String result = Game.databaseConnector.getCurrentQueryResult().getData()[0][0];
if (result == null) {
return 0;
} else {
return Integer.parseInt(result); return Integer.parseInt(result);
} }
}
public void increaseWonInTurn(int row) public void increaseWonInTurn(int row) {
{
int temp = getWonInTurn(row) + 1; int temp = getWonInTurn(row) + 1;
setWonInTurn(row, temp); setWonInTurn(row, temp);
} }
public int[] getWonInTurnFull() public int[] getWonInTurnFull() {
{ int[] result = { getWonInTurn(1), getWonInTurn(2), getWonInTurn(3), getWonInTurn(4), getWonInTurn(5),
int[] result = {getWonInTurn(1),getWonInTurn(2),getWonInTurn(3),getWonInTurn(4),getWonInTurn(5),getWonInTurn(6)}; getWonInTurn(6) };
return result; return result;
} }
} }

View File

@@ -11,10 +11,6 @@ public class WordleServer extends Server {
new WordleServer(); new WordleServer();
} }
private DatabaseConnector db;
public WordleServer() { public WordleServer() {
this(DEFAULT_PORT); this(DEFAULT_PORT);
} }
@@ -22,8 +18,6 @@ public class WordleServer extends Server {
public WordleServer( int pPort ) { public WordleServer( int pPort ) {
super(pPort); super(pPort);
db = new DatabaseConnector("", 0, "wordle.db", "", "");
games = new List<>(); games = new List<>();
} }

View File

@@ -5,6 +5,9 @@ dependency1.type=UsesDependency
dependency10.from=Game dependency10.from=Game
dependency10.to=DatabaseConnector dependency10.to=DatabaseConnector
dependency10.type=UsesDependency dependency10.type=UsesDependency
dependency11.from=Game
dependency11.to=QueryResult
dependency11.type=UsesDependency
dependency2.from=DatabaseConnector dependency2.from=DatabaseConnector
dependency2.to=Queue dependency2.to=Queue
dependency2.type=UsesDependency dependency2.type=UsesDependency
@@ -21,7 +24,7 @@ dependency6.from=WordleServer
dependency6.to=DatabaseConnector dependency6.to=DatabaseConnector
dependency6.type=UsesDependency dependency6.type=UsesDependency
dependency7.from=User dependency7.from=User
dependency7.to=DatabaseConnector dependency7.to=Game
dependency7.type=UsesDependency dependency7.type=UsesDependency
dependency8.from=Game dependency8.from=Game
dependency8.to=WordleServer dependency8.to=WordleServer
@@ -29,104 +32,90 @@ dependency8.type=UsesDependency
dependency9.from=Game dependency9.from=Game
dependency9.to=User dependency9.to=User
dependency9.type=UsesDependency dependency9.type=UsesDependency
editor.fx.0.height=1017 editor.fx.0.height=1056
editor.fx.0.width=854 editor.fx.0.width=1936
editor.fx.0.x=100 editor.fx.0.x=-8
editor.fx.0.y=100 editor.fx.0.y=-8
objectbench.height=153 objectbench.height=152
objectbench.width=1656 objectbench.width=1896
package.divider.horizontal=0.6 package.divider.horizontal=0.6
package.divider.vertical=0.8272138228941684 package.divider.vertical=0.8336820083682008
package.editor.height=759 package.editor.height=790
package.editor.width=1545 package.editor.width=1785
package.editor.x=0 package.editor.x=0
package.editor.y=0 package.editor.y=0
package.frame.height=1026 package.frame.height=1056
package.frame.width=1696 package.frame.width=1936
package.numDependencies=10 package.numDependencies=11
package.numTargets=11 package.numTargets=9
package.showExtends=true package.showExtends=true
package.showUses=true package.showUses=true
project.charset=windows-1252 project.charset=windows-1252
readme.height=60 readme.height=58
readme.name=@README readme.name=@README
readme.width=49 readme.width=47
readme.x=10 readme.x=10
readme.y=10 readme.y=10
target1.height=70 target1.height=70
target1.name=Letter target1.name=DatabaseConnector
target1.showInterface=false target1.showInterface=false
target1.type=ClassTarget target1.type=ClassTarget
target1.width=120 target1.width=150
target1.x=10 target1.x=220
target1.y=80 target1.y=80
target10.height=70 target2.height=60
target10.name=GUI target2.name=QueryResult
target10.showInterface=false
target10.type=ClassTarget
target10.width=120
target10.x=10
target10.y=270
target11.height=60
target11.name=Queue
target11.showInterface=false
target11.type=ClassTarget
target11.width=160
target11.x=100
target11.y=520
target2.height=70
target2.name=DatabaseConnector
target2.showInterface=false target2.showInterface=false
target2.type=ClassTarget target2.type=ClassTarget
target2.width=150 target2.width=100
target2.x=220 target2.x=100
target2.y=80 target2.y=600
target3.height=60 target3.height=100
target3.name=QueryResult target3.name=Game
target3.showInterface=false target3.showInterface=false
target3.type=ClassTarget target3.type=ClassTarget
target3.width=100 target3.width=180
target3.x=100 target3.x=680
target3.y=600 target3.y=320
target4.height=100 target4.height=70
target4.name=Game target4.name=User
target4.showInterface=false target4.showInterface=false
target4.type=ClassTarget target4.type=ClassTarget
target4.width=180 target4.width=130
target4.x=680 target4.x=930
target4.y=320 target4.y=180
target5.height=70 target5.height=70
target5.name=User target5.name=Server
target5.showInterface=false target5.showInterface=false
target5.type=ClassTarget target5.type=AbstractTarget
target5.width=130 target5.width=110
target5.x=930 target5.x=310
target5.y=180 target5.y=500
target6.height=70 target6.height=70
target6.name=Server target6.name=WordleServer
target6.showInterface=false target6.showInterface=false
target6.type=AbstractTarget target6.type=ClassTarget
target6.width=110 target6.width=110
target6.x=310 target6.x=480
target6.y=500 target6.y=500
target7.height=70 target7.height=70
target7.name=WordleServer target7.name=Guest
target7.showInterface=false target7.showInterface=false
target7.type=ClassTarget target7.type=ClassTarget
target7.width=110 target7.width=130
target7.x=480 target7.x=10
target7.y=500 target7.y=180
target8.height=70 target8.height=60
target8.name=Guest target8.name=List
target8.showInterface=false target8.showInterface=false
target8.type=ClassTarget target8.type=ClassTarget
target8.width=130 target8.width=150
target8.x=10 target8.x=560
target8.y=180 target8.y=640
target9.height=60 target9.height=60
target9.name=List target9.name=Queue
target9.showInterface=false target9.showInterface=false
target9.type=ClassTarget target9.type=ClassTarget
target9.width=150 target9.width=160
target9.x=560 target9.x=100
target9.y=640 target9.y=520

BIN
wordle.db

Binary file not shown.