rubots 0.1 → 0.2

data/lib/rubots/game.rb

@@ -3,6 +3,7 @@ module Rubots
     attr_reader :robots, :laser_beams
     MAP_HEIGHT = 700
     MAP_WIDTH  = 1000
+    CELL_SIZE  = 40 # Positioning cell
 
     def initialize(robots)
       @robots = robots.map { |klass| Robot.new(klass, self, *random_location) }
@@ -10,8 +11,8 @@ module Rubots
 
     def tick
       @laser_beams = []
-      @robots.each { |robot| robot.tick      }
-      @robots.each { |robot| robot.tick_fire }
+      @robots.each { |robot| robot.process_command }
+      @robots.each { |robot| robot.tick            }
       check_collisions
       check_out_of_area
       check_beam_hits
@@ -38,11 +39,15 @@ module Rubots
 
   private
 
-    # TODO enforce separation
     def random_location
-      x = rand(MAP_WIDTH)
-      y = rand(MAP_HEIGHT)
-      [x, y]
+      x_cells = MAP_WIDTH  / CELL_SIZE
+      y_cells = MAP_HEIGHT / CELL_SIZE
+      @taken ||= []
+      begin
+        pair = [rand(x_cells), rand(y_cells)]
+      end while puts("coll") || @taken.include?(pair)
+      @taken << pair
+      pair.map { |coord| coord * CELL_SIZE + CELL_SIZE / 2 }
     end
 
     COLLISION_DISTANCE = 32

data/lib/rubots/robot.rb

@@ -33,7 +33,7 @@ module Rubots
       @cooldown_timer = 0
     end
 
-    def tick
+    def process_command
       return if @destroyed
 
       if @cooldown_timer > 0
@@ -43,18 +43,16 @@ module Rubots
         command.apply_to(self)
         @cooldown_timer = command.cooldown
       end
+    end
+
+    def tick
+      return if @destroyed
+
       tick_angle
       tick_throttle
       tick_movement
       tick_gun
-    end
-
-    # It's a separate method because we want fire to be after *every* robot moved
-    def tick_fire
-      if @firing
-        @game.laser_fire(Beam.from(self))
-        @firing = false
-      end
+      tick_fire
     end
 
     def name
@@ -87,7 +85,10 @@ module Rubots
     end
 
     def targets_data
-      @game.robots.map do |target_robot|
+      robots_arrays = @game.robots.slice_before(self).to_a
+      robots_arrays.last.shift # First is self
+      robots = robots_arrays.reverse.inject(&:+)
+      robots.map do |target_robot|
         next if target_robot == self
         x_dist = @x - target_robot.x
         y_dist = @y - target_robot.y
@@ -148,5 +149,12 @@ module Rubots
         end
       end
     end
+
+    def tick_fire
+      if @firing
+        @game.laser_fire(Beam.from(self))
+        @firing = false
+      end
+    end
   end
 end

data/lib/rubots/strategy_loader.rb

@@ -3,7 +3,7 @@ module Rubots
     def self.load(params)
       return default_lineup unless params.any?
 
-      params.map { |p| new(p).strategy_class }
+      params.map { |p| new(p).strategy_class }.flatten
     end
 
     def self.default_lineup
@@ -16,7 +16,9 @@ module Rubots
     end
 
     def strategy_class
-      if is_sample?
+      if is_multiple?
+        multiple_classes
+      elsif is_sample?
         sample_class
       else
         class_from_file
@@ -25,6 +27,15 @@ module Rubots
 
   private
 
+    def is_multiple?
+      @name.match(/^[0-9]+\*/)
+    end
+
+    def multiple_classes
+      parts = @name.split('*', 2)
+      [StrategyLoader.new(parts[1]).strategy_class] * parts[0].to_i
+    end
+
     def class_from_file
       load @name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubots
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu