rubyhop 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957ec92efc1036be06cb60d23aedad68cf0ad1da
-  data.tar.gz: f7aac31a776fa91c8451d67322acf0f86f09bd2c
+  metadata.gz: 14cab3b2f1ec3a04694a4d96317b67a420eb33bf
+  data.tar.gz: aa1825f9d0bd7c1480bf59d23f3d175e8879140a
 SHA512:
-  metadata.gz: 903d1ebedb4f768e933a46c1e01ccf7b88c5aa14ed53717e5eb781ac02dd320f323dfdc805fc9ebe2a1fa7646427bb472d86d9056c16a767853f2fb6d33f77e8
-  data.tar.gz: fd21aa49f77ccba3f7397692a5200f314f9978ab7d5216030696133cc66936c87e0797610e51b6a5fdc093c48ada750d4007083635f1404af31bd0267f482c0f
+  metadata.gz: 9b1e12acaea1fc4a04d52f459408d3dc9acd443389fb37b6e702738f15b06b899f5366ec94fa40f5cb92aedae187b91891da7541303f50af1bf2351125245073
+  data.tar.gz: c15cc7cbb0c65a011c2281dcc1b48eb01ba62a19e6acfdec62628e8ed54a75034da20de988eb9ba0896e2bd36ec091dbf91f1c9f05fda00b3184fac044a490b7

data/Rakefile

@@ -7,3 +7,8 @@ Hoe.plugin :minitest
 Hoe.spec "rubyhop" do
   developer "Mike Moore", "mike@blowmage.com"
 end
+
+desc "Run the game"
+task :run do
+  `ruby -Ilib -e "require 'rubyhop'; RubyhopGame.new.show"`
+end

data/lib/rubyhop.rb

@@ -28,7 +28,7 @@ class Player
     end
   end
   def start!
-    @x = @window.width/2
+    @x = @window.width/3
     @y = @window.height/2
     @velocity = 0.0
     @alive = true
@@ -101,12 +101,11 @@ class HopLevel
     @window.caption = "Ruby Hop"
     @music = Gosu::Song.new @window, get_my_file("music.mp3")
     @music.play true
-    @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
+    @movement = 3
 
     # Add callback holders
     @fail_callbacks = []
@@ -123,7 +122,7 @@ class HopLevel
 
   def start!
     @score = 0
-    @movement = 2
+    @movement = 3
     @player.start!
     init_hoops!
   end
@@ -140,7 +139,7 @@ class HopLevel
     @hoops.each do |hoop|
       hoop.y = 325
     end
-    hoop_start = 600
+    hoop_start = 400
     @hoops.each do |hoop|
       reset_hoop! hoop
       hoop_start += 200
@@ -163,7 +162,7 @@ class HopLevel
   end
 
   def update
-    @movement += 0.003
+    @movement += 0.0025
     @player.update
     @hoops.each do |hoop|
       hoop.update
@@ -178,18 +177,79 @@ class HopLevel
   end
 
   def draw
-    @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 TitleLevel
+  attr_accessor :window
+  def initialize window
+    @window = window
+    @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,
+                                "Stay alive by hopping!\n" +
+                                "Press SPACE to hop!\n" +
+                                "Press ESCAPE to close.",
+                                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
+    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 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!
@@ -238,7 +298,6 @@ class FailLevel
   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)
@@ -252,27 +311,37 @@ class FailLevel
 end
 
 class RubyhopGame < Gosu::Window
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
   attr_reader :time, :sounds, :score, :high_score
   def initialize width=800, height=600, fullscreen=false
     super
 
     self.caption = 'Ruby Hop'
+    @background = Gosu::Image.new self, get_my_file("background.png")
 
     # Scores
     @score = @high_score = 0
 
     # Levels
-    @hop  = HopLevel.new self
-    @fail = FailLevel.new self
+    @title = TitleLevel.new self
+    @hop   = HopLevel.new   self
+    @fail  = FailLevel.new  self
+
+    @title.on_continue { play! }
+    @title.on_quit     { close }
 
-    @hop.on_fail     { fail! }
-    @hop.on_quit     { close }
+    @hop.on_fail       { fail! }
+    @hop.on_quit       { close }
 
-    @fail.on_continue { play! }
-    @fail.on_quit     { close }
+    @fail.on_continue  { play! }
+    @fail.on_quit      { close }
 
-    play!
+    title!
+  end
+
+  def title!
+    @level = @title
+    @level.start!
   end
 
   def play!
@@ -301,6 +370,7 @@ class RubyhopGame < Gosu::Window
   end
 
   def draw
+    @background.draw 0, 0, 0
     @level.draw
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyhop
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Mike Moore