Additional races

app/actors/LobbieActor.scala

@@ -48,7 +48,6 @@ class LobbieActor(hostUser: LobbyUser, deciderName: String) extends Actor with L
   private var secondPlayerSelectedRaces: Option[SelectedRaces] = None
 
 
-  private val isSolo: Boolean = Try(config.getBoolean(s"deciders.$deciderName.isSolo")).getOrElse(false)
   private val mapsLobby: Set[DeciderMap] = {
     val configMaps = config.getList(s"deciders.$deciderName.maps").asScala
     configMaps.map(e => {
@@ -66,7 +65,6 @@ class LobbieActor(hostUser: LobbyUser, deciderName: String) extends Actor with L
       status.toString(),
       playerTurn,
       lobbyType.toString(),
-      isSolo,
       mapsLobby)),
     this.self)
 
@@ -78,16 +76,6 @@ class LobbieActor(hostUser: LobbyUser, deciderName: String) extends Actor with L
       // notify watchers
       logger.info(s"Ban map $mapName by ${sender.path.name}")
 
-      if (isSolo) {
-        mapsLobby.find(p => p.map == mapName).foreach(m => m.isBanned = true)
-        if (isFinish) {
-          status = Finish()
-        } else {
-          status = Draft()
-        }
-        refreshAndBanMap(mapName)
-      }
-
       if (status == Draft()) {
         if ((playerTurn == 1 && sender == host.actorRef) ||
           (playerTurn == 2 && secondPlayer.exists(_.actorRef == sender))) {
@@ -227,7 +215,6 @@ class LobbieActor(hostUser: LobbyUser, deciderName: String) extends Actor with L
       status.toString(),
       playerTurn,
       lobbyType.toString(),
-      isSolo,
       mapsLobby)
   }
 
@@ -274,7 +261,7 @@ case class ChangeIsNecronSelected(isSelected: Boolean)
 
 case object InfoQuery
 
-case class SelectedRaces(firstRace: Int, secondRace: Int, thirdRace: Int, fourthRace: Int)
+case class SelectedRaces(mainRaces: List[Int], additionalRaces: List[Int])
 
 case class UserInfo(name: String, isReady: Boolean, selectedRaces: Option[SelectedRaces] = None)
 
@@ -285,7 +272,6 @@ case class LobbyInfo(user1Info: UserInfo,
                      status: String,
                      playerTurn: BigDecimal,
                      selectedType: String,
-                     isSolo: Boolean,
                      maps: Set[DeciderMap])
 
 class LobbyStatus

app/actors/UserActor.scala

@@ -173,11 +173,10 @@ class UserActor(out: ActorRef,
           lobbieActor.foreach(lobby => lobby ! BanMap(map))
 
         case Some("selectRace") =>
-          val firstRace = (json \ "raceFirst").as[Int]
-          val secondRace = (json \ "raceSecond").as[Int]
-          val thirdRace = (json \ "raceThird").as[Int]
-          val fourthRace = (json \ "raceFourth").as[Int]
-          lobbieActor.foreach(lobby => lobby ! SelectedRaces(firstRace, secondRace, thirdRace, fourthRace))
+          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))
 
         case Some("getLobbies") =>
           logger.debug("Get all lobby request")

app/assets/stylesheets/main.css

@@ -37,7 +37,7 @@
 }
 
 .raceIcon{
-  width: 90px;
+  width: 60px;
   border-radius: 5px;
   margin: 3px;
   border: 1px solid;

app/controllers/HomeController.scala

@@ -43,11 +43,11 @@ class HomeController @Inject()(cc: ControllerComponents) extends AbstractControl
     logger.info(s"Received request from: ${request.remoteAddress}")
     val deciderHumanName = config.getString(s"deciders.$deciderName.name")
     val deciderDescription = config.getString(s"deciders.$deciderName.rules")
-    val isSolo = Try(config.getBoolean(s"deciders.$deciderName.isSolo")).getOrElse(false)
+    val existAdditionalRaces = Try(config.getBoolean(s"deciders.$deciderName.existAdditionalRaces")).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, isSolo))
+    Ok(views.html.index(deciderName, deciderHumanName, raceCount, deciderDescription, raceSelect, lastmapsSettings, existAdditionalRaces))
   }
 
   /**

app/views/index.scala.html

@@ -1,14 +1,13 @@
-@(deciderName: String, deciderHumanName: String, raceCount: Int, rules: String, raceSelect: RaceSelect, boSettings: LastMapsSelectConfig, isSolo: Boolean)(implicit r: Request[_])
+@(deciderName: String, deciderHumanName: String, raceCount: Int, rules: String, raceSelect: RaceSelect, boSettings: LastMapsSelectConfig, existAdditionalRaces: 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="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>
 <span id="last7Presence" style="display: none">@boSettings.last7</span>
-<span id="isSolo" style="display: none">@isSolo</span>
-
 
 <html>
     <head>
@@ -21,7 +20,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?301222")'></script>
+        <script type='text/javascript' src='@routes.Assets.at("javascripts/index.js?050823")'></script>
     </head>
     <body data-ws-url="@routes.HomeController.ws.webSocketURL()">
         <div class="navbar navbar-inverse navbar-fixed-top">