gembots 0.0.03 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f2ffdf6ffebd87c85a2327669a78eae9295ed4
-  data.tar.gz: a6c7d582df047435d304959ccbe1c727e09251a9
+  metadata.gz: 9e7ee5cc5f03ca3b06cda8560005f4be2a60bbe8
+  data.tar.gz: 1272a7b540898904aafe8c4635157fbdb7c3b4a7
 SHA512:
-  metadata.gz: e2127a038e87c65d91488b74e602be071d58ece17e4e80bb1e8f26854939c93f0e415c6e2856adf7988b3434880afb94a7e62fa92d44fe4074fa47c5f97c365b
-  data.tar.gz: 19143de086c3a7fafd7f7578c463f78aa7271450579cb98cf3470164f99f46eb62c71e06b2afe0af837cc247a6bfef6e9538e749145aaaabd053e08b000f8968
+  metadata.gz: 51c394cac319498bc612fb43b9639e88fee49ca978c92ac372d9792c3a8894e4767588683407ab3eaee6346faf3d01aae7171a9cace938291d63fe03cb1e0c4d
+  data.tar.gz: 1e79f3722a61bbd7cbdcacb25444ba2b638d26b989642d62f1c494b382479b9236c4dc2d7ca63c57709e2a08c5d5aa74e0d65ea25cf1a1238b031de86bb32df6

data/lib/gembots/arena.rb

@@ -1,48 +1,33 @@
 require 'gembots'
 
-# The Arena class is used to create and simulate arenas.
-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
-
+class Gembots::Arena < Gosu::Window
+  attr_reader :bots
   def initialize *bots
-    @objects     = Hash.new
-    @board       = Array.new(20) { Array.new(20) { [] } }
-
-    # define each bots' update function and add to players hash
-    bots.each do |bot|
-      bot.arena = self
-      @objects[bot.id] = bot
-      @board[bot.x_pos][bot.y_pos] << bot.id
-
-      def bot.update arena, x_old = nil, y_old = nil
-        arena.update_bot self, x_old, y_old
-      end
+    super 640, 480, false
+    self.caption = "Gembots battle"
+    @bots = []
+
+    bots.each do |bot_class|
+      bot = bot_class.new self
+      bot.warp 320, 240
+      @bots << bot
     end
   end
 
-  # 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
+  def draw
+    @bots.each &:draw
+  end
 
-      # set new pos
-      @board[robot.x_pos][robot.y_pos] << robot.id
+  def update
+    @bots.each &:update
+    @bots.each do |bot|
+      if bot.actions.empty?
+        bot.on_idle
+      end
     end
   end
 
-  # Spawn object into board and objects array.
-  # Most used for spawning projectiles.
-  def spawn object
-    @objects[object.id] = object
-    @board[object.x_pos][object.y_pos] << object.id
+  def button_down id
+    close if id == Gosu::KbEscape
   end
 end

data/lib/gembots/bot.rb

@@ -1,113 +1,59 @@
 require 'gembots'
 
-# The Robot class is used to create and define robots.
 class Gembots::Robot
-  # String contains the robot's name.
-  # This will typically used for things like announcements during battles.
-  attr_accessor :name
+  attr_reader :x, :y, :angle, :actions
 
-  # X position relative to the arena.
-  attr_reader   :x_pos
-
-  # Y position relative to the arena.
-  attr_reader   :y_pos
-
-  # Number between 0 and 360 representing the robot's current facing angle.
-  attr_reader   :angle
-
-  # This is simply the robot's player ID.
-  # It is typically the Object ID, but may be changed to fit other uses.
-  attr_reader   :id
-
-  # This is the ID of a cloned robot's parent.
-  # Otherwise if the robot is not a cloned one, the value will be nil.
-  attr_accessor :parent_id
-
-  # This is set and used by the current robot's arena, if there is one.
-  attr_accessor :arena
-
-  def initialize name = 'Robot'
-    @name            = name
-
-    @x_pos           = 0
-    @y_pos           = 0
-    @angle           = 0
-
-    @id              = self.object_id
-    @parent_id       = nil
+  def initialize window
+    @actions = []
+    @window = window
+    @images = Gosu::Image::load_tiles(window, "media/tank.png", 32, 32, false)
+    @image = Gosu::Image.new window, "media/cannon.png", false
+    @x = @y = @angle = @cur_image = 0.0
   end
 
-  # Returns a duplicate robot(clone) with it's own +parent_id+.
-  def clone
-    clone = self.dup
-    clone.parent_id = self.id
-    clone
+  def warp x, y
+    @x, @y = x, y
   end
 
-  # Returns true if robot is a clone of target_robot.
-  def is_clone_of? target_robot
-    @parent_id == target_robot.id
+  def turn angle=10
+    @actions << [:turn, angle]
   end
 
