berlin-ai 0.0.12 → 0.0.13

data/berlin-ai.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     'lib/ai/game.rb',
     'lib/ai/map.rb',
     'lib/ai/node.rb',
+    'lib/ai/player.rb',
     'test/test_ai.rb']
   
   s.require_paths = ['lib', 'test']

data/lib/ai/game.rb

@@ -2,7 +2,7 @@ module Berlin
   module AI
     # Game keeps track of current games played by the server, indexing them on their uniq id.
     class Game
-      attr_reader :id, :map
+      attr_reader :id, :map, :moves, :player_id, :number_of_players, :time_limit_per_turn
       
       # Keep track of all current games
       @@games = {}
@@ -39,18 +39,26 @@ module Berlin
       
       def initialize id, map, infos
         @id  = id
+        
+        # Extract usefull informations
+        @player_id = infos['player_id']
+        @time_limit_per_turn = infos['time_limit_per_turn']
+        @number_of_players = infos['number_of_players']
+        
+        # Keep track of the player moves
+        @moves = []
+        
+        # Create the map
         @map = Berlin::AI::Map.new map, infos
       end
+      
+      def add_move from, to, number_of_soldiers        
+        @moves << {:from=>from.to_i, :to=>to.to_i, :number_of_soldiers=>number_of_soldiers.to_i}
+      end
 
       def update state
         @map.update state
       end
-      
-      # This method must be overritten with yours. The return value of this method will be returned
-      # in a json format to Berlin and be interpreted as the moves you'd like to do.
-      def turn_moves
-        raise "Please... overwrite me!"
-      end
     end
   end
 end

data/lib/ai/map.rb

@@ -4,8 +4,6 @@ module Berlin
     # nodes, points, soldiers, etc. Game will then be able to pick any information
     # it wants from map to decide what are the best moves to do.
     class Map
-      attr_reader :player_id
-
       def initialize map, infos
         @player_id  = infos['player_id']
         @nodes      = {}

data/lib/ai/node.rb

@@ -16,6 +16,11 @@ module Berlin
         @player_id          = 0
         @links              = []
       end
+      
+      # Somewhat useful
+      def to_i
+        @id.to_i
+      end
 
       # Registers a given node as an adjacent one.
       def link_to other_node
@@ -41,6 +46,11 @@ module Berlin
       def adjacent_nodes
         @links.dup
       end
+      
+      # Returns a list of all adjacent nodes, plus self
+      def adjacent_nodes_and_self
+        adjacent_nodes.push( self )
+      end
     end
   end
 end

data/lib/ai/player.rb

@@ -0,0 +1,9 @@
+module Berlin
+  module AI
+    class Player
+      def self.on_turn
+        raise "Overwrite me."
+      end
+    end
+  end
+end

data/lib/berlin-ai.rb

@@ -11,10 +11,11 @@ OptionParser.new do |opts|
   opts.on("-p N", "--port=N", Integer, "Set running port to N") do |p|
     set :port, p
   end
-
-  opts.on("--debug", "Run in debug mode (reloads code at each request)") do |p|
-    if p
-    require 'sinatra/reloader'
+  
+  opts.on("--debug", "Run in debug mode (reloads code at each request)") do |d|
+    if d
+      require 'sinatra/reloader'
+      
       configure do |c|
         c.also_reload $0
       end
@@ -32,7 +33,11 @@ post '/' do
       game = Berlin::AI::Game.create_or_update params[:action], params[:infos], params[:map], params[:state]
 
       if ['ping', 'turn'].include? params[:action]
-        return game.turn_moves.to_json
+        # Let the player decides his moves
+        Berlin::AI::Player.on_turn( game )
+        
+        # Return the response to Berlin
+        return game.moves.to_json
       end
     else
       p params.inspect

data/lib/version.rb

@@ -2,7 +2,7 @@ module Berlin
   module AI
     MAJOR = 0
     MINOR = 0
-    BUILD = 12
+    BUILD = 13
 
     VERSION = "#{MAJOR}.#{MINOR}.#{BUILD}"
   end

data/test/test_ai.rb

@@ -1,14 +1,10 @@
 require 'rubygems'
 require 'berlin-ai'
 
-class Berlin::AI::Game
-  def turn_moves
-    map.controlled_nodes.collect do |node|
-      {
-        :from => node.id,
-        :to => node.adjacent_nodes.sample.id,
-        :number_of_soldiers => rand(node.number_of_soldiers + 1)
-      }
-    end
+class Berlin::AI::Player
+  def self.on_turn( game )
+    
+    
+    game.add_move( 1, 2, 12 )
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: berlin-ai
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Christian Blais
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -04:00
+date: 2011-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - lib/ai/game.rb
 - lib/ai/map.rb
 - lib/ai/node.rb
+- lib/ai/player.rb
 - test/test_ai.rb
 has_rdoc: true
 homepage: http://github.com/christianblais/berlin-ai