ruby_game 0.0.4 → 0.0.5

data/bin/ruby_game

@@ -3,9 +3,8 @@ require File.expand_path('../lib/ruby_game', File.dirname(__FILE__))
 
 RubyGame::Monster.define :ghost1 do
   image_name "ghost1"
-  velocity 3
-  action :move_up, velocity: 2, repeat: 80
-  action :move_down, velocity: 2, repeat: 80
+  action :move_up, velocity: 4, repeat: 40
+  action :move_down, repeat: 80
 end
 
 RubyGame::Monster.define :ghost2 do
@@ -25,10 +24,10 @@ end
 
 RubyGame::Monster.define :dark_knight do
   image_name "dark_knight"
-  action :forward
+  action :forward, velocity: 1
 end
 
-game = RubyGame::Game.new(640, 480)
+game = RubyGame::Game.new
 game.start! do
   player RubyGame::Player.new(590, 420)
   ruby RubyGame::Ruby.new(65, 115)

data/lib/ruby_game.rb

@@ -2,8 +2,8 @@ require_relative "ruby_game/static_object"
 require_relative "ruby_game/moving_object"
 require_relative "ruby_game/ruby"
 require_relative "ruby_game/player"
-require_relative "ruby_game/monster"
 require_relative "ruby_game/game"
+require_relative "ruby_game/monster"
 require_relative "ruby_game/version"
 
 module RubyGame

data/lib/ruby_game/game.rb

@@ -2,10 +2,10 @@ require 'gosu'
 
 module RubyGame
   class Game < Gosu::Window
-    def initialize(width, height)
-      super(width, height, false)
+    def initialize
+      super(640, 480, false)
       self.caption = "Ruby Game"
-      @background_image = Gosu::Image.new(self, File.join(RubyGame::IMAGES_PATH, 'background.png'), true)
+      @background_image = Gosu::Image.new(self, File.join(IMAGES_PATH, 'background.png'), true)
       @font = Gosu::Font.new(self, Gosu::default_font_name, 60)
     end
 
@@ -33,7 +33,7 @@ module RubyGame
     end
 
     def button_down(id)
-      close if id == Gosu::Button::KbEscape
+      self.close if id == Gosu::Button::KbEscape
       self.restart! if id == Gosu::Button::KbR
     end
 
@@ -52,7 +52,7 @@ module RubyGame
       @init = block if block_given?
       self.instance_eval(&@init)
       ([@ruby, @player] + @monsters).each {|object| object.init_image(self)}
-      ([@player] + @monsters).each {|moving_object| moving_object.init_limits(width, height, 15, 40)}
+      ([@player] + @monsters).each {|object| object.init_limits(width, height, 15, 40)}
       @state = :run
       self.show if block_given?
     end

data/lib/ruby_game/monster.rb

@@ -4,11 +4,9 @@ module RubyGame
     @@monsters = {}
     Action = Struct.new(:direction, :velocity)
 
-    def initialize(x = 0, y = 0, image_name = 'ghost')
+    def initialize(x = 0, y = 0, image_name = 'ghost1')
       super
-      @velocity = 3
       @actions = []
-      @action_index = 0
     end
 
     def self.build(name, number = 1)
@@ -16,14 +14,14 @@ module RubyGame
     end
 
     def init_limits(max_width, max_height, border_with, border_top_with)
-      super
-      @x = rand border_top_with..(max_width - 2*border_top_with)
-      @y = rand border_top_with..(max_height - 2*border_top_with)
+       super
+       @x = rand border_top_with..(max_width - 2*border_top_with)
+       @y = rand border_top_with..(max_height - 2*border_top_with)
     end
 
-    def forward(player)
-      @x += player.x <=> @x
-      @y += player.y <=> @y
+    def forward(player, velocity = @velocity)
+      @x += (player.x <=> @x) * velocity
+      @y += (player.y <=> @y) * velocity
     end
 
     def self.define(name, &block)
@@ -46,17 +44,13 @@ module RubyGame
     end
 
     def execute(player)
-      next_index = @action_index % @actions.length
-      action = @actions[next_index]
-      default_velocity = @velocity
-      @velocity = action.velocity
+      @actions_enum ||= @actions.cycle
+      action = @actions_enum.next
       if action.direction == :forward
-        self.send(action.direction, player)
+        self.send(action.direction, player, action.velocity)
       else
-        self.send(action.direction)
+        self.send(action.direction, action.velocity)
       end
-      @velocity = default_velocity
-      @action_index = next_index + 1
     end
   end
 end

data/lib/ruby_game/moving_object.rb

@@ -14,20 +14,20 @@ module RubyGame
       Math.hypot(object.x - @x, object.y - @y) <= object.width/2
     end
 
-    def move_left
-      @x -= @velocity if @x > @border_with + (@image.width/2)
+    def move_left(velocity = @velocity)
+      @x -= velocity if @x > @border_with + (@image.width/2)
     end
 
-    def move_right
-      @x += @velocity if @x < @max_width - @border_with - (@image.width/2)
+    def move_right(velocity = @velocity)
+      @x += velocity if @x < @max_width - @border_with - (@image.width/2)
     end
 
-    def move_up
-      @y -= @velocity if @y > @border_with + @border_top_with + (@image.height/2)
+    def move_up(velocity = @velocity)
+      @y -= velocity if @y > @border_with + @border_top_with + (@image.height/2)
     end
 
-    def move_down
-      @y += @velocity if @y < @max_height - @border_with - (@image.height/2)
+    def move_down(velocity = @velocity)
+      @y += velocity if @y < @max_height - @border_with - (@image.height/2)
     end
   end
 end

data/lib/ruby_game/static_object.rb

@@ -11,7 +11,7 @@ module RubyGame
     end
 
     def init_image(window)
-      @image = Gosu::Image.new(window, File.join(RubyGame::IMAGES_PATH, "#{@image_name}.png"), true)
+      @image = Gosu::Image.new(window, File.join(IMAGES_PATH, "#{@image_name}.png"), true)
     end
 
     def draw

data/lib/ruby_game/version.rb

@@ -1,3 +1,3 @@
 module RubyGame
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/ruby_game.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/ruby_game/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Matthieu Segret"]
   gem.email         = ["matthieu@humancoders.com"]
-  gem.description   = %q{RubyGame est un jeu pour apprendre à développer avec Ruby}
-  gem.summary       = %q{RubyGame est un jeu pour apprendre à développer avec Ruby}
+  gem.description   = %q{Ruby Game est un jeu pour apprendre à développer avec Ruby}
+  gem.summary       = %q{Ruby Game est un jeu pour apprendre à développer avec Ruby}
   gem.homepage      = "http://formations.humancoders.com/formations/ruby"
 
   gem.files         = `git ls-files`.split($\)
@@ -14,4 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "ruby_game"
   gem.require_paths = ["lib"]
   gem.version       = RubyGame::VERSION
+
+  gem.add_dependency "gosu"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_game
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
-dependencies: []
-description: RubyGame est un jeu pour apprendre à développer avec Ruby
+date: 2013-03-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gosu
+  requirement: &70292594326840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70292594326840
+description: Ruby Game est un jeu pour apprendre à développer avec Ruby
 email:
 - matthieu@humancoders.com
 executables:
@@ -67,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: RubyGame est un jeu pour apprendre à développer avec Ruby
+summary: Ruby Game est un jeu pour apprendre à développer avec Ruby
 test_files: []
 has_rdoc: