Issue scalatron#52: Welcome op now provides "maxslaves" parameter (maximum allowed mini-bots) and React op provides "slaves" parameter (a count of mini-bots on issue).

Author: arbfranklin

BotWar/src/scalatron/botwar/AugmentedDynamics.scala

@@ -138,8 +138,8 @@ case object AugmentedDynamics extends ((State,Random,Iterable[(Entity.Id,Iterabl
                             val maxSlaveCount = state.config.boardParams.maxSlaveCount
                             if(maxSlaveCount < Int.MaxValue) {
                                 val siblings = board.siblingsOfBot(thisBot)
-                                val siblingCount = siblings.size
-                                if(siblingCount > maxSlaveCount + 1) {
+                                val slaveCount = siblings.size - 1
+                                if (slaveCount >= maxSlaveCount) {
                                     throw new IllegalStateException("Spawn(): maximum permissible number of mini-bots has been reached: " + maxSlaveCount )
                                 }
                             }

BotWar/src/scalatron/botwar/Board.scala

@@ -163,6 +163,7 @@ object Board
     )
     = {
         val boardSize = boardParams.size
+        val maxSlaves = boardParams.maxSlaveCount
 
         var updatedBoard = Empty
         val rnd = new Random(randomSeed)
@@ -180,6 +181,7 @@ object Board
                         "name=" + entityController.name + "," +
                         "apocalypse=" + stepsPerRound + "," +
                         "round=" + roundIndex +
+                        (if (maxSlaves < Int.MaxValue) ",maxslaves=" + maxSlaves else "") +
                         ")")
             } catch {
                 case t: Throwable =>

BotWar/src/scalatron/botwar/Entity.scala

@@ -173,13 +173,16 @@ object Bot {
                         Protocol.PropertyName.Time + "=" + state.time + "," +
                         Protocol.PropertyName.View + "=" + renderedView + "," +
                         maybeMasterParameter +
-                        Protocol.PropertyName.Energy + "=" + bot.energy +
+                        Protocol.PropertyName.Energy + "=" + bot.energy + "," +
+                        Protocol.PropertyName.Slaves + "=" + slaveCount(bot, state) +
                         (if(stateMapString.isEmpty) "" else "," + stateMapString) +
                         ")"
 
                 controlFunctionInput
             }
 
+            def slaveCount(bot: Bot, state: State): Int = state.board.siblingsOfBot(bot).size - 1
+
             val controlFunctionInput =
                 if(isMaster) computeBotInputForMaster(bot, state)
                 else computeBotInputForSlave(bot, state)

BotWar/src/scalatron/botwar/Protocol.scala

@@ -47,10 +47,11 @@ object Protocol {
         val Collision = "collision"
         val Generation = "generation"
         val Name = "name"
+        val Slaves = "slaves"
 
         val ListOfReserved =
             List(
-                Energy, Time, View, Generation, Name,
+                Energy, Time, View, Generation, Name, Slaves,
                 PluginOpcode.ParameterName.Direction,
                 ServerOpcode.ParameterName.Master
             )