-  # Moves the robot forward along it's angle for the distance specified.
-  # 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 = [
-      [1,   0],  #   0
-      [1,   1],  #  45
-      [0,   1],  #  90
-      [-1,  1],  # 135
-      [-1,  0],  # 180
-      [-1, -1],  # 225
-      [0,  -1],  # 270
-      [1,  -1]   # 315
-    ]
-    @y_pos += dist * directions[360 / @angle - 2][0]
-    @x_pos += dist * directions[360 / @angle - 2][1]
-
-    self.update @arena, x_old, y_old
+  def move dist=10
+    @actions << [:move, dist]
   end
 
-  # Rotates angle in degrees clockwise.
-  # To rotate counter-clockwise just use a negative number.
-  def turn angle
-    @angle += angle
-
-    # Used for wrapping:
-    @angle -= 360 if @angle > 360
-    @angle += 360 if @angle < 0
+  def update
+    return if @actions.empty?
+    case @actions[0][0]
+    when :move then
+      # I probably should implement dist = @actions[0][1]; dist %= 0.5 or something
+      # but right now I'm tired, and worried I will screw up the math if I try that...
+      dist = @actions[0][1] <= 0.9 ? @actions[0][1] : 1.0
+      @x += Gosu::offset_x @angle, dist
+      @y += Gosu::offset_y @angle, dist
+      @x %= 640
+      @y %= 480
 
-    self.update @arena
-  end
+      @cur_image += 0.1
+      @cur_image %= 7.0
 
-  # Spawns projectile of type `bullet` in arena(if there is one).
-  def fire
-    arena or return
-    @arena.spawn Projectile.new 'bullet', @id, @x_pos, @y_pos, @angle
-  end
+      @actions[0][1] -= 0.5
+      @actions.shift if @actions[0][1] == 0.0
 
-  # These functions are just for documentation and to prevent erros when calling these undefined.
+    when :turn then
+      deg = @actions[0][1] <= 9 ? @actions[0][1] : 10
 
-  # Called whenever the game is in idle state.
-  # It is likely used as the robot's main loop.
-  def when_idle robot
-  end
-
-  # Called whenever another robot is seen within the facing angle.
-  # It usually has some code to fire at the target robot.
-  # Make sure to check that it is not your robot's clone!
-  def when_find_robot robot, target_robot
-  end
+      @angle += deg
+      @angle %= 360
+      @actions[0][1] -= deg
 
-  # Called whenever this robot has ended up colliding with another robot.
-  def when_robot_collision robot, target_robot
+      @actions.shift if @actions[0][1] == 0
+    end
   end
 
-  # This function is used by the arena for updates and delays and stuff.
-  def update *i
+  def draw
+    @images[@cur_image].draw_rot @x, @y, 1, @angle - 90 % 360
+    @image.draw_rot @x, @y, 1, @angle - 90 % 360
   end
 end

data/test/test_arena.rb

@@ -3,18 +3,23 @@ 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]
+class MyBot1 < Gembots::Robot
+  def on_idle
+    self.move
+    self.turn
+  end
+end
+
+class MyBot2 < Gembots::Robot
+  def on_idle
+    self.move 50
+    self.turn 180
   end
+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]
+class ArenaTest < Test::Unit::TestCase
+  def test_arena_window
+    arena = Gembots::Arena.new MyBot1, MyBot2
+    arena.show
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gembots
 version: !ruby/object:Gem::Version
-  version: 0.0.03
+  version: '0.1'
 platform: ruby
 authors:
 - L8D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gosu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -48,7 +62,6 @@ files:
 - lib/gembots/arena.rb
 - lib/gembots/bot.rb
 - test/test_arena.rb
-- test/test_bot.rb
 homepage: http://github.com/L8D/gembots
 licenses:
 - MIT
@@ -69,10 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 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

data/test/test_bot.rb

@@ -1,33 +0,0 @@
-require 'test/unit'
-require 'gembots/bot'
-
-def make_bot
-  bot = Gembots::Robot.new
-  bot.name = "test"
-  bot.turn 90
-  bot.move 5
-  bot
-end
-
-class BotTest < Test::Unit::TestCase
-  def test_name
-    bot = make_bot
-    assert_equal "test", bot.name
-  end
-
-  def test_position
-    bot = make_bot
-    assert_equal 5, bot.x_pos
-  end
-
-  def test_clone
-    bot = make_bot
-    bot_clone = bot.clone
-    assert_equal bot_clone.parent_id, bot.id
-  end
-
-  def test_id
-    bot = make_bot
-    assert_equal bot.object_id, bot.id
-  end
-end