rubyhop 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a7bd3e2a2d85f16e6554902f36a25ce939a603
-  data.tar.gz: f5eac8301dbc469bd5f4fcd1cf5ad1aa20021ee3
+  metadata.gz: 957ec92efc1036be06cb60d23aedad68cf0ad1da
+  data.tar.gz: f7aac31a776fa91c8451d67322acf0f86f09bd2c
 SHA512:
-  metadata.gz: ccf0c6b7733f1d431509398cce633582cfcdc40ca1d88a544ba83b3a5831040f10c918bfcbb8c3fb22b677a8fc4313f6e9488d7e48a300cf937a40d6ddae1ad3
-  data.tar.gz: 2d3a1a8cb3f33865d9c73ffa45151fc4fd3ec6cdd32774f3f23c654cade645272ff2ee4b70a6ee53b251a964676321d896a5d7205757f67ba539ebb727bfc7f3
+  metadata.gz: 903d1ebedb4f768e933a46c1e01ccf7b88c5aa14ed53717e5eb781ac02dd320f323dfdc805fc9ebe2a1fa7646427bb472d86d9056c16a767853f2fb6d33f77e8
+  data.tar.gz: fd21aa49f77ccba3f7397692a5200f314f9978ab7d5216030696133cc66936c87e0797610e51b6a5fdc093c48ada750d4007083635f1404af31bd0267f482c0f

data/Manifest.txt

@@ -12,5 +12,6 @@ lib/music.mp3
 lib/rubyguy-dead.png
 lib/rubyguy-fall.png
 lib/rubyguy-rise.png
+lib/rubyguy.png
 lib/rubyhop.rb
 test/test_rubyhop.rb

data/lib/rubyhop.rb

@@ -6,22 +6,20 @@ end
 
 class Player
   attr_accessor :x, :y, :alive
-  def initialize window
-    @window = window
-    @alive  = true
+  def initialize level
+    @level = level
+    @window = @level.window
     # position
-    @x = window.width/2
-    @y = window.height/2
-    @velocity = 0.0
+    start!
     @gravity  = -0.25
     @hop      = 7.5
     # sounds
     @sound    = Gosu::Sample.new @window, get_my_file("hop.mp3")
     @gameover = Gosu::Sample.new @window, get_my_file("gameover.mp3")
     # images
-    @rise = Gosu::Image.new window, get_my_file("rubyguy-rise.png")
-    @fall = Gosu::Image.new window, get_my_file("rubyguy-fall.png")
-    @dead = Gosu::Image.new window, get_my_file("rubyguy-dead.png")
+    @rise = Gosu::Image.new @window, get_my_file("rubyguy-rise.png")
+    @fall = Gosu::Image.new @window, get_my_file("rubyguy-fall.png")
+    @dead = Gosu::Image.new @window, get_my_file("rubyguy-dead.png")
   end
   def hop
     if @alive
@@ -29,6 +27,12 @@ class Player
       @velocity += @hop
     end
   end
+  def start!
+    @x = @window.width/2
+    @y = @window.height/2
+    @velocity = 0.0
+    @alive = true
+  end
   def die!
     if @alive
       # Set velocity to one last hop
@@ -41,11 +45,11 @@ class Player
     @velocity += @gravity
     @y -= @velocity
     if @alive && (@y < 32 || @y > @window.height - 32)
-
+      die!
     end
-    if @y > 5000
+    if @y > 1000
       # kick out to loading screen to try again?
-      @window.close
+      @level.fail!
     end
   end
   def draw
@@ -66,11 +70,11 @@ end
 
 class Hoop
   attr_accessor :x, :y, :active
-  def initialize window
-    @window   = window
-    @hoop  = Gosu::Image.new window, get_my_file("hoop.png")
+  def initialize level
+    @level = level
+    @window   = @level.window
+    @hoop  = Gosu::Image.new @window, get_my_file("hoop.png")
     # center of screen
-    @movement = 2
     @x = @y = 0
     @active = true
   end
@@ -83,26 +87,53 @@ class Hoop
      false
   end
   def update
-    @movement += 0.003
-    @x -= @movement
+    @x -= @level.movement
   end
   def draw
     @hoop.draw @x - 66, @y - 98, 1000 - @x
   end
 end
 
-class RubyhopGame < Gosu::Window
-  VERSION = "1.1.0"
-  def initialize width=800, height=600, fullscreen=false
-    super
-    self.caption = "Ruby Hop"
-    @music = Gosu::Song.new self, get_my_file("music.mp3")
+class HopLevel
+  attr_accessor :window, :movement, :score
+  def initialize window
+    @window = window
+    @window.caption = "Ruby Hop"
+    @music = Gosu::Song.new @window, get_my_file("music.mp3")
     @music.play true
-    @background = Gosu::Image.new self, get_my_file("background.png")
+    @background = Gosu::Image.new @window, get_my_file("background.png")
     @player = Player.new self
     @hoops = 6.times.map { Hoop.new self }
     init_hoops!
+    @font = Gosu::Font.new @window, Gosu::default_font_name, 20
+    @movement = 2
+
+    # Add callback holders
+    @fail_callbacks = []
+    @quit_callbacks = []
+  end
+
+  def on_fail &block
+    @fail_callbacks << block
+  end
+
+  def on_quit &block
+    @quit_callbacks << block
+  end
+
+  def start!
     @score = 0
+    @movement = 2
+    @player.start!
+    init_hoops!
+  end
+
+  def fail!
+    @fail_callbacks.each { |c| c.call }
+  end
+
+  def quit!
+    @quit_callbacks.each { |c| c.call }
   end
 
   def init_hoops!
@@ -127,11 +158,12 @@ class RubyhopGame < Gosu::Window
   end
 
   def button_down id
-    close       if id == Gosu::KbEscape
+    quit!       if id == Gosu::KbEscape
     @player.hop if id == Gosu::KbSpace
   end
 
   def update
+    @movement += 0.003
     @player.update
     @hoops.each do |hoop|
       hoop.update
@@ -141,7 +173,6 @@ class RubyhopGame < Gosu::Window
       if hoop.active && @player.alive && hoop.x < @player.x
         @score += 1
         hoop.active = false
-        self.caption = "Ruby Hop: #{@score}"
       end
     end
   end
@@ -150,5 +181,126 @@ class RubyhopGame < Gosu::Window
     @background.draw 0, 0, 0
     @player.draw
     @hoops.each &:draw
+    @font.draw "Score: #{@score}", 700, 10, 1, 1.0, 1.0, Gosu::Color::RED
+  end
+end
+
+class FailLevel
+  attr_accessor :window
+  def initialize window
+    @window = window
+    @background = Gosu::Image.new @window, get_my_file("background.png")
+    @rubyguy = Gosu::Image.new @window, get_my_file("rubyguy.png")
+
+    create_image!
+
+    # Add callback holders
+    @continue_callbacks = []
+    @quit_callbacks = []
+  end
+
+  def create_image!
+    @msg = Gosu::Image.from_text @window,
+                                "You scored #{@window.score}.\n" +
+                                "Your high score is #{@window.high_score}.\n" +
+                                "Press SPACE if you dare to continue...\n" +
+                                "Or ESCAPE if it is just too much for you.",
+                                Gosu::default_font_name, 24
+    @msg_x = @window.width/2 - @msg.width/2
+    @msg_y = @window.height * 2 / 3
+  end
+
+  def on_continue &block
+    @continue_callbacks << block
+  end
+
+  def on_quit &block
+    @quit_callbacks << block
+  end
+
+  def continue!
+    @continue_callbacks.each { |c| c.call }
+  end
+
+  def quit!
+    @quit_callbacks.each { |c| c.call }
+  end
+
+  def start!
+    create_image!
+  end
+
+  def update
+    quit!     if @window.button_down? Gosu::KbEscape
+    continue! if ( @window.button_down?(Gosu::KbSpace)  ||
+                   @window.button_down?(Gosu::KbReturn) ||
+                   @window.button_down?(Gosu::KbEnter)  )
+  end
+
+  def draw
+    @background.draw 0, 0, 0
+    c = Math.cos(@window.time*4)
+    @rubyguy.draw_rot(((@window.width)/2), ((@window.height)/2 - 80), 1, 0,
+                      0.5, 0.5, 1.0+c*0.1, 1.0+c*0.1)
+    s = Math.sin @window.time
+    @msg.draw_rot( ((@window.width)/2 + (100*(s)).to_i),
+                    ((@window.height)/2 + 160 + s*s*s.abs*50),
+                    1, s*5, 0.5, 0.5,
+                    1.0+(0.1*s*s*s.abs), 1.0+(0.1*s*s*s.abs),
+                    Gosu::Color::RED )
+  end
+end
+
+class RubyhopGame < Gosu::Window
+  VERSION = "1.2.0"
+  attr_reader :time, :sounds, :score, :high_score
+  def initialize width=800, height=600, fullscreen=false
+    super
+
+    self.caption = 'Ruby Hop'
+
+    # Scores
+    @score = @high_score = 0
+
+    # Levels
+    @hop  = HopLevel.new self
+    @fail = FailLevel.new self
+
+    @hop.on_fail     { fail! }
+    @hop.on_quit     { close }
+
+    @fail.on_continue { play! }
+    @fail.on_quit     { close }
+
+    play!
+  end
+
+  def play!
+    @level = @hop
+    @level.start!
+  end
+
+  def fail!
+    @score = @hop.score
+    @high_score = @score if @score > @high_score
+    @level = @fail
+    @level.start!
+  end
+
+  def button_down id
+    @level.button_down id if @level.respond_to? :button_down
+  end
+
+  def button_up id
+    @level.button_up id if @level.respond_to? :button_up
+  end
+
+  def update
+    @time = Time.now.to_f
+    @level.update
+  end
+
+  def draw
+    @level.draw
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyhop
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Moore
@@ -68,6 +68,7 @@ files:
 - lib/rubyguy-dead.png
 - lib/rubyguy-fall.png
 - lib/rubyguy-rise.png
+- lib/rubyguy.png
 - lib/rubyhop.rb
 - test/test_rubyhop.rb
 homepage: http://blowmage.com/rubyhop