rtanque 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f4b4408532ba416d2572aac6a6173f412fd99a
-  data.tar.gz: 1d4995cb500186090ceb317fac267fb65ea21a3b
+  metadata.gz: b5b5b5c762071e699e291d5fb2eee0b3fbde3969
+  data.tar.gz: 7024d13b01047e8e8ed0108419105e4c6ff00580
 SHA512:
-  metadata.gz: 1461a7bc912bc9eb9546042d6972695d27a1339639c5a6859c05b2799cf229f00fd4987042d750d4d7ba68bf067cd5ab5a551795a1b65c70058e89b0a8cf5689
-  data.tar.gz: 4787e52d89f835655e7ef722d628554bc9bf9371dd4a75e7235cd219d60f72c4b5dd3dc45f871c0372e72a65e57146499684511dac70f39cbbe8944c7c6b2c73
+  metadata.gz: 8e61aa1c443deaaba2127306671699c76e2753d06c911073b71e6811fba2a8975a472b9ac66b3a0b24aa20f7c12922dcf6d0af8c85b67d4cb62cecd0a37c4915
+  data.tar.gz: 30d528d916bf3b267bee41bbc6528d8c0ce2666d19dbb0755b83b673c9f138069773b9c9deb495d8be40c976390bc67ff49b7ee457ae85b8052408a7bf4cba88

data/.ruby-gemset

@@ -0,0 +1 @@
+RTanque

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/README.md

@@ -3,6 +3,8 @@
 **What is this?**
 RTanque is a game for ( *Ruby* ) programmers. Players program the brain of a tank and then send their tank+brain into battle with other tanks. All tanks are otherwise equal.
 
+[Getting started guide](http://awilliams.github.io/articles/rtanque-getting-started/)
+
 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. CLI provides easy way to download bots from gists.
@@ -11,8 +13,11 @@ Sound difficult or time consuming? It's not! Check out the included sample tank
 
 This is not an original idea, see [influences](https://github.com/awilliams/RTanque#influences). There's a lot of resources out there around tank design and tactics that could be applied to RTanque.
 
-How does it look? Here's a [video](https://www.youtube.com/watch?v=G7i5X8pI6dk&hd=1) and screenshot of the game:
-![Battle](https://raw.github.com/awilliams/RTanque/master/screenshots/battle_1.png)
+How does it look? Here's a video of a battle:
+
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=UPBqwOgGlVY
+" target="_blank"><img src="http://img.youtube.com/vi/UPBqwOgGlVY/0.jpg" 
+alt="RTanque Demo" width="640" height="480" border="10" /></a>
 
 #### Influences
 RTanque is based on the Java project [Robocode](http://robocode.sourceforge.net/) and inspired by other Ruby ports. Thanks and credit go to them both.

data/bin/rtanque

@@ -96,10 +96,16 @@ LONGDESC
   end
 
   def download_gist(gist_id, options)
-    gist = Octokit.gist(gist_id)
-    gist.files.values.map do |gist_file|
-      gist_path = "#{BOT_DIR}/#{gist.user.login}.#{gist_id}/#{gist_file.filename}"
-      create_file(gist_path, gist_file.content, options)
+    client = Octokit::Client.new
+    begin
+      gist = client.gist(gist_id)
+    rescue Octokit::NotFound
+      puts set_color("Error! Gist #{gist_id} not found. Please ensure the gist id is correct.", :red)
+    else
+      gist.files.attrs.each do |name, gist_file|
+        gist_path = "#{BOT_DIR}/#{gist.user.login}.#{gist_id}/#{name}"
+        create_file(gist_path, gist_file.content, options)
+      end
     end
   end
 
@@ -108,4 +114,4 @@ LONGDESC
   end
 end
 
-RTanqueCLI.start
+RTanqueCLI.start

data/lib/rtanque/gui/shell.rb

@@ -5,16 +5,27 @@ module RTanque
     class Shell
       attr_reader :shell
 
+      DEBUG = ENV["DEBUG_SHELLS"]
+
       def initialize(window, shell)
         @window = window
         @shell = shell
+        @x0 = shell.position.x
+        @y0 = @window.height - shell.position.y
         @shell_image = Gosu::Image.new(@window, Gui.resource_path("images/bullet.png"))
       end
 
       def draw
         position = [self.shell.position.x, @window.height - self.shell.position.y]
         @shell_image.draw_rot(position[0], position[1], ZOrder::SHELL, 0, 0.5, 0.5)
+
+        if DEBUG then
+          white  = Gosu::Color::WHITE
+          pos = shell.position
+          x1, y1 = pos.x, @window.height - pos.y
+          @window.draw_line @x0, @y0, white, x1, y1, white, ZOrder::SHELL
+        end
       end
     end
   end
-end
+end

data/lib/rtanque/gui/window.rb

@@ -26,6 +26,8 @@ module RTanque
         super(@arena.width, @arena.height, false, UPDATE_INTERVAL)
         self.caption = self.class.name.split('::').first
         @background = Gosu::Image.new(self, Gui.resource_path("images/grass.png"))
+
+        @draw_procs = []
       end
 
       def update
@@ -46,7 +48,17 @@ module RTanque
         self.gui_bots.draw
         self.gui_shells.draw
         self.gui_explosions.draw
+
+        @draw_procs.each do |proc|
+          proc.call self
+        end
+
+        @draw_procs.clear
+      end
+
+      def add_draw_proc &b
+        @draw_procs << b
       end
     end
   end
-end
+end

data/lib/rtanque/match.rb

@@ -16,6 +16,10 @@ module RTanque
       @stopped = false
     end
 
+    def teams=(bool)
+      @teams = bool
+    end
+
     def max_ticks_reached?
       self.max_ticks && self.ticks >= self.max_ticks
     end

data/lib/rtanque/version.rb

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

data/rtanque.gemspec

@@ -24,7 +24,7 @@ Have fun competing against friends' tanks or the sample ones included. Maybe you
 
   gem.add_dependency 'gosu', '~> 0.7.45'
   gem.add_dependency 'configuration', '~> 1.3.2'
-  gem.add_dependency 'octokit', '~> 1.23.0'
+  gem.add_dependency 'octokit', '~> 2.7.0'
   gem.add_dependency 'thor', '~> 0.17.0'
   gem.add_dependency 'texplay'
 

data/spec/rtanque/match_spec.rb

@@ -28,6 +28,7 @@ describe RTanque::Match do
     end
 
     it 'should be true if two or more bots left w/ same name' do
+      @instance.teams = true
       bot1 = double('bot', :name => "bot1")
       bot2 = double('bot', :name => "bot1")
       @instance.add_bots(bot1, bot2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtanque
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Adam Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -285,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: RTanque is a game for programmers. Players program the brain of a tank and
@@ -300,4 +301,3 @@ test_files:
 - spec/rtanque/shell_spec.rb
 - spec/rtanque_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.rvmrc

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-2.0.0@RTanque"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.17.2 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi