changes

app/actors/LobbieActor.scala

@@ -261,9 +261,9 @@ case class ChangeIsNecronSelected(isSelected: Boolean)
 
 case object InfoQuery
 
-case class SelectedRaces(mainRaces: List[Int], additionalRaces: List[Int])
+case class SelectedRaces(mainRaces: List[Int], additionalRaces: List[Int], raceTextInput: String)
 
-case class UserInfo(name: String, isReady: Boolean, selectedRaces: Option[SelectedRaces] = None)
+case class UserInfo(name: String, isReady: Boolean, selectedRaces: Option[SelectedRaces] = None, selectedRacesText: Option[String] = None)
 
 case class LobbyInfo(user1Info: UserInfo,
                      user2Info: UserInfo,

app/actors/UserActor.scala

@@ -176,7 +176,8 @@ class UserActor(out: ActorRef,
           logger.info("RACES: " + json.toString())
           val races = (json \ "mainRaces").as[List[Int]]
           val additionalRaces = (json \ "additionalRaces").as[List[Int]]
-          lobbieActor.foreach(lobby => lobby ! SelectedRaces(races, additionalRaces))
+          val raceTextInput = (json \ "raceTextInput").as[String]
+          lobbieActor.foreach(lobby => lobby ! SelectedRaces(races, additionalRaces, raceTextInput))
 
         case Some("getLobbies") =>
           logger.debug("Get all lobby request")

app/assets/javascripts/index.js

@@ -4,6 +4,7 @@ var userName = ""
 
 var raceCount = $("#raceCount").html()
 var existAdditionalRaces = $("#existAdditionalRaces").html() === "true"
+var existTextFieldRaces = $("#existTextFieldRaces").html() === "true"
 
 var isMuted = false;
 var isDraftStarted = false;
@@ -227,6 +228,8 @@ function disconnectLobby(error) {
 
 function getRaceImageByNumber(number) {
     switch (number) {
+        case 10:
+            return "/assets/images/raceIcons/cancel.png";
         case 1:
             return "/assets/images/raceIcons/SM.gif";
         case 2:
@@ -248,28 +251,6 @@ function getRaceImageByNumber(number) {
     }
 }
 
-function getRaceVideoByNumber(number) {
-    switch (number) {
-        case 1:
-            return "/assets/video/races/SM.mp4";
-        case 2:
-            return "/assets/video/races/Chaos.mp4";
-        case 3:
-            return "/assets/video/races/Eldar.mp4";
-        case 4:
-            return "/assets/video/races/Orks.mp4";
-        case 5:
-            return "/assets/video/races/IG.mp4";
-        case 6:
-            return "/assets/video/races/Nec.mp4";
-        case 7:
-            return "/assets/video/races/Tau.mp4";
-        case 8:
-            return "/assets/video/races/Sob.mp4";
-        case 9:
-            return "/assets/video/races/SM.mp4";
-    }
-}
 
 function renderRaces() {
 
@@ -277,7 +258,7 @@ function renderRaces() {
         var resHtml = "";
         for(var raceNum = 1; raceNum <= raceCount; raceNum++){
             resHtml += "<div class='col-xs-4'><center><h3>" + raceType + " race " + raceNum + "</h3>";
-            for (var i = 1; i <= 9; i++) {
+            for (var i = 1; i <= 10; i++) {
                 var selected = "raceNotSelected";
                 if ($.cookie("race-" + raceType + "-" + raceNum) == i) {
                     selected = "raceSelected";
@@ -293,9 +274,21 @@ function renderRaces() {
         return resHtml;
     }
 
+    function renderInputField() {
+        var raceTextInput = ''
+        if($.cookie("raceTextInput") !== undefined){
+            raceTextInput = $.cookie("raceTextInput")
+        }
+        return '<center><input type="text" class="form-control" id="raceInput" placeholder="Black fists, Imperial angels, Blood templars" oninput="checkRaceSelectFinish()" value="'+ raceTextInput +'"/></center>';
+    }
+
     var resHtml = "";
-    resHtml += getRaceSelectHtml("main", selectedRaces);
-    if(existAdditionalRaces) resHtml += getRaceSelectHtml("additional", selectedAdditionalRaces);
+    if(!existTextFieldRaces){
+        resHtml += getRaceSelectHtml("main", selectedRaces);
+        if(existAdditionalRaces) resHtml += getRaceSelectHtml("additional", selectedAdditionalRaces);
+    }else {
+        resHtml += renderInputField();
+    }
     resHtml += "<div style='clear: both;'></div></br>";
 
     resHtml += "<center><button id = 'selectRace' class='btn btn-primary' disabled onclick='sendSelectedRacesToServer()'>OK</button></center>"
@@ -327,15 +320,23 @@ function selectRace(button, race, raceNum, raceType) {
 function checkRaceSelectFinish() {
     if(selectedRaces.filter(x => x).length >= raceCount){
         $("#selectRace").removeAttr("disabled");
+    } else if($("#raceInput").val().trim() !== ''){
+        $("#selectRace").removeAttr("disabled");
     }
 }
 
 function sendSelectedRacesToServer() {
+    $.cookie('raceTextInput', $("#raceInput").val(), {expires: 1});
+    var selectedInput = $("#raceInput").val();
+    if(selectedInput === undefined){
+        selectedInput = ""
+    }
     console.log(selectedRaces);
     ws.send(JSON.stringify({
         type: "selectRace",
         mainRaces: selectedRaces.filter(x => x),
-        additionalRaces: selectedAdditionalRaces.filter(x => x)
+        additionalRaces: selectedAdditionalRaces.filter(x => x),
+        raceTextInput: selectedInput
     }));
     $("#mapList").html("<center>Waiting another player...</center>");
 }
@@ -524,12 +525,13 @@ function getRenderRaces(userInfo1, userInfo2) {
 
     function getRacesBlock(playerRaces, name){
         let resHtml = "<div style='display: inline-block; border: black 1px solid; background-color: #e3e3e3;'>" + "<h4>" + name + "</h4>";
-        resHtml += "main:";
         playerRaces.mainRaces.forEach((raceId) =>
             resHtml += "<img class=\"raceIcon\" src=" + getRaceImageByNumber(raceId) + "> ");
-        resHtml += "<br/> addt:";
         playerRaces.additionalRaces.forEach((raceId) =>
             resHtml += "<img class=\"raceIcon\" src=" + getRaceImageByNumber(raceId) + "> ");
+        if(existTextFieldRaces){
+            resHtml += "<span style='margin: 10px;'>" + playerRaces.raceTextInput + "</span>";
+        }
         resHtml += "</div>";
         return resHtml;
     }

app/controllers/HomeController.scala

@@ -44,10 +44,11 @@ class HomeController @Inject()(cc: ControllerComponents) extends AbstractControl
     val deciderHumanName = config.getString(s"deciders.$deciderName.name")
     val deciderDescription = config.getString(s"deciders.$deciderName.rules")
     val existAdditionalRaces = Try(config.getBoolean(s"deciders.$deciderName.existAdditionalRaces")).getOrElse(false)
+    val existTextFieldRaces = Try(config.getBoolean(s"deciders.$deciderName.existTextFieldRaces")).getOrElse(false)
     val raceCount = Try(config.getInt(s"deciders.$deciderName.raceCount")).getOrElse(1)
     val lastmapsSettings = LastMapsSelectConfig(true, true, true, true)
     val raceSelect = RaceSelect(true, false)
-    Ok(views.html.index(deciderName, deciderHumanName, raceCount, deciderDescription, raceSelect, lastmapsSettings, existAdditionalRaces))
+    Ok(views.html.index(deciderName, deciderHumanName, raceCount, deciderDescription, raceSelect, lastmapsSettings, existAdditionalRaces, existTextFieldRaces))
   }
 
   /**

app/views/index.scala.html

@@ -1,9 +1,10 @@
-@(deciderName: String, deciderHumanName: String, raceCount: Int, rules: String, raceSelect: RaceSelect, boSettings: LastMapsSelectConfig, existAdditionalRaces: Boolean)(implicit r: Request[_])
+@(deciderName: String, deciderHumanName: String, raceCount: Int, rules: String, raceSelect: RaceSelect, boSettings: LastMapsSelectConfig, existAdditionalRaces: Boolean, existTextFieldRaces: Boolean)(implicit r: Request[_])
 <!DOCTYPE html>
 
 <span id="deciderName" style="display: none">@deciderName</span>
 <span id="raceCount" style="display: none">@raceCount</span>
 <span id="existAdditionalRaces" style="display: none">@existAdditionalRaces</span>
+<span id="existTextFieldRaces" style="display: none">@existTextFieldRaces</span>
 <span id="last1Presence" style="display: none">@boSettings.last1</span>
 <span id="last3Presence" style="display: none">@boSettings.last3</span>
 <span id="last5Presence" style="display: none">@boSettings.last5</span>
@@ -20,7 +21,7 @@
         <script type='text/javascript' src='@routes.Assets.at("lib/underscore/underscore.js")'></script>
         <script type='text/javascript' src='@routes.Assets.at("lib/backbonejs/backbone.js")'></script>
         <script type="text/javascript" src="@routes.Assets.at("lib/jquery-cookie/jquery.cookie.js")"></script>
-        <script type='text/javascript' src='@routes.Assets.at("javascripts/index.js?170823")'></script>
+        <script type='text/javascript' src='@routes.Assets.at("javascripts/index.js?14122025")'></script>
     </head>
     <body data-ws-url="@routes.HomeController.ws.webSocketURL()">
         <div class="navbar navbar-inverse navbar-fixed-top">