berlin-ai 0.0.6 → 0.0.8

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
+      attr_reader :id, :map
       
       # Keep track of all current games
       @@games = {}
@@ -16,10 +16,15 @@ module Berlin
         map    = JSON.parse( map )
         state  = JSON.parse( state )
 
-        # Then, let's see if we can find that game. If not, register it.
+        # Game id
         game_id = infos['game_id']
-        @@games[game_id] ||= Berlin::AI::Game.new game_id, map, infos
-        game = @@games[game_id]
+        
+        # Then, let's see if we can find that game. If not, register it.
+        if action == "ping"
+          game = Berlin::AI::Game.new game_id, map, infos
+        else
+          game = (@@games[game_id] ||= Berlin::AI::Game.new( game_id, map, infos ))
+        end
 
         if action == "game_over"
           # Release the game to avoid memory leaks

data/lib/ai/map.rb

@@ -10,19 +10,25 @@ module Berlin
       def initialize map, infos
         @player_id  = infos['player_id']
         @nodes      = {}
+        @types      = {}
         @directed   = infos['directed'] || false
-
-        # Let's parse json['nodes'] and register all nodes we can find.
+        
+        # Node types
+        map['types'].each do |type|
+          @types[type['name']] = type
+        end
+        
+        # Let's parse map['nodes'] and register all nodes we can find.
         # We'll keep track of them in @nodes so we can find them later.
         # At this step (Map creation...), we still don't know who possess
         # the node and how many soldiers there is. We'll get back to that later.
-        # json['nodes'] => [{:id => STRING}, ...]
+        # map['nodes'] => [{:id => STRING}, ...]
         map['nodes'].each do |node|
-          @nodes[node['id']] = Berlin::AI::Node.new node['id']
+          @nodes[node['id']] = Berlin::AI::Node.new node, @types[node['type']]
         end
 
         # Same thing here, with paths.
-        # json['paths'] => [{:from => INTEGER, :to => INTEGER}, ...]
+        # map['paths'] => [{:from => INTEGER, :to => INTEGER}, ...]
         map['paths'].each do |path|
           @nodes[path['from']].link_to @nodes[path['to']]
 

data/lib/ai/node.rb

@@ -4,10 +4,14 @@ module Berlin
     # We'll be able to use it in order to know if two
     # nodes are adjacent, how much points worth a node, etc.
     class Node
-      attr_accessor :id, :player_id, :number_of_soldiers
+      attr_accessor :id, :player_id, :number_of_soldiers, :type
+      attr_reader   :soldiers_per_turn, :points
 
-      def initialize id
-        @id                 = id
+      def initialize node, type
+        @id                 = node['id']
+        @type               = node['type']
+        @points             = type['points']
+        @soldiers_per_turn  = type['number_of_soldiers']
         @number_of_soldiers = 0
         @player_id          = 0
         @links              = []
@@ -27,6 +31,11 @@ module Berlin
       def occupied?
         @number_of_soldiers > 0
       end
+      
+      # Returns true if node owned by provided player id
+      def owned_by? player_id
+        @player_id == player_id
+      end
 
       # Returns a list of all adjacent nodes
       def adjacent_nodes

data/lib/berlin-ai.rb

@@ -25,6 +25,7 @@ post '/' do
     200
   rescue Exception => e
     p e.inspect
+    p e.backtrace
     
     # Internal server error
     500

data/lib/version.rb

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

data/test/test_ai.rb

@@ -3,7 +3,7 @@ require 'berlin-ai'
 
 class Berlin::AI::Game
   def turn_moves
-    @map.controlled_nodes.map do |node|
+    @map.controlled_nodes.collect do |node|
       {
         :from => node.id,
         :to => node.adjacent_nodes.sample.id,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: berlin-ai
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Christian Blais
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -04:00
+date: 2011-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency