gembots 0.0.02 → 0.0.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573baa7dd49ebfa9c61459cb561216065d5eff8b
-  data.tar.gz: 0b506e01537918e8d553a4a37538139db3286a1f
+  metadata.gz: 73f2ffdf6ffebd87c85a2327669a78eae9295ed4
+  data.tar.gz: a6c7d582df047435d304959ccbe1c727e09251a9
 SHA512:
-  metadata.gz: 63d16728df0f12fd991d020b75e72bfa23b603fda1c81465a5d1686d1f71765d42dbf400a9b31bad040ed55e386efdd695e4b1bc08fec47cdfd7c2e011406525
-  data.tar.gz: 7c269dafb617699296e1ab794436e9c17e81421a86b473242058e59e353f21b5976cae9ed4622a811ef12f0d3a6da5c2a5c0be1e2050725d3e17d39c2992ea08
+  metadata.gz: e2127a038e87c65d91488b74e602be071d58ece17e4e80bb1e8f26854939c93f0e415c6e2856adf7988b3434880afb94a7e62fa92d44fe4074fa47c5f97c365b
+  data.tar.gz: 19143de086c3a7fafd7f7578c463f78aa7271450579cb98cf3470164f99f46eb62c71e06b2afe0af837cc247a6bfef6e9538e749145aaaabd053e08b000f8968

data/lib/gembots/arena.rb

@@ -5,13 +5,16 @@ class Gembots::Arena
   # This is a hash table containing the ids of each object.
   attr_reader :objects
 
+  # Same as objects, but it contains and older copy to detect changes during a update_bot.
+  attr_reader :objects_pre
+
   # 2-dimensional array of the current arena.
   # By default this is a 20x20 board
   attr_reader :board
 
   def initialize *bots
-    @objects = Hash.new
-    @board   = Array.new 20, (Array.new 20, [])
+    @objects     = Hash.new
+    @board       = Array.new(20) { Array.new(20) { [] } }
 
     # define each bots' update function and add to players hash
     bots.each do |bot|
@@ -19,15 +22,21 @@ class Gembots::Arena
       @objects[bot.id] = bot
       @board[bot.x_pos][bot.y_pos] << bot.id
 
-      def bot.update arena
-        arena.update_bot self
+      def bot.update arena, x_old = nil, y_old = nil
+        arena.update_bot self, x_old, y_old
       end
     end
   end
 
-  # Used for activating the robot's custom functions based on active events.
-  def update_bot robot
-    # something here
+  # Used for updating the board based on changes in robot.
+  def update_bot robot, x_old, y_old
+    if x_old != nil and y_old != nil
+      # remove id from board
+      @board[x_old][y_old].delete robot.id
+
+      # set new pos
+      @board[robot.x_pos][robot.y_pos] << robot.id
+    end
   end
 
   # Spawn object into board and objects array.

data/lib/gembots/bot.rb

@@ -53,6 +53,7 @@ class Gembots::Robot
   # To move backward just use a negative value.
   # Currently it only supports movement along 8 directions.
   def move dist = 1
+    y_old, x_old = @y_pos, @x_pos
     # Eventually some math using rotation_matrix will be here, in order to calculate all 360 directions.
     # For now I'm only implementing 8 directions.
     directions = [
@@ -65,10 +66,10 @@ class Gembots::Robot
       [0,  -1],  # 270
       [1,  -1]   # 315
     ]
-    @y_pos += dist * directions[360 / @angle - 1][0]
-    @x_pos += dist * directions[360 / @angle - 1][1]
+    @y_pos += dist * directions[360 / @angle - 2][0]
+    @x_pos += dist * directions[360 / @angle - 2][1]
 
-    self.update @arena
+    self.update @arena, x_old, y_old
   end
 
   # Rotates angle in degrees clockwise.

data/test/test_arena.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'gembots'
+require 'gembots/arena'
+require 'gembots/bot'
+
+class ArenaTest < Test::Unit::TestCase
+  def test_has_bot
+    bot = Gembots::Robot.new
+    arena = Gembots::Arena.new bot
+    assert_equal bot, arena.objects[bot.id]
+  end
+
+  def test_board_movement
+    bot   = Gembots::Robot.new
+    arena = Gembots::Arena.new bot
+    bot.turn 90
+    bot.move 1
+    assert_equal bot.id, arena.board[1][0][0]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gembots
 version: !ruby/object:Gem::Version
-  version: 0.0.02
+  version: 0.0.03
 platform: ruby
 authors:
 - L8D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - lib/gembots/arena.rb
 - lib/gembots/bot.rb
+- test/test_arena.rb
 - test/test_bot.rb
 homepage: http://github.com/L8D/gembots
 licenses:
@@ -73,4 +74,5 @@ signing_key:
 specification_version: 4
 summary: Create your own gembots and battle them in a cli arena
 test_files:
+- test/test_arena.rb
 - test/test_bot.rb