ruby_game 0.0.3 → 0.0.4

data/bin/ruby_game

@@ -1,19 +1,39 @@
 #!/usr/bin/env ruby
-
 require File.expand_path('../lib/ruby_game', File.dirname(__FILE__))
-=begin
-RubyGame::MonsterFactory.define :ghost do
-  image 'Ghost'
-  velocity 4
-  actions do
-    15.times {move_up}
-    15.times {move_down}
-  end
+
+RubyGame::Monster.define :ghost1 do
+  image_name "ghost1"
+  velocity 3
+  action :move_up, velocity: 2, repeat: 80
+  action :move_down, velocity: 2, repeat: 80
 end
-=end
+
+RubyGame::Monster.define :ghost2 do
+  image_name "ghost2"
+  action :move_left, velocity: 1, repeat: 160
+  action :move_right, velocity: 4, repeat: 40
+end
+
+RubyGame::Monster.define :ghost3 do
+  image_name "ghost3"
+  velocity 1
+  action :move_up, repeat: 80
+  action :move_left, repeat: 80
+  action :move_down, repeat: 80
+  action :move_right, repeat: 80
+end
+
+RubyGame::Monster.define :dark_knight do
+  image_name "dark_knight"
+  action :forward
+end
+
 game = RubyGame::Game.new(640, 480)
-game.start! do |g|
-  g.player RubyGame::Player.new(590, 420)
-  g.ruby RubyGame::Ruby.new(65, 115)
-  g.monster RubyGame::Monster.new(520, 300)# RubyGame::MonsterFactory.build(:ghost, 3)
+game.start! do
+  player RubyGame::Player.new(590, 420)
+  ruby RubyGame::Ruby.new(65, 115)
+  monsters RubyGame::Monster.build(:ghost1, 2)
+  monsters RubyGame::Monster.build(:ghost2, 2)
+  monsters RubyGame::Monster.build(:ghost3)
+  monsters RubyGame::Monster.build(:dark_knight)
 end

data/lib/ruby_game.rb

@@ -1,13 +1,12 @@
-require_relative 'ruby_game/static_object'
-require_relative 'ruby_game/moving_object'
-require_relative 'ruby_game/player'
-require_relative 'ruby_game/ruby'
-require_relative 'ruby_game/monster'
-#require_relative 'ruby_game/monster_factory'
-require_relative 'ruby_game/game'
-require_relative 'ruby_game/version'
+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/version"
 
 module RubyGame
   ROOT_PATH = File.expand_path('../', File.dirname(__FILE__))
   IMAGES_PATH = File.join(ROOT_PATH, '/app/assets/images')
-end
+end

data/lib/ruby_game/game.rb

@@ -16,16 +16,20 @@ module RubyGame
         @player.move_up if button_down? Gosu::Button::KbUp
         @player.move_down if button_down? Gosu::Button::KbDown
 
-        self.win! if @player.touch?(@ruby)
-        #self.gameover! if @monster.touch?(@player)
+        @monsters.each do |monster|
+          monster.execute(@player)
+          self.gameover! if monster.touch?(@player)
+        end
+
+        self.won! if @player.touch?(@ruby)
       end
     end
 
     def draw
       @background_image.draw(0, 0, 0)
-      @font.draw("Victoire !", 210, 240, 2, 1.0, 1.0, 0xffffff00) if self.won?
+      @font.draw("You won!", 200, 240, 2, 1.0, 1.0, 0xffffff00) if self.won?
       @font.draw("Game Over", 175, 240, 2, 1.0, 1.0, 0xffffff00) if self.gameover?
-      @objects.each {|object| object.draw}
+      ([@ruby, @player] + @monsters).each {|object| object.draw}
     end
 
     def button_down(id)
@@ -33,26 +37,28 @@ module RubyGame
       self.restart! if id == Gosu::Button::KbR
     end
 
+    def monsters(monsters)
+      @monsters += monsters
+    end
 
-    %w(player ruby monster).each do |object|
+    %w(player ruby).each do |object|
       define_method object do |value|
         instance_variable_set("@#{object}", value)
-        @objects << value
       end
     end
 
     def start!(&block)
-      @objects = []
-      @init = block if block
-      @init.call(self)
-      @objects.each {|object| object.init_image(self)}
-      [@player, @monster].compact.each {|moving_object| moving_object.init_limits(width, height, 15, 40)}
+      @monsters = []
+      @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)}
       @state = :run
-      self.show if block
+      self.show if block_given?
     end
     alias_method :restart!, :start!
 
-    def win!
+    def won!
       @state = :won
     end
 

data/lib/ruby_game/monster.rb

@@ -1,8 +1,62 @@
 module RubyGame
   class Monster < MovingObject
-    def initialize(x, y, image_name = 'ghost')
+
+    @@monsters = {}
+    Action = Struct.new(:direction, :velocity)
+
+    def initialize(x = 0, y = 0, image_name = 'ghost')
       super
       @velocity = 3
+      @actions = []
+      @action_index = 0
+    end
+
+    def self.build(name, number = 1)
+      Array.new(number) {@@monsters[name].clone}
+    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)
+    end
+
+    def forward(player)
+      @x += player.x <=> @x
+      @y += player.y <=> @y
+    end
+
+    def self.define(name, &block)
+      monster = Monster.new
+      monster.instance_eval(&block)
+      @@monsters[name] = monster
+    end
+
+    def image_name(image_name)
+      @image_name = image_name
+    end
+
+    def velocity(velocity)
+      @velocity = velocity
+    end
+
+    def action(direction, options = {})
+      opts = {velocity: @velocity, repeat: 1}.merge options
+      @actions += Array.new(opts[:repeat]) {Action.new(direction, opts[:velocity])}
+    end
+
+    def execute(player)
+      next_index = @action_index % @actions.length
+      action = @actions[next_index]
+      default_velocity = @velocity
+      @velocity = action.velocity
+      if action.direction == :forward
+        self.send(action.direction, player)
+      else
+        self.send(action.direction)
+      end
+      @velocity = default_velocity
+      @action_index = next_index + 1
     end
   end
 end

data/lib/ruby_game/moving_object.rb

@@ -1,19 +1,19 @@
 module RubyGame
   class MovingObject < StaticObject
-    def initialize(x, y, image_name = 'player')
+    def initialize(x, y, image_name)
       super
       @velocity = 2
     end
 
-    def touch?(object)
-      Math.hypot(object.x - @x, object.y - @y) <= object.width/2
-    end
-
     def init_limits(max_width, max_height, border_with, border_top_with)
-      @max_width, @max_height, @border_with = max_width, max_height
+      @max_width, @max_height = max_width, max_height
       @border_with, @border_top_with = border_with, border_top_with
     end
 
+    def touch?(object)
+      Math.hypot(object.x - @x, object.y - @y) <= object.width/2
+    end
+
     def move_left
       @x -= @velocity if @x > @border_with + (@image.width/2)
     end

data/lib/ruby_game/static_object.rb

@@ -1,5 +1,4 @@
 require 'forwardable'
-
 module RubyGame
   class StaticObject
     extend Forwardable

data/lib/ruby_game/version.rb

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

data/ruby_game.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/ruby_game/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Matthieu Segret"]
-  gem.email         = ["matthieu.segret@gmail.com"]
+  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.homepage      = "http://formations.humancoders.com/formations/ruby"
@@ -14,7 +14,4 @@ Gem::Specification.new do |gem|
   gem.name          = "ruby_game"
   gem.require_paths = ["lib"]
   gem.version       = RubyGame::VERSION
-  gem.platform      = Gem::Platform::RUBY
-
-  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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: gosu
-  requirement: &70260638433380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70260638433380
+date: 2013-03-18 00:00:00.000000000 Z
+dependencies: []
 description: RubyGame est un jeu pour apprendre à développer avec Ruby
 email:
-- matthieu.segret@gmail.com
+- matthieu@humancoders.com
 executables:
 - ruby_game
 extensions: []
@@ -36,9 +25,15 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/background.png
-- app/assets/images/ghost.png
+- app/assets/images/cactuar.png
+- app/assets/images/dark_knight.png
+- app/assets/images/ghost1.png
+- app/assets/images/ghost2.png
+- app/assets/images/ghost3.png
+- app/assets/images/hornet.png
 - app/assets/images/player.png
 - app/assets/images/ruby.png
+- app/assets/images/undead.png
 - bin/ruby_game
 - lib/ruby_game.rb
 - lib/ruby_game/game.rb