Move part of game code to Game namespace

spec/queue_spec.cr

@@ -4,7 +4,7 @@ require "./../src/game/command"
 
 macro define_dummy_classes(count)
   {% for i in (1...count) %}
-    class Test::DummyCommand{{ i }} < Command
+    class Test::DummyCommand{{ i }} < Game::Command
       def start(world) : Int32
       end
 

spec/world_spec.cr

@@ -3,18 +3,18 @@ require "../src/game/world"
 
 describe "World" do
   it "should build crystal harvester" do
-    world = World.new
+    world = Game::World.new
     point = Point.new(2, 3)
-    cmd = BuildCrystalHarvesterCommand.new(point)
+    cmd = Game::BuildCrystalHarvesterCommand.new(point)
     world.push(cmd)
     world.run(100)
     world.map.get(point).has_role(TileRole::CrystalHarvester)
   end
 
   it "should fail when not enought resources" do
-    world = World.new
+    world = Game::World.new
     point = Point.new(2, 3)
-    cmd = BuildCrystalRestorerCommand.new(point)
+    cmd = Game::BuildCrystalRestorerCommand.new(point)
     expect_raises(NotEnoughtResources) do
       world.push(cmd)
     end

src/expansion.cr

@@ -5,7 +5,7 @@ require "./game/resources"
 require "./game/world"
 require "./cli/command_router"
 
-world = World.new
+world = Game::World.new
 
 router = CLI::CommandRouter.new
 
@@ -29,20 +29,20 @@ end
 router.add "harv {x} {y}" do |p|
   x = p["x"].to_i32
   y = p["y"].to_i32
-  world.push(BuildCrystalHarvesterCommand.new(Point.new(x, y)))
+  world.push(Game::BuildCrystalHarvesterCommand.new(Point.new(x, y)))
   printf "Build harvester at %d %d\n", x, y
 end
 
 router.add "rest {x} {y}" do |p|
   x = p["x"].to_i32
   y = p["y"].to_i32
-  world.push(BuildCrystalRestorerCommand.new(Point.new(x, y)))
+  world.push(Game::BuildCrystalRestorerCommand.new(Point.new(x, y)))
 end
 
 router.add "terr {x} {y}" do |p|
   x = p["x"].to_i32
   y = p["y"].to_i32
-  world.push(BuildTerraformerCommand.new(Point.new(x, y)))
+  world.push(Game::BuildTerraformerCommand.new(Point.new(x, y)))
 end
 
 def normalize_command(cmd)

src/game/command.cr

@@ -1,11 +1,12 @@
 require "./tile"
 
-abstract class Command
+module Game
+  abstract class Command
     abstract def start(world : World) : Int32
     abstract def finish(world : World)
-end
+  end
 
-class BuildCrystalHarvesterCommand < Command
+  class BuildCrystalHarvesterCommand < Command
     BUILD_TIME = 30
 
     def initialize(@point : Point)
@@ -19,9 +20,9 @@ class BuildCrystalHarvesterCommand < Command
       world.map.set(CrystalHarvesterTile.new(@point))
       world.push(HarvestCrystalCommand.new(@point))
     end
-end
+  end
 
-class HarvestCrystalCommand < Command
+  class HarvestCrystalCommand < Command
     HARVEST_VALUE = 80
     HARVEST_TIME  = 10
     REST_TIME     =  5
@@ -59,9 +60,9 @@ class HarvestCrystalCommand < Command
         tile.has_role(TileRole::Warehouse)
       end
     end
-end
+  end
 
-class BuildCrystalRestorerCommand < Command
+  class BuildCrystalRestorerCommand < Command
     CRYSTALS_COST = 100
     BUILD_TIME    =  50
 
@@ -77,9 +78,9 @@ class BuildCrystalRestorerCommand < Command
       world.map.set(CrystalRestorerTile.new(@point))
       world.push(RestoreCrystalCommand.new(@point))
     end
-end
+  end
 
-class RestoreCrystalCommand < Command
+  class RestoreCrystalCommand < Command
     RESTORE_TIME  = 15
     RESTORE_VALUE = 30
     REST_TIME     =  5
@@ -111,9 +112,9 @@ class RestoreCrystalCommand < Command
         tile.has_role(TileRole::CrystalDeposits) && tile.cur < tile.cap
       end
     end
-end
+  end
 
-class BuildTerraformerCommand < Command
+  class BuildTerraformerCommand < Command
     CRYSTALS_COST = 100
     BUILD_TIME    = 120
 
@@ -129,9 +130,9 @@ class BuildTerraformerCommand < Command
       world.map.set(TerraformerTile.new(@point))
       world.push(TerraformCommand.new(@point))
     end
-end
+  end
 
-class TerraformCommand < Command
+  class TerraformCommand < Command
     PRODUCTION_TIME  = 60
     PRODUCTION_VALUE =  5
 
@@ -146,4 +147,5 @@ class TerraformCommand < Command
       world.resources.inc(ResourceType::Terraformation, PRODUCTION_VALUE)
       world.push(TerraformCommand.new(@point))
     end
+  end
 end

src/game/queue.cr

@@ -1,6 +1,6 @@
 class App::Queue
   struct Item
-    def initialize(@ts : Int32, @command : Command)
+    def initialize(@ts : Int32, @command : Game::Command)
     end
 
     getter ts
@@ -11,7 +11,7 @@ class App::Queue
     @data = [] of Item
   end
 
-  def push(ts : Int32, value : Command)
+  def push(ts : Int32, value : Game::Command)
     # very unoptimal algo
     @data.push(Item.new(ts, value))
     @data.sort! do |a, b|

src/game/world.cr

@@ -1,10 +1,9 @@
 require "./resources"
 
-class World
+class Game::World
   property ts : Int32
 
-  def initialize
+  def initialize(@ts = 0)
-    @ts = 0
     @map = Map.new
     @resources = Resources.new
     @tasks = App::Queue.new