rtanque 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2710b201f052939f4fdf9e2816050597b26e948e
-  data.tar.gz: 8273925c71ec90ecce35e5c8041674fe300dfeb7
+  metadata.gz: f5f4b4408532ba416d2572aac6a6173f412fd99a
+  data.tar.gz: 1d4995cb500186090ceb317fac267fb65ea21a3b
 SHA512:
-  metadata.gz: 38ccf85cf7d8c1a36d9ede963892303865b611db05111e283d8baccdc27f3b86db48b384a6e5dd5535cb88aef076c27f60f0eb7646c7eefd7acc73f4b08d3752
-  data.tar.gz: be0f95f95194b3e72f0574478869a756615aafbaa0b10772e588eee2aee5e2c37495f53524e3883f5b6a97288d2873fb5a5aa19cc127be1f33dc067ed0c855b7
+  metadata.gz: 1461a7bc912bc9eb9546042d6972695d27a1339639c5a6859c05b2799cf229f00fd4987042d750d4d7ba68bf067cd5ab5a551795a1b65c70058e89b0a8cf5689
+  data.tar.gz: 4787e52d89f835655e7ef722d628554bc9bf9371dd4a75e7235cd219d60f72c4b5dd3dc45f871c0372e72a65e57146499684511dac70f39cbbe8944c7c6b2c73

data/README.md

