ruby-pong 0.0.2 → 0.0.3

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pong.gemspec
-gemspec
+gem 'arcade'

data/bin/pong

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'gosu'
 require 'ruby-pong'
 
 include Pong
@@ -11,15 +12,77 @@ ball = Ball.new do
   set_x_position 100
   set_y_position 200
 
-  set_velocity Arcade::Velocity[5,7]
+  set_velocity Arcade::Velocity[7,8]
 
   on_hit_edge do |edge|
-    if edge == :top or edge == :bottom
-      self.velocity = self.velocity.reflect_vertically
+    player_paddle   = get_object('player_paddle')
+    opponent_paddle = get_object('opponent_paddle')
+    if edge == :top
+      set_y_position 10
+
+      set_velocity velocity.reflect_vertically
+    end
+
+    if edge == :bottom
+      set_y_position 590
+
+      set_velocity velocity.reflect_vertically
+    end
+
+    if edge == :left
+      opponent_paddle.set_score opponent_paddle.score + 1
+      puts "Score: Player: %d, Opponent: %d" % [player_paddle.score, opponent_paddle.score]
+
+      if opponent_paddle.score >= 5
+        puts "Opponent wins!"
+
+        player_paddle.set_score 0
+        opponent_paddle.set_score 0
+
+        set_x_position 400
+        set_y_position 300
+        set_velocity Arcade::Velocity::ZERO
+      else
+        set_x_position 10
+        set_velocity velocity.reflect_horizontally
+      end
+    end
+
+    if edge == :right
+      player_paddle.set_score player_paddle.score + 1
+      puts "Score: Player: %d, Opponent: %d" % [player_paddle.score, opponent_paddle.score]
+
+      if player_paddle.score >= 5
+        puts "Player wins!"
+
+        player_paddle.set_score 0
+        opponent_paddle.set_score 0
+
+        set_x_position 400
+        set_y_position 300
+        set_velocity Arcade::Velocity::ZERO
+      else
+        set_x_position 790
+        set_velocity velocity.reflect_horizontally
+      end
+
     end
+  end
 
-    if edge == :left or edge == :right
-      self.velocity = self.velocity.reflect_horizontally
+  on_collides_with Paddle do |paddle|
+    if paddle.hit_side == :left or paddle.hit_side == :right
+      # If the ball hit the left or right side of the paddle
+      # bounce away horizontally
+      set_velocity velocity.reflect_horizontally
+    else
+      # If we hit the top or bottom, bounce away vertically
+      set_velocity velocity.reflect_vertically
+    end
+  end
+
+  on_keypress Arcade::Keyboard::KeySpace do
+    if velocity.zero?
+      set_velocity Arcade::Velocity[7,8]
     end
   end
 end
@@ -44,11 +107,18 @@ player_paddle = Paddle.new do
     end
   end
 
-  on_collides_with Ball do |ball|
-    get_object('opponent_paddle').score!
+  on_keypress Arcade::Keyboard::KeyD do
+    if self.right < 400
+      move_right 10
+    end
+  end
 
-    ball.velocity = ball.velocity.reflect_horizontally
+  on_keypress Arcade::Keyboard::KeyA do
+    if self.left > 0
+      move_left 10
+    end
   end
+
 end
 
 opponent_paddle = Paddle.new do
@@ -56,7 +126,7 @@ opponent_paddle = Paddle.new do
 
   set_color Arcade::Color::RED
 
-  set_x_position $main_window.width - self.width - 10
+  set_x_position 780
   set_y_position 10
 
   on_keypress Arcade::Keyboard::KeyUp do
@@ -71,10 +141,16 @@ opponent_paddle = Paddle.new do
     end
   end
 
-  on_collides_with Ball do |ball|
-    get_object('player_paddle').score!
+  on_keypress Arcade::Keyboard::KeyRight do
+    if self.right < 800
+      move_right 10
+    end
+  end
 
-    ball.velocity = ball.velocity.reflect_horizontally
+  on_keypress Arcade::Keyboard::KeyLeft do
+    if self.left > 400
+      move_left 10
+    end
   end
 end
 

data/lib/ruby-pong.rb

@@ -4,8 +4,8 @@ require 'ruby-pong/version'
 module Pong
   class Paddle < Arcade::GameObject
     set_defaults do
-      set_width  15
-      set_height 100
+      self.width  = 15
+      self.height =  100
 
       set_score 0
     end
@@ -19,8 +19,8 @@ module Pong
 
   class Ball < Arcade::GameObject
     set_defaults do
-      set_width  10
-      set_height 10
+      self.width =   10
+      self.height =  10
     end
   end
 end

data/lib/ruby-pong/version.rb

@@ -1,3 +1,3 @@
 module Pong
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pong
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcade
-  requirement: &70162674271220 !ruby/object:Gem::Requirement
+  requirement: &70250247521000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162674271220
+  version_requirements: *70250247521000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70162674270760 !ruby/object:Gem::Requirement
+  requirement: &70250247520580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162674270760
+  version_requirements: *70250247520580
 description: Pong in Ruby, to demonstrate jfarmer's Arcade framework
 email:
 - jesse@20bits.com