Preparing for pluggable games

Author: scalatron

Scalatron/src/scalatron/botwar/AugmentedDynamics.scala renamed to BotWar/src/scalatron/botwar/AugmentedDynamics.scala

@@ -5,7 +5,7 @@ package scalatron.botwar
 
 import scala.util.Random
 import scalatron.botwar.Decoration.{Bonus, Explosion, Text, Bonk, Annihilation}
-import scalatron.scalatron.impl.TournamentRoundResult
+import scalatron.game.TournamentRoundResult
 
 
 case object AugmentedDynamics extends ((State,Random,Iterable[(Entity.Id,Iterable[Command])]) => Either[State,TournamentRoundResult])

Scalatron/src/scalatron/botwar/Board.scala renamed to BotWar/src/scalatron/botwar/Board.scala

@@ -5,8 +5,8 @@ package scalatron.botwar
 
 import State.Time
 import scala.util.Random
-import scalatron.scalatron.impl.Plugin
 import BoardParams.Perimeter
+import scalatron.game.Plugin
 
 
 /** Contains the temporally variable aspects of the game state.

Scalatron/src/scalatron/botwar/BoardParams.scala renamed to BotWar/src/scalatron/botwar/BoardParams.scala

@@ -6,9 +6,8 @@ package scalatron.botwar
 import renderer.Renderer
 import scalatron.botwar.BotWarSimulation.SimState
 import java.awt.event.{WindowEvent, WindowAdapter, KeyEvent, KeyListener}
-import scalatron.scalatron.api.Scalatron
-import scalatron.scalatron.impl.{TournamentRoundResult, TournamentState, Plugin, PluginCollection, Game}
 import akka.actor.ActorSystem
+import scalatron.game._
 
 
 /** BotWar: an implementation of the Scalatron Game trait.
@@ -18,8 +17,8 @@ case object BotWar extends Game
     val name = Constants.GameName
 
     val pluginLoadSpec =
-        PluginCollection.LoadSpec(
-            Scalatron.Constants.JarFilename,          // "ScalatronBot.jar"
+        PluginLoadSpec(
+            "ScalatronBot.jar",         // TODO: was: Scalatron.Constants.JarFilename
             "scalatron.botwar.botPlugin",
             "ControlFunctionFactory")
 

Scalatron/src/scalatron/botwar/BotWar.scala renamed to BotWar/src/scalatron/botwar/BotWar.scala

@@ -4,8 +4,8 @@
 package scalatron.botwar
 
 import scala.util.Random
-import scalatron.scalatron.impl.{Plugin, TournamentRoundResult}
 import akka.actor.ActorSystem
+import scalatron.game.{Plugin, TournamentRoundResult}
 
 
 /** Implementations of generic Simulation traits for the BotWar game. */

Scalatron/src/scalatron/botwar/BotWarSimulation.scala renamed to BotWar/src/scalatron/botwar/BotWarSimulation.scala

@@ -3,7 +3,7 @@
   */
 package scalatron.botwar
 
-import scalatron.scalatron.impl.Plugin
+import scalatron.game.Plugin
 
 
 /** Configuration container for a specific game rounds. Incorporates the permanent configuration

Scalatron/src/scalatron/botwar/Command.scala renamed to BotWar/src/scalatron/botwar/Command.scala

@@ -6,7 +6,6 @@ package scalatron.botwar
 import java.awt.geom.AffineTransform
 import java.awt.{Toolkit, Frame, Graphics2D}
 import scalatron.botwar.Display.RenderTarget
-import scalatron.Version
 
 
 object Display {
@@ -39,7 +38,8 @@ object Display {
             case Some(s) => if(s.toLowerCase=="max") screenSize.getHeight.intValue else s.toInt
         }
 
-        val frame = createFrame(windowSizeX, windowSizeY, "Scalatron " + Constants.GameName + " " + Version.VersionString)
+        val versionString = "2.0.0.0" // TODO; was: Version.VersionString
+        val frame = createFrame(windowSizeX, windowSizeY, "Scalatron " + Constants.GameName + " " + versionString)
 
         Display(frame)
     }