Merge commit '003522e3183654146825436539c56f04d90c7332'

Author: scalatron

Scalatron/doc/markdown/Scalatron Protocol.md

@@ -489,6 +489,23 @@ Energy Cost/Permissions:
 
 
 
+### DrawLine(from=int:int,to=int:int,color=string)
+
+Draws a line. You can use this as a debugging tool.
+
+Parameters:
+
+* `from`      starting cell of the line to draw, e.g. '-2:4' (defaults to '0:0')
+* `to`        destination cell of the line to draw, e.g. '3:-2' (defaults to '0:0')
+* `color`     color to use for marking the cell (defaults to '#ff8888'), e.g. '#ffffff' for a white line
+
+Energy Cost/Permissions:
+
+* for master bot:   permitted, no energy consumed
+* for mini-bot:     permitted, no energy consumed
+
+
+
 ### Log(text=string)
 
 Shortcut for setting the state property `debug`, which by convention contains an optional

Scalatron/src/scalatron/botwar/AugmentedDynamics.scala

@@ -305,6 +305,10 @@ case object AugmentedDynamics extends ((State,Random,Iterable[(Entity.Id,Iterabl
                 case markedCell: Command.MarkCell =>           // "MarkCell(position=x:y,color=#ff0000)"
                     updatedBoard = updatedBoard.addDecoration(thisBotPos + markedCell.pos, time, Decoration.MarkedCell(markedCell.color))
 
+                case line: Command.DrawLine =>                 // "DrawLine(from=x1:y1,to=x2:y2,color=#cccccc)"
+                    updatedBoard = updatedBoard.addDecoration(
+                        thisBotPos + line.fromPos, time, Decoration.Line(thisBotPos + line.toPos, line.color))
+
                 case _ =>
                     // unknown command!
                     throw new IllegalStateException("unknown command: " + command)

Scalatron/src/scalatron/botwar/Command.scala

@@ -49,6 +49,13 @@ object Command
         def opcode = Protocol.PluginOpcode.MarkCell
         def paramMap = Map(Protocol.PluginOpcode.ParameterName.Position -> pos, Protocol.PluginOpcode.ParameterName.Color -> color)
     }
+    case class DrawLine(fromPos: XY, toPos: XY, color: String) extends Command {
+        def opcode = Protocol.PluginOpcode.DrawLine
+        def paramMap = Map(
+            Protocol.PluginOpcode.ParameterName.From -> fromPos, 
+            Protocol.PluginOpcode.ParameterName.To -> toPos, 
+            Protocol.PluginOpcode.ParameterName.Color -> color)
+    }
 
     def fromControlFunctionResponse(controlFunctionResponse: String): Iterable[Command] = {
         val commandMap = MultiCommandParser.splitStringIntoParsedCommandMap(controlFunctionResponse)
@@ -91,6 +98,12 @@ object Command
             MarkCell(
                 params.get(Protocol.PluginOpcode.ParameterName.Position).map(s => XY(s)).getOrElse( XY.Zero),
                 params.get(Protocol.PluginOpcode.ParameterName.Color).getOrElse("#8888ff")) // default to a light blue
+
+        case Protocol.PluginOpcode.DrawLine =>       // "DrawLine(from=x:y,to=x:y,color=#ffffff)"
+            DrawLine(
+                params.get(Protocol.PluginOpcode.ParameterName.From).map(s => XY(s)).getOrElse( XY.Zero),
+                params.get(Protocol.PluginOpcode.ParameterName.To).map(s => XY(s)).getOrElse( XY.Zero),
+                params.get(Protocol.PluginOpcode.ParameterName.Color).getOrElse("#cccccc")) // default to a light grey
 
         case _ =>
             throw new IllegalStateException("unknown opcode: '" + opcode + "'")

Scalatron/src/scalatron/botwar/Entity.scala

@@ -319,6 +319,7 @@ object Decoration {
     case object Annihilation extends Variety { def lifeTime = 40 }
     case class Text(text: String) extends Variety { def lifeTime = 40 }
     case class MarkedCell(color: String) extends Variety { def lifeTime = 40 }
+    case class Line(toPos: XY, color: String) extends Variety { def lifeTime = 40 }
 }
 
 

Scalatron/src/scalatron/botwar/Protocol.scala

@@ -24,12 +24,15 @@ object Protocol {
         val Explode = "Explode"
         val Log = "Log"
         val MarkCell = "MarkCell"
+        val DrawLine = "DrawLine"
 
         object ParameterName {
             val Direction = "direction"
             val Text = "text"
             val BlastRadius = "size"
             val Position = "position"
+            val From = "from"
+            val To = "to"
             val Color = "color"
         }
     }

Scalatron/src/scalatron/botwar/renderer/GameStateRenderer.scala

@@ -226,6 +226,12 @@ object GameStateRenderer {
                     val radius = ctx.pixelsPerCell / 2
                     ctx.fillOval(centerX - radius, centerY - radius, radius * 2, radius * 2)
 
+                case line: Decoration.Line =>
+                    val color = makeTransparent(Color.decode(line.color), alpha)
+                    ctx.setColor(color)
+                    val (toX, toY) = ctx.center(line.toPos)
+                    ctx.drawLine(centerX, centerY, toX, toY)
+                    
                 case _ => // OK
             }
         })