Name param duplication problem solved differently - the name must be stored on the object for identification of a player's entities to work

Author: scalatron

Scalatron/src/scalatron/botwar/Board.scala

@@ -76,8 +76,8 @@ case class Board(
     def addBotThatIsMaster(pos: XY, creationTime: Time, controlFunction: (String => String), plugin: Plugin) : Board =
         copy(nextId = nextId + 1, bots = bots.updated(nextId,
             Bot(nextId, pos, XY.One, creationTime, Time.SomtimeInThePast, Constants.Energy.Initial,
-                Bot.Player(controlFunction, plugin, Bot.MasterGeneration, nextId, (0,2), 0L, "", Iterable.empty, Map())
-            )))
+                Bot.Player(controlFunction, plugin, Bot.MasterGeneration, nextId, (0,2), 0L, "", Iterable.empty, Map(Protocol.PropertyName.Name -> plugin.name))
+        )))
 
     def sprinkle(count: Int, rnd: Random, creationTime: Time, boardSize: XY, variety: Bot.Variety) =
         (this /: (0 until count))((sum,n) => sum.addBot(sum.emptyRandomPos(rnd, boardSize), XY.One, creationTime, variety))

Scalatron/src/scalatron/botwar/Entity.scala

@@ -156,7 +156,6 @@ object Bot {
                 val controlFunctionInput =
                     Protocol.ServerOpcode.React + "(" +
                         Protocol.PropertyName.Generation + "=" + generation + "," + "" +
-                        Protocol.PropertyName.Name + "=" + name + "," + "" +
                         Protocol.PropertyName.Time + "=" + state.time + "," +
                         Protocol.PropertyName.View + "=" + renderedView + "," +
                         maybeMasterParameter +