!Fixed friendly fire code in robot.rb

+Added tracking for shots fired, shots hit, and accuracy for tournaments and one-off fights

Author: David Rust-Smith

robot.rb

@@ -140,6 +140,12 @@ class RobotRunner
   #keeps track of total damage done by this robot
   attr_accessor :damage_given
 
+  #keeps track of total shots hit by this robot
+  attr_accessor :shots_hit
+
+  #keeps track of total shots fired by this robot
+  attr_accessor :shots_fired
+
   #keeps track of the kills
   attr_accessor :kills
 
@@ -169,6 +175,8 @@ def set_initial_state
     @speed = 0
     @energy = 100
     @damage_given = 0
+    @shots_hit = 0
+    @shots_fired = 0
     @kills = 0
     teleport
   end
@@ -195,7 +203,7 @@ def set_action_limits
 
   def hit bullet
     damage = 0  #default no damage, unless different teams
-    damage = bullet.energy    unless bullet.origin.team != @team      
+    damage = bullet.energy    unless bullet.origin.team == @team      
     @energy -= damage
     @events['got_hit'] << [@energy]
     damage

rrobots.rb

@@ -117,6 +117,7 @@ def initialize bf, x, y, heading, speed, energy, origin
     @x, @y, @heading, @origin = x, y, heading, origin
     @speed, @energy = speed, energy
     @battlefield, dead = bf, false
+    origin.shots_fired += 1
   end
 
   def state
@@ -137,6 +138,7 @@ def tick
         @battlefield << explosion
         damage = other.hit(self)
         origin.damage_given += damage
+        origin.shots_hit += 1
         origin.kills += 1 if other.dead
         @dead = true
       end
@@ -215,6 +217,9 @@ def print_outcome(battlefield)
   puts "robots :"
   battlefield.robots.each do |robot|
     puts "  #{robot.name}:"
+    puts "    shots_fired: #{'%.1f' % robot.shots_fired}"
+    puts "    shots_hit: #{'%.1f' % robot.shots_hit}"
+    puts "    accuracy: #{'%.1f' % (100*robot.shots_hit/robot.shots_fired)} %"
     puts "    damage_given: #{'%.1f' % robot.damage_given}"
     puts "    damage_taken: #{'%.1f' % (100 - robot.energy)}"
     puts "    kills:        #{robot.kills}"

tournament.rb

@@ -48,6 +48,31 @@ def simul?
   def timedout?
     @timedout == 1
   end
+
+  
+  def winner_shots_fired
+    @bots[winner]['shots_fired'].to_i
+  end
+
+  def loser_shots_fired
+    @bots[loser]['shots_fired'].to_i
+  end
+  
+  def winner_shots_hit
+    @bots[winner]['shots_hit'].to_i
+  end
+
+  def loser_shots_hit
+    @bots[loser]['shots_hit'].to_i
+  end
+  
+  def winner_accuracy
+    100* @bots[winner]['shots_hit'].to_i/@bots[winner]['shots_fired'].to_i
+  end
+
+  def loser_accuracy
+    100* @bots[loser]['shots_hit'].to_i/@bots[loser]['shots_fired'].to_i
+  end
 
   #between 100 and 0
   def winner_health 
@@ -61,7 +86,7 @@ def loser_health
 
   def one_line_summary
     if !tie?
-      line = "#{winner} beats #{loser} by #{'%.1f' % margin} energy in #{@ticks} ticks"
+      line = "#{winner} beats #{loser} by #{'%.1f' % margin} energy in #{@ticks} ticks. #{winner} accuracy #{'%.1f'% winner_accuracy} vs. #{loser} accuracy #{'%.1f'% loser_accuracy}"
       if @timedout then line += " (match timed out, so #{winner} gets #{winner_points}, loser gets #{loser_points})" end
     else
       line = "#{winner} ties #{loser} at #{'%.1f' % winner_health} energy in #{@ticks} ticks"
@@ -85,7 +110,7 @@ def initialize (matches)
     @bots = Hash.new {|h,key| h[key] = {}}
 
     both_bots =  [@bots[@matches[0].winner], @bots[@matches[0].loser]]
-    stats_to_init = ['wins', 'points', 'ties', 'margin', 'simul', 'timedout', 'round_wins']
+    stats_to_init = ['wins', 'points', 'ties', 'margin', 'simul', 'timedout', 'round_wins','accuracy', 'shots_fired', 'shots_hit']
     stats_to_init.each {|stat| both_bots.each {|b| b[stat] = 0 }}
 
     @matches.each do |match|
@@ -95,6 +120,15 @@ def initialize (matches)
       both_bots.each {|b| b['timedout'] += 1 if match.timedout?}
       both_bots.each {|b| b['simul'] += 1 if match.simul?}
       @bots[match.winner]['margin'] += match.margin
+      
+      @bots[match.winner]['shots_fired'] += match.winner_shots_fired
+      @bots[match.loser]['shots_fired'] += match.loser_shots_fired
+      @bots[match.winner]['shots_hit'] += match.winner_shots_hit
+      @bots[match.loser]['shots_hit'] += match.loser_shots_hit
+      
+      @bots[match.winner]['accuracy'] = 100*@bots[match.winner]['shots_hit'] / @bots[match.winner]['shots_fired']
+      @bots[match.loser]['accuracy'] = 100*@bots[match.loser]['shots_hit'] / @bots[match.loser]['shots_fired']
+      
       if match.tie?
         both_bots.each {|b| b['wins'] += 0.5}
       else
@@ -269,7 +303,7 @@ def to_html match_data, html
 	  rounds << r
 	end
 
-	stats = ['wins', 'points','round_wins', 'margin', 'simul', 'timedout', 'ties']
+	stats = ['wins', 'points','round_wins', 'margin', 'simul', 'timedout', 'ties', 'shots_fired','accuracy']
 	rankings = {}
 	stats.each{|stat| rankings[stat] = rank_by_round_stat(stat, rounds)}