rtanque 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2710b201f052939f4fdf9e2816050597b26e948e
+  data.tar.gz: 8273925c71ec90ecce35e5c8041674fe300dfeb7
+SHA512:
+  metadata.gz: 38ccf85cf7d8c1a36d9ede963892303865b611db05111e283d8baccdc27f3b86db48b384a6e5dd5535cb88aef076c27f60f0eb7646c7eefd7acc73f4b08d3752
+  data.tar.gz: be0f95f95194b3e72f0574478869a756615aafbaa0b10772e588eee2aee5e2c37495f53524e3883f5b6a97288d2873fb5a5aa19cc127be1f33dc067ed0c855b7

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 gemfile: Gemfile.ci
 script: bundle exec rspec
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/README.md

@@ -50,11 +50,20 @@ 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)
 
+## 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.
+
+Ask your friends to upload their bot(s) in a [gist](https://gist.github.com/), which you can then download with the following command:
+
+    bundle exec rtanque get_gist <gist_id> ...
+    
+If you'd like to publicly share your bot, post its gist id on the wiki https://github.com/awilliams/RTanque/wiki/bot-gists
+
 ## Bot API
 
 The tank api consists of reading input from Brain#sensors and giving output to Brain#command
 
-**Brain#sensors**
+**[Brain#sensors](http://rubydoc.info/github/awilliams/RTanque/master/frames/RTanque/Bot/Sensors)**
 
 ```ruby
 class Bot < RTanque::Bot::Brain
@@ -75,7 +84,7 @@ class Bot < RTanque::Bot::Brain
   end
 end
 ```
-**Brain#command**
+**[Brain#command](http://rubydoc.info/github/awilliams/RTanque/master/frames/RTanque/Bot/Command)**
 
 ```ruby
 class Bot < RTanque::Bot::Brain

data/bin/rtanque

@@ -26,7 +26,9 @@ LONGDESC
   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])
     brain_paths.each { |brain_path|
       begin

data/lib/rtanque.rb

@@ -7,17 +7,8 @@
 # * {RTanque::Bot::Command} Instance provided to {RTanque::Bot::Brain#command}
 # * {RTanque::Heading} Handles angles
 # * {RTanque::Point} Handles coordinates
-# * {RTanqueCLI} CLI
 module RTanque
-  # @!visibility private
-  def self.round(numeric, precision = nil)
-    if RUBY_VERSION >= '1.9'
-      numeric.round(precision)
-    else
-      # https://github.com/rails/rails/blob/v2.3.8/activesupport/lib/active_support/core_ext/float/rounding.rb
-      precision ? numeric.round : (numeric * (10 ** precision)).round / (10 ** precision).to_f
-    end
-  end
+
 end
 
 require 'rtanque/version'

data/lib/rtanque/bot/sensors.rb

@@ -21,8 +21,12 @@ module RTanque
       end
 
       def button_down?(button_id)
-        button_id = Gosu::Window.char_to_button_id(button_id) unless button_id.kind_of?(Integer)
-        @gui_window && @gui_window.button_down?(button_id)
+        if self.class.const_defined?(:Gosu)
+          button_id = Gosu::Window.char_to_button_id(button_id) unless button_id.kind_of?(Integer)
+          @gui_window && @gui_window.button_down?(button_id)
+        else
+          false
+        end
       end
 
       def gui_window=(gui_window)

data/lib/rtanque/gui.rb

@@ -7,12 +7,13 @@ module RTanque
 
     module ZOrder
       BACKGROUND = -1
-      BOT_NAME = 0
-      BOT_BODY = 1
-      BOT_TURRET = 2
-      BOT_RADAR = 3
-      SHELL = 4
-      EXPLOSION = 10
+      BOT_HEALTH = 5
+      BOT_NAME = 6
+      BOT_BODY = 7
+      BOT_TURRET = 8
+      BOT_RADAR = 9
+      SHELL = 10
+      EXPLOSION = 20
     end
   end
 end

data/lib/rtanque/gui/bot.rb

@@ -1,16 +1,23 @@
 require 'gosu'
+require 'texplay'
+
+require 'rtanque/gui/bot/health_color_calculator'
 
 module RTanque
   module Gui
     class Bot
       attr_reader :bot
 
+      HEALTH_BAR_HEIGHT = 3
+      HEALTH_BAR_WIDTH = 100
+
       def initialize(window, bot)
         @window = window
         @bot = bot
         @body_image = Gosu::Image.new(@window, Gui.resource_path("images/body.png"))
         @turret_image = Gosu::Image.new(@window, Gui.resource_path("images/turret.png"))
         @radar_image = Gosu::Image.new(@window, Gui.resource_path("images/radar.png"))
+        @score_bar_image = TexPlay.create_blank_image(@window, HEALTH_BAR_WIDTH, HEALTH_BAR_HEIGHT)
         @name_font = Gosu::Font.new(@window, Window::FONT_NAME, Window::SMALL_FONT_SIZE)
         @x_factor = 1
         @y_factor = 1
@@ -20,6 +27,7 @@ module RTanque
         position = [@bot.position.x, @window.height - @bot.position.y]
         draw_bot(position)
         draw_name(position)
+        draw_health(position)
       end
 
       def grow(factor = 2, step = 0.002)
@@ -37,6 +45,27 @@ module RTanque
         x,y = *position
         @name_font.draw_rel(self.bot.name, x, y + (RTanque::Bot::RADIUS * @y_factor) + Window::SMALL_FONT_SIZE.to_i, ZOrder::BOT_NAME, 0.5, 0.5, @x_factor, @y_factor)
       end
+
+      def draw_health(position)
+        x,y = *position
+        x_health = health.round(0)
+        health_color = color_for_health
+        @score_bar_image.paint {
+          rect 0, 0, HEALTH_BAR_WIDTH, HEALTH_BAR_HEIGHT, :color => [0,0,0,0], :fill => true
+          rect 0, 0, x_health, HEALTH_BAR_HEIGHT, :color => health_color, :fill => true
+        }
+        @score_bar_image.draw(x - (HEALTH_BAR_WIDTH/2) * @x_factor, y + (5 + RTanque::Bot::RADIUS) * @y_factor, ZOrder::BOT_HEALTH, @x_factor, @y_factor)
+      end
+
+      private
+
+      def color_for_health
+        HealthColorCalculator.new(health).color_as_rgb
+      end
+
+      def health
+        self.bot.health
+      end
     end
   end
-end
+end

data/lib/rtanque/gui/bot/health_color_calculator.rb

@@ -0,0 +1,37 @@
+module RTanque
+  module Gui
+    class Bot
+      class HealthColorCalculator
+
+        # different health-clors as RGB values
+        FULL_HEALTH_COLOR   = [ 74, 190,  74].map { |v| v/255.0 }
+        MEDIUM_HEALTH_COLOR = [255, 190,   0].map { |v| v/255.0 }
+        LOW_HEALTH_COLOR    = [220,   0,   0].map { |v| v/255.0 }
+
+        attr_reader :health
+
+        def initialize(health)
+          @health = health
+        end
+
+        def color_as_rgb
+          if health > 50
+            percentage = ((100 - health) / 50)
+            color_between FULL_HEALTH_COLOR, MEDIUM_HEALTH_COLOR, percentage
+          else
+            percentage = ((50 - health) / 50)
+            color_between MEDIUM_HEALTH_COLOR, LOW_HEALTH_COLOR, percentage
+          end
+        end
+
+        def color_between(color_a, color_b, percentage)
+          [
+            (color_b[0] - color_a[0]) * percentage + color_a[0],
+            (color_b[1] - color_a[1]) * percentage + color_a[1],
+            (color_b[2] - color_a[2]) * percentage + color_a[2]
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/rtanque/heading.rb

@@ -59,7 +59,7 @@ module RTanque
     end
 
     def self.rand
-      self.new(Float.send(:rand) * FULL_ANGLE)
+      self.new(Kernel.rand * FULL_ANGLE)
     end
 
     attr_reader :radians
@@ -67,7 +67,7 @@ module RTanque
     # Creates a new RTanque::Heading
     # @param [#to_f] radians degree to wrap (in radians)
     def initialize(radians = NORTH)
-      @radians = self.extract_radians_from_value(radians) % FULL_ANGLE
+      @radians = radians.to_f % FULL_ANGLE
       @memoized = {} # allow memoization since @some_var ||= x doesn't work when frozen
       self.freeze
     end
@@ -108,7 +108,7 @@ module RTanque
     # @param [#to_f] other_heading
     # @return [RTanque::Heading]
     def +(other_heading)
-      self.class.new(self.radians + self.extract_radians_from_value(other_heading))
+      self.class.new(self.radians + other_heading.to_f)
     end
 
     # @param [#to_f] other_heading
@@ -120,7 +120,7 @@ module RTanque
     # @param [#to_f] other_heading
     # @return [RTanque::Heading]
     def *(other_heading)
-      self.class.new(self.radians * self.extract_radians_from_value(other_heading))
+      self.class.new(self.radians * other_heading.to_f)
     end
 
     # @param [#to_f] other_heading
@@ -158,15 +158,5 @@ module RTanque
     def to_degrees
       @memoized[:to_degrees] ||= (self.radians * 180.0) / Math::PI
     end
-
-    protected
-
-    def extract_radians_from_value(value)
-      if value.respond_to?(:radians)
-        value.radians
-      else
-        value.to_f
-      end
-    end
   end
 end

data/lib/rtanque/match.rb

@@ -49,7 +49,7 @@ module RTanque
 
     def pre_shell_tick(shell)
       shell.hits(self.bots.all_but(shell.bot)) do |origin_bot, bot_hit|
-        damage = (shell.fire_power ** RTanque::Shell::RATIO)
+        damage = (shell.fire_power**RTanque::Shell::RATIO)
         bot_hit.reduce_health(damage)
         if bot_hit.dead?
           @explosions.add(Explosion.new(bot_hit.position))

data/lib/rtanque/point.rb

@@ -111,8 +111,8 @@ module RTanque
 
     def move(heading, speed, bound_to_arena = true)
       # round to avoid floating point errors
-      x = RTanque.round((self.x + (Math.sin(heading) * speed)), 10)
-      y = RTanque.round((self.y + (Math.cos(heading) * speed)), 10)
+      x = (self.x + (Math.sin(heading) * speed)).round(10)
+      y = (self.y + (Math.cos(heading) * speed)).round(10)
       self.class.new(x, y, self.arena) { |point| point.bind_to_arena if bound_to_arena }
     end
 

data/lib/rtanque/version.rb

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

data/rtanque.gemspec

@@ -26,6 +26,7 @@ Have fun competing against friends' tanks or the sample ones included. Maybe you
   gem.add_dependency 'configuration', '~> 1.3.2'
   gem.add_dependency 'octokit', '~> 1.23.0'
   gem.add_dependency 'thor', '~> 0.17.0'
+  gem.add_dependency 'texplay'
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rspec', '~> 2.13.0'

data/spec/rtanque/heading_spec.rb

@@ -52,8 +52,8 @@ describe RTanque::Heading do
 
     it 'correctly handles when a and b are on both sides of 180' do
       @instance = described_class.new(RTanque::Heading::S - RTanque::Heading::ONE_DEGREE)
-      delta = RTanque.round(@instance.delta(RTanque::Heading::S + RTanque::Heading::ONE_DEGREE), 5)
-      expected = RTanque.round(RTanque::Heading::ONE_DEGREE * 2, 5)
+      delta = (@instance.delta(RTanque::Heading::S + RTanque::Heading::ONE_DEGREE)).round(5)
+      expected = (RTanque::Heading::ONE_DEGREE * 2).round(5)
       expect(delta).to eq(expected)
     end
   end

data/spec/rtanque_spec.rb

@@ -1,6 +1,34 @@
 require "spec_helper"
 
 describe RTanque do
-  let(:bot){ RTanque::Bot.new(@arena, TestBrain) }
-  # TODO: integration tests
+
+  context 'face-off' do
+    before(:each) {
+      @winner = brain_bot { self.command.fire(RTanque::Bot::MAX_GUN_ENERGY) }
+      @looser = brain_bot { }
+      @winner.position = RTanque::Point.new(0, 0, @arena)
+      @winner.turret.heading = RTanque::Heading.new(RTanque::Heading::N)
+      @looser.position = RTanque::Point.new(0, @arena.height, @arena)
+      @match = RTanque::Match.new(@arena, 1000)
+      @match.add_bots(@winner, @looser)
+    }
+
+    it 'winner bot should win' do
+      @match.start
+      expect(@match.bots.to_a).to eq [@winner]
+      expect(@match.ticks).to be < @match.max_ticks
+      expect(@winner.health).to be(RTanque::Configuration.bot.health.max)
+      expect(@looser.health).to be <= RTanque::Configuration.bot.health.min
+    end
+
+    it 'no bot should win' do
+      @winner.turret.heading = RTanque::Heading.new(RTanque::Heading::E)
+      @match.start
+      expect(@match.bots.to_a).to eq [@winner, @looser]
+      expect(@match.ticks).to be(@match.max_ticks)
+      expect(@winner.health).to be(RTanque::Configuration.bot.health.max)
+      expect(@looser.health).to be(RTanque::Configuration.bot.health.max)
+    end
+  end
+
 end

data/templates/bot.erb

@@ -4,8 +4,14 @@ class <%= @bot_class_name %> < RTanque::Bot::Brain
 
   def tick!
     ## main logic goes here
+    
     # use self.sensors to detect things
+    # See http://rubydoc.info/github/awilliams/RTanque/master/RTanque/Bot/Sensors
+    
     # use self.command to control tank
+    # See http://rubydoc.info/github/awilliams/RTanque/master/RTanque/Bot/Command
+    
     # self.arena contains the dimensions of the arena
+    # See http://rubydoc.info/github/awilliams/RTanque/master/frames/RTanque/Arena
   end
-end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rtanque
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Adam Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: configuration
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,31 +62,41 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: texplay
+  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: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,24 +118,16 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
-description: ! 'RTanque is a game for programmers. Players program the brain of a
-  tank and then send their tank+brain into battle with other tanks. All tanks are
-  otherwise equal.
-
-
-  Rules of the game are simple: Last bot standing wins. Gameplay is also pretty simple.
-  Each tank has a base, turret and radar, each of which rotate independently. The
-  base moves the tank, the turret has a gun mounted to it which can fire at other
-  tanks, and the radar detects other tanks in its field of vision.
+description: |-
+  RTanque is a game for programmers. Players program the brain of a tank and then send their tank+brain into battle with other tanks. All tanks are otherwise equal.
 
+  Rules of the game are simple: Last bot standing wins. Gameplay is also pretty simple. Each tank has a base, turret and radar, each of which rotate independently. The base moves the tank, the turret has a gun mounted to it which can fire at other tanks, and the radar detects other tanks in its field of vision.
 
-  Have fun competing against friends'' tanks or the sample ones included. Maybe you''ll
-  start a small league at your local Ruby meetup.'
+  Have fun competing against friends' tanks or the sample ones included. Maybe you'll start a small league at your local Ruby meetup.
 email:
 - pwnfactory@gmail.com
 executables:
@@ -167,6 +159,7 @@ files:
 - lib/rtanque/explosion.rb
 - lib/rtanque/gui.rb
 - lib/rtanque/gui/bot.rb
+- lib/rtanque/gui/bot/health_color_calculator.rb
 - lib/rtanque/gui/draw_group.rb
 - lib/rtanque/gui/explosion.rb
 - lib/rtanque/gui/shell.rb
@@ -275,27 +268,26 @@ files:
 homepage: https://github.com/awilliams/RTanque
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RTanque is a game for programmers. Players program the brain of a tank and
   then send their tank into battle against other tanks.
 test_files: