berlin-ai 0.0.27 → 0.0.28

data/lib/ai/game.rb

@@ -51,7 +51,14 @@ module Berlin
       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}
+         # remove moving soldiers from from node
+        from.available_soldiers -= number_of_soldiers
+
+        # adding incoming soldiers to next node
+        to.incoming_soldiers += number_of_soldiers
+
+        # add move
+        @moves << {:from => from.to_i, :to => to.to_i, :number_of_soldiers => number_of_soldiers.to_i}
       end
 
       def update infos, state
@@ -63,8 +70,9 @@ module Berlin
         @map.update state
       end
       
-      def clear_moves
+      def reset!
         @moves = []
+        @map.nodes.each(&:reset!)
       end
     end
   end

data/lib/ai/map.rb

@@ -42,7 +42,28 @@ module Berlin
       # Returns an array of all owned nodes
       def owned_nodes
         nodes.select do |node|
-          node.owned_by? @player_id
+          node.owned_by?(@player_id)
+        end
+      end
+
+      # Returns an array of all enemy nodes
+      def enemy_nodes
+        nodes.select do |node|
+          node.owned? && !owned_by?(@player_id)
+        end
+      end
+
+      # Returns an array of all free nodes
+      def free_nodes
+        nodes.select do |node|
+          node.free?
+        end
+      end
+
+      # Returns an array of all nodes that we don't owned
+      def foreign_nodes
+        nodes.reject do |node|
+          node.owned_by?(@player_id)
         end
       end
 

data/lib/ai/node.rb

@@ -4,7 +4,7 @@ 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, :type
+      attr_accessor :id, :player_id, :number_of_soldiers, :incoming_soldiers, :available_soldiers, :type
       attr_reader   :soldiers_per_turn, :points
 
       def initialize node, type
@@ -13,22 +13,33 @@ module Berlin
         @points             = type['points']
         @soldiers_per_turn  = type['soldiers_per_turn']
         @number_of_soldiers = 0
-        @player_id          = 0
+        @player_id          = nil
         @links              = []
       end
+
+      # Reset information for new turn
+      def reset!
+        self.incoming_soldiers  = 0
+        self.available_soldiers = self.number_of_soldiers
+      end
       
       # Somewhat useful
       def to_i
         @id.to_i
       end
 
+      # Used to compare if two nodes are the same
+      def ==(other)
+        other.id == @id
+      end
+
       # Registers a given node as an adjacent one.
-      def link_to other_node
+      def link_to(other_node)
         @links << other_node
       end
 
       # Returns true if other_node is adjacent to self
-      def adjacent? other_node
+      def adjacent?(other_node)
         @links.include? other_node
       end
       
@@ -36,9 +47,19 @@ module Berlin
       def occupied?
         @number_of_soldiers > 0
       end
+
+      # Returns true if owned by any player
+      def owned?
+        !!@player_id
+      end
+
+      # Returns true if no one on the node
+      def free?
+        !owned?
+      end
       
       # Returns true if node owned by provided player id
-      def owned_by? player_id
+      def owned_by?(player_id)
         @player_id == player_id
       end
 

data/lib/ai/player.rb

@@ -2,7 +2,7 @@ module Berlin
   module AI
     class Player
       def self.on_turn
-        raise "Overwrite me."
+        raise NotImplementedError
       end
     end
   end

data/lib/berlin-ai.rb

@@ -65,7 +65,7 @@ post '/' do
 
       if ['ping', 'turn'].include?(params[:action])
         # Clear old moves
-        game.clear_moves
+        game.reset!
 
         # Let the player decides his moves
         Berlin::AI::Player.on_turn(game)

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berlin-ai
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors: