diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index e264363..9bb0b93 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -178,6 +178,7 @@ namespace Server.Models
ServerCommunication.INSTANCE.JoinLobby(this.User,id);
sendMessage(JSONConvert.ConstructLobbyJoinSuccessMessage());
ServerCommunication.INSTANCE.sendToAll(JSONConvert.ConstructLobbyListMessage(ServerCommunication.INSTANCE.lobbies.ToArray()));
+ Debug.WriteLine("Random chosen word: {0}", JSONConvert.GetRandomWord(@"..\resources\WordsForGame.json"));
break;
case LobbyIdentifier.LEAVE:
id = JSONConvert.GetLobbyID(payload);
diff --git a/Server/Server.csproj b/Server/Server.csproj
index 65a6e4e..d65a717 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -6,6 +6,16 @@
true
+
+
+
+
+
+
+ PreserveNewest
+
+
+
diff --git a/Server/resources/WordsForGame.json b/Server/resources/WordsForGame.json
new file mode 100644
index 0000000..71676ba
--- /dev/null
+++ b/Server/resources/WordsForGame.json
@@ -0,0 +1,31 @@
+{
+ "filename": "wordsForGame",
+ "words": [
+ "teacher",
+ "love",
+ "engineer",
+ "supermarket",
+ "disaster",
+ "studio",
+ "restaurant",
+ "music",
+ "chocolate",
+ "dirt",
+ "thought",
+ "virus",
+ "lieutenant",
+ "painter",
+ "kiwi",
+ "power ranger",
+ "computer",
+ "people",
+ "candidate",
+ "security guard",
+ "Canada",
+ "teeth",
+ "army",
+ "airport",
+ "president",
+ "bedroom"
+ ]
+}
\ No newline at end of file
diff --git a/SharedClientServer/JSONConvert.cs b/SharedClientServer/JSONConvert.cs
index 9c96f2d..9f13def 100644
--- a/SharedClientServer/JSONConvert.cs
+++ b/SharedClientServer/JSONConvert.cs
@@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using System.IO;
using System.Linq;
using System.Text;
@@ -159,7 +160,22 @@ namespace SharedClientServer
Array.Copy(BitConverter.GetBytes(payloadBytes.Length+5),0,res,0,4);
return res;
}
+
+ public static string GetRandomWord(string filename)
+ {
+ string[] words = new string[25];
+ using(StreamReader reader = new StreamReader(@"../../json1.jsonWordsForGame.json"))
+ {
+ string json = reader.ReadToEnd();
+ words = JsonConvert.DeserializeObject>(json).ToArray();
+ }
+ Random random = new Random();
+
+ int index = random.Next(0, 24);
+
+ return words[index];
+ }
}
}