@@ -50,6 +50,36 @@ Make a project directory, init bundler, add the RTanque gem, and create a bot:
   * [RTanque::Heading](http://rubydoc.info/github/awilliams/RTanque/master/frames/RTanque/Heading)
   * [RTanque::Point](http://rubydoc.info/github/awilliams/RTanque/master/frames/RTanque/Point)
 
+## Advanced Options
+
+Set arena dimensions
+
+    $ bundle exec rtanque start --width=400 --height=400 sample_bots/camper:x4
+
+Adjust max ticks allowed
+
+    $ bundle exec rtanque start --max_ticks=500 sample_bots/camper:x4
+
+Run headless match (no gui)
+
+    $ bundle exec rtanque start --gui=false sample_bots/camper:x4
+
+Run team match (teams are currently determined by bot name. Bots with same name are on the same team. The match finished if alive bots have the same name.) https://github.com/awilliams/RTanque/pull/10
+
+    $ bundle exec rtanque start --teams sample_bots/camper:x4 sample_bots/seek_and_destroy.rb:4
+
+Quiet mode (less console chatter).
+
+    $ bundle exec rtanque start --quiet sample_bots/camper:x4
+
+Set random number seed, allowing same battle to be repeated. https://github.com/awilliams/RTanque/pull/7
+
+    $ bundle exec rtanque start --seed 1234 sample_bots/camper:x4
+
+**Experimental** Disable garbage collection during match
+
+    $ bundle exec rtanque start --gc=false sample_bots/camper:x4
+
 ## Sharing
 At some point you'll want to compete against other bots, or maybe you'll even organize a small tournament. Sharing bots is easy.
 

data/bin/rtanque

@@ -23,13 +23,14 @@ LONGDESC
   method_option :width, :aliases => '-w', :default => 1200, :type => :numeric, :banner => 'width of window'
   method_option :height, :aliases => '-h', :default => 700, :type => :numeric, :banner => 'height of window'
   method_option :max_ticks, :aliases => '-m', :default => Float::INFINITY, :type => :numeric, :banner => 'max ticks allowed per match'
+  method_option :teams, :default => false, :type => :boolean, :banner => 'true to do a team based match based on tank names'
   method_option :gui, :default => true, :type => :boolean, :banner => 'false to run headless'
   method_option :gc, :default => true, :type => :boolean, :banner => 'disable GC (EXPERIMENTAL)'
   method_option :quiet, :aliases => '-q', :default => false, :type => :boolean, :banner => 'disable chatter'
   method_option :seed, :default => Kernel.srand, :type => :numeric, :banner => 'random number seed value'
   def start(*brain_paths)
     Kernel.srand(options[:seed])
-    runner = RTanque::Runner.new(options[:width], options[:height], options[:max_ticks])
+    runner = RTanque::Runner.new(options[:width], options[:height], options[:max_ticks], options[:teams])
     brain_paths.each { |brain_path|
       begin
         runner.add_brain_path(brain_path)

data/lib/rtanque/configuration.rb

@@ -6,6 +6,7 @@ module RTanque
   # @!visibility private
   Configuration = ::Configuration.for('default') do
     raise_brain_tick_errors true
+    quit_when_finished true
 
     bot do
       radius 19
@@ -43,4 +44,4 @@ module RTanque
   def Configuration.config(&block)
     ::Configuration::DSL.evaluate(self, &block)
   end
-end
+end

data/lib/rtanque/gui/window.rb

@@ -36,6 +36,7 @@ module RTanque
         self.close if button_down?(Gosu::Button::KbEscape)
         @background.draw(0, 0, ZOrder::BACKGROUND)
         if @match.finished?
+          self.close if Configuration.quit_when_finished
           self.gui_bots.each { |bot| bot.grow(2) }
         end
         self.draw_drawables

data/lib/rtanque/heading.rb

@@ -78,7 +78,7 @@ module RTanque
     def delta(to)
       diff = (to.to_f - self.to_f).abs % FULL_ANGLE
       diff = -(FULL_ANGLE - diff) if diff > Math::PI
-      to < self ? -diff : diff
+      to.to_f < self.to_f ? -diff : diff
     end
 
     # @return [RTanque::Heading]
@@ -159,4 +159,4 @@ module RTanque
       @memoized[:to_degrees] ||= (self.radians * 180.0) / Math::PI
     end
   end
-end
+end

data/lib/rtanque/match/tick_group.rb

@@ -14,7 +14,7 @@ module RTanque
       end
 
       def all_but(*to_exclude)
-        self.reject { |member| to_exclude.include?(member) }
+        self.to_a - to_exclude
       end
 
       def delete_if(&block)
@@ -47,4 +47,4 @@ module RTanque
       end
     end
   end
-end
+end

data/lib/rtanque/match.rb

@@ -1,10 +1,11 @@
 module RTanque
   class Match
-    attr_reader :arena, :bots, :shells, :explosions, :ticks, :max_ticks
+    attr_reader :arena, :bots, :shells, :explosions, :ticks, :max_ticks, :teams
 
-    def initialize(arena, max_ticks = nil)
+    def initialize(arena, max_ticks = nil, teams = false)
       @arena = arena
       @max_ticks = max_ticks
+      @teams = teams
       @ticks = 0
       @shells = TickGroup.new
       @bots = TickGroup.new
@@ -20,7 +21,8 @@ module RTanque
     end
 
     def finished?
-      @stopped || self.max_ticks_reached? || self.bots.count <= 1
+      @stopped || self.max_ticks_reached? || self.bots.count <= 1 ||
+        (self.teams && self.bots.map(&:name).uniq.size == 1)
     end
 
     def add_bots(*bots)
@@ -64,4 +66,4 @@ module RTanque
       @ticks += 1
     end
   end
-end
+end

data/lib/rtanque/shell.rb

@@ -5,13 +5,17 @@ module RTanque
     SHELL_SPEED_FACTOR = Configuration.shell.speed_factor
     attr_reader :bot, :arena, :fire_power
 
+    def self.speed fire_power
+      fire_power * SHELL_SPEED_FACTOR
+    end
+
     def initialize(bot, position, heading, fire_power)
       @bot = bot
       @arena = bot.arena
       @fire_power = fire_power
       self.position = position
       self.heading = heading
-      self.speed = (fire_power * SHELL_SPEED_FACTOR) # TODO: add bot's relative speed in this heading
+      self.speed = self.class.speed(fire_power) # TODO: add bot's relative speed in this heading
       @dead = false
     end
 
@@ -37,4 +41,4 @@ module RTanque
       end
     end
   end
-end
+end

data/lib/rtanque/version.rb

@@ -1,3 +1,3 @@
 module RTanque
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/sample_bots/seek_and_destroy.rb

@@ -8,6 +8,8 @@ class SeekAndDestroy < RTanque::Bot::Brain
   TURRET_FIRE_RANGE = RTanque::Heading::ONE_DEGREE * 5.0
 
   def tick!
+    @desired_heading ||= nil
+
     if (lock = self.get_radar_lock)
       self.destroy_lock(lock)
       @desired_heading = nil
@@ -48,4 +50,4 @@ class SeekAndDestroy < RTanque::Bot::Brain
     @locked_on = lock.name if lock
     lock
   end
-end
+end

data/spec/rtanque/match_spec.rb

@@ -21,9 +21,18 @@ describe RTanque::Match do
     end
 
     it 'should be false if two or more bots left' do
-      @instance.add_bots(:bot, :bot2)
+      bot1 = double('bot', :name => "bot1")
+      bot2 = double('bot', :name => "bot2")
+      @instance.add_bots(bot1, bot2)
       expect(@instance.finished?).to be_false
     end
+
+    it 'should be true if two or more bots left w/ same name' do
+      bot1 = double('bot', :name => "bot1")
+      bot2 = double('bot', :name => "bot1")
+      @instance.add_bots(bot1, bot2)
+      expect(@instance.finished?).to be_true
+    end
   end
 
   describe '#tick' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtanque
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Adam Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: RTanque is a game for programmers. Players program the brain of a tank and
@@ -300,3 +300,4 @@ test_files:
 - spec/rtanque/shell_spec.rb
 - spec/rtanque_spec.rb
 - spec/spec_helper.rb
+has_rdoc: