carpet_diem 0.0.3 → 0.0.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af6f768ae176508c2eb4b43b1fa5c0232159b7e
-  data.tar.gz: c694676c111392c1503f3731d0d0bdf5bbba94c9
+  metadata.gz: b021da3ff4910596c31bbae20116330fb02dca00
+  data.tar.gz: be6451e867151eac95c0ed7c90b53a61230126ed
 SHA512:
-  metadata.gz: 55ef62d622a9a35136d6069931b1876be96332dcee19c932a22768e0b4e72ebe924166e72ac801616ab925326bb471cd0534baa58dee0a8db9b23e5ef398bab0
-  data.tar.gz: 7812892c5938f910e2a179bdabe0010b6088cdabd6481b61a6184d77238ba134d68bc6237dd8ff88933e71de0e9419e20165b32baaffd7b8b2c495a38200bec4
+  metadata.gz: 3e0b63b7c1d8abd400f21fe601be2716b1039ae97edcaf55d559e1b837985de72f3b65e39cb942862ff8b90fbc3b01fbf6a93ccb9112bcdc45ebfea197259c87
+  data.tar.gz: 3bf022a4db645ee5c12b2fa321ca939221a5ea65cd401560ce1712fc9aca4f337ed8b915e8a9b4d36e5ffa58245c70f6fc26788d4262dc84a5f4bc08a8187a89

data/carpet_diem.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'carpet_diem'
-  s.version     = '0.0.3'
+  s.version     = '0.0.4.pre'
   s.licenses    = ['MIT']
   s.summary     = "A Gosu game about a flying carpet"
   s.description = "Be a flying carpet that hovers through the clouds. On your way up you will encounter magic lamps. Rub them to see if a good or an evil genie is hidden inside, the one adding points to your score, the other being your worst enemy!"
@@ -11,10 +11,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/RapidRailsGirls/carpet-diem'
   s.executables = %w[carpet_diem]
   s.add_runtime_dependency 'gosu', '0.7.50'
-  s.add_runtime_dependency 'texplay'
-  s.add_runtime_dependency 'chingu'
+  s.add_runtime_dependency 'texplay', '~> 0.4'
+  s.add_runtime_dependency 'chingu', '~> 0.8'
 
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'pry'
+
+  s.required_ruby_version = '>= 1.9.3'
 
 end

data/lib/carpet.rb

@@ -9,7 +9,7 @@ class Carpet
   alias :image :carpet_image
   undef :carpet_image
 
-  def initialize(window, carpet_image_file = 'media/carpet.png', carpet_image_flipped_file = 'media/carpet_flipped.png')
+  def initialize(window, carpet_image_file = 'lib/media/carpet.png', carpet_image_flipped_file = 'lib/media/carpet_flipped.png')
     @carpet_image = @carpet_image_right = Gosu::Image.new(window, carpet_image_file)
     @carpet_image_left = Gosu::Image.new(window, carpet_image_flipped_file)
     @window = window
@@ -57,25 +57,25 @@ class Carpet
   def overlapping_pixels(object)
     if left < object.left
       box_left = object.left
-      if right < object.right
+      if right < object.right * object.scale
         box_width = right - object.left
       else
-        box_width = object.width
+        box_width = object.width * object.scale
       end
     else
-      box_width = object.right - left
+      box_width = object.right * object.scale - left
       box_left = left
     end
     if top < object.top
       box_top = object.top
-      if bottom < object.bottom
+      if bottom < object.bottom * object.scale
         box_height = bottom - object.top
       else
-        box_height = object.height
+        box_height = object.height * object.scale
       end
     else
       box_top = top
-      box_height = object.bottom - top
+      box_height = object.bottom * object.scale - top
     end
     pixels(box_left, box_top, box_width, box_height)
   end

data/lib/endboss.rb

@@ -1,10 +1,13 @@
 class Endboss
+attr_reader :endboss
 
   def initialize(window)
-    @image = Gosu::Image.new(window, 'media/endboss.png')
+    @image = Gosu::Image.new(window, 'lib/media/endboss.png')
     @x = window.width/2 - @image.width/2
     @y = window.height
     @scale = 0.0
+    @sound = Gosu::Sample.new(window, 'lib/media/evil_laughter.m4a')
+    @laughs = false
   end
 
   def draw
@@ -12,4 +15,9 @@ class Endboss
     @image.draw(@x, @y - 750 * @scale, 3, @scale, @scale)
   end
 
+  def laugh!
+    return @laughs if @laughs
+    @laughs = true
+    @sound.play
+  end
 end

data/lib/lamp_with_genie.rb

@@ -5,17 +5,18 @@ class LampWithGenie
 
   class Lamp
     include Positionable
-    attr_reader :image
+    attr_reader :image, :scale
 
     def initialize(window, flipped)
       if flipped
-        @image = Gosu::Image.new(window, 'media/lamp_flipped.png')
+        @image = Gosu::Image.new(window, 'lib/media/lamp_flipped.png')
       else
-        @image = Gosu::Image.new(window, 'media/lamp.png')
+        @image = Gosu::Image.new(window, 'lib/media/lamp.png')
       end
-      @sound = Gosu::Sample.new(window, 'media/lamp.m4a')
+      @sound = Gosu::Sample.new(window, 'lib/media/lamp.m4a')
       @rubbed = false
       @y = -@image.height
+      @scale = 1
     end
 
     def draw
@@ -36,13 +37,13 @@ class LampWithGenie
 
   class Genie
     include Positionable
-    attr_reader :image
+    attr_reader :image, :scale
     PADDING = 15
     def initialize(window, flipped, lamp)
       prefix = good? ? 'good' : 'evil'
       suffix = '_flipped' if flipped
-      @image = Gosu::Image.new(window, "media/#{prefix}_genie#{suffix}.png")
-      @sound = Gosu::Sample.new(window, "media/#{prefix}_genie.m4a")
+      @image = Gosu::Image.new(window, "lib/media/#{prefix}_genie#{suffix}.png")
+      @sound = Gosu::Sample.new(window, "lib/media/#{prefix}_genie.m4a")
       @lamp = lamp
       @y = -@image.height
       @flipped = flipped

data/lib/window.rb

@@ -50,6 +50,7 @@ class Window < Gosu::Window
       end
     else
       @endboss = Endboss.new(self) if @endboss.nil? && @genielamps.empty?
+      @endboss.laugh! if @endboss
     end
     scroll_lamps
     @genielamps.each do |genielamp|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carpet_diem
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.pre
 platform: ruby
 authors:
 - Brigitte Markmann
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -29,30 +29,30 @@ dependencies:
   name: texplay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: chingu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +67,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Be a flying carpet that hovers through the clouds. On your way up you
   will encounter magic lamps. Rub them to see if a good or an evil genie is hidden
   inside, the one adding points to your score, the other being your worst enemy!
@@ -103,6 +89,7 @@ files:
 - lib/media/evil_genie.m4a
 - lib/media/evil_genie.png
 - lib/media/evil_genie_flipped.png
+- lib/media/evil_laughter.m4a
 - lib/media/good_genie.m4a
 - lib/media/good_genie.png
 - lib/media/good_genie_flipped.png
@@ -125,12 +112,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14