petermorphose 2.0.1 → 2.0.2

data/README.md

@@ -1,10 +1,17 @@
 # Peter Morphose
 
-http://www.petermorphose.de/
+```bash
+gem install petermorphose
+petermorphose
+```
 
 ## What is Peter Morphose?
 
-Peter Morphose is a jump-and-run-and-survive platformer I wrote between 2000 and 2001, using Borland Delphi and the DelphiX library. It was available only for Windows and only in German. The integrated level editor was popular with fans, but I never managed to build a community site to share those levels. I made some available in a level pack, though.
+Peter Morphose is a jump-and-run-and-survive platformer I wrote between 2000 and 2001, using Borland Delphi and the DelphiX library.
+
+To give you an idea about the style of the game, you can look at the screenshot map of a typical level here: http://www.petermorphose.de/biddy/level/diezweibaeume.png
+
+It was available only for Windows and only in German. The integrated level editor was popular with fans, but I never managed to build a community site to share those levels. I made some available in a level pack, though.
 
 ## What is this repository?
 
@@ -15,7 +22,7 @@ This repository is a work-in-progress rewrite of Peter Morphose using Ruby and G
 * Simplified controls
 * Simplified gameplay
 * Full gamepad support
-* Level compatibility with the original game is retained
+* Level compatibility with the original game is retained (but not all levels are tested & included yet)
 
 ## Why oh why remake such a frustrating game?
 
@@ -24,8 +31,16 @@ This repository is a work-in-progress rewrite of Peter Morphose using Ruby and G
 * Translating from Delphi to Ruby sounded easy enough, given how similar the languages look like.
 * I wanted to have a new toy Ruby game to try to get running in NaCl. I ran out of time just porting the game though.
 
+## References
+
+* The original website, http://www.petermorphose.de/
+* The Gosu gamedev library, http://www.libgosu.org/
+* KaiserBiddy’s German info page, with screenshots of many levels, http://www.petermorphose.de/biddy/
+* Christopher Hauck’s German fansite, with more downloadable levels, http://www.christopherhauck.de/f2_pm.php
+* Its lonely Facebook page I didn’t even know about, https://www.facebook.com/pages/Peter-Morphose/124840104250204
+
 ## But there is still so much wrong about the game!
 
 Feel free to fork it or file issues :)
 
--- Julian
+-- Julian

data/objects.ini

@@ -134,9 +134,9 @@
 20=04010903
 21=02010403
 22=03020605
-23=03040607
-24=03040607
-25=03040607
+23=05050A0A
+24=05050A0A
+25=05050A0A
 26=0405080B
 27=02030406
 28=04030806

data/src/en.yml

@@ -60,3 +60,4 @@
 'Engelsflügel': 'Angel Wings'
 'Henks Haustür!': 'Henk’s front door!'
 'Siebenmeilenstiefel': 'Booster Boots'
+'Feuerpeter': 'Peter on Fire!'

data/src/main.rb

@@ -8,7 +8,6 @@ require_relative 'gosu-preview' # upcoming Gosu 0.8 interface wrapper
 
 # Gosu related polish
 # TODO Proper scaling
-# TODO Packaging as gem
 # TODO Deployment tasks
 # TODO Better resource handling
 
@@ -30,7 +29,8 @@ Dir.chdir File.expand_path("#{__FILE__}/../..")
 
 %w(localization script const helpers/graphics helpers/audio helpers/input
    states/state states/title states/menu states/level_selection states/game
-   objects/object_def objects/game_object objects/living_object objects/collectible_object objects/effect_object
+   objects/object_def objects/game_object objects/living_object
+    objects/collectible_object objects/effect_object
    ini_file level_info map).each { |fn| require_relative fn }
 
 # Not yet part of gosu-preview

data/src/objects/collectible_object.rb

@@ -38,7 +38,7 @@ class CollectibleObject < GameObject
     # Cannot be collected...
     return if game.player.action >= ACT_DEAD
     
-    if collide_with? game.player.rect(2, 2) then
+    if collide_with? game.player.rect(3, 3) then
       case pmid
       when ID_CAROLIN then
         game.cast_objects ID_FX_FLYING_CHAIN, 8, 0, -1, 3, rect(1, -1)

data/src/objects/game_object.rb

@@ -263,8 +263,8 @@ class GameObject
   
   def stuck?
     rect = self.rect
-    map.solid?(rect.left, rect.top) or map.solid?(rect.right, rect.top) or
-      map.solid?(rect.left, rect.bottom) or map.solid?(rect.right, rect.bottom)
+    game.map.solid?(rect.left, rect.top) or game.map.solid?(rect.right, rect.top) or
+      game.map.solid?(rect.left, rect.bottom) or game.map.solid?(rect.right, rect.bottom)
   end
   
   def blocked? direction
@@ -291,39 +291,39 @@ class GameObject
       emit_sound :turbo
       fling 0, -21, 0, true, false
       self.y -= 1 unless blocked? DIR_UP
-      self.x = x / 24 * 24 + 11
+      self.x = x / TILE_SIZE * TILE_SIZE + 11
       self.vx = direction.dir_to_vx if pmid.between? ID_ENEMY, ID_ENEMY_MAX
       game.cast_fx 0, 0, 10, x, y, 24, 24, 0, -10, 1
     when TILE_AIR_ROCKET_UP_LEFT then
       emit_sound :turbo
       self.y -= 1 unless blocked? DIR_UP
       fling -10, -16, 0, true, false
-      self.y = y / TILE_SIZE + TILE_SIZE + 11
+      self.y = y / TILE_SIZE * TILE_SIZE + 11
       TILE_SIZE.times { if stuck? then self.vy -= 1 else break end }
       game.cast_fx 0, 0, 10, x, y, 24, 24, -8, -8, 1
     when TILE_AIR_ROCKET_UP_RIGHT then
       emit_sound :turbo
       self.y -= 1 unless blocked? DIR_UP
       fling +10, -16, 0, true, false
-      self.y = y / TILE_SIZE + TILE_SIZE + 11
+      self.y = y / TILE_SIZE * TILE_SIZE + 11
       TILE_SIZE.times { if stuck? then self.vy -= 1 else break end }
       game.cast_fx 0, 0, 10, x, y, 24, 24, +8, -8, 1
     when TILE_AIR_ROCKET_LEFT then
       emit_sound :turbo
       fling -20, -3, 0, true, false
-      self.y = y / TILE_SIZE + TILE_SIZE + 11
+      self.y = y / TILE_SIZE * TILE_SIZE + 11
       TILE_SIZE.times { if stuck? then self.vy -= 1 else break end }
       game.cast_fx 0, 0, 10, x, y, 24, 24, -10, 0, 1
     when TILE_AIR_ROCKET_RIGHT then
       emit_sound :turbo
       fling +20, -3, 0, true, false
-      self.y = y / TILE_SIZE + TILE_SIZE + 11
+      self.y = y / TILE_SIZE * TILE_SIZE + 11
       TILE_SIZE.times { if stuck? then self.vy -= 1 else break end }
       game.cast_fx 0, 0, 10, x, y, 24, 24, +10, 0, 1
     when TILE_AIR_ROCKET_DOWN then
       emit_sound :turbo
       fling 0, 15, 0, true, false
-      self.y = y / TILE_SIZE + TILE_SIZE + 11
+      self.y = y / TILE_SIZE * TILE_SIZE + 11
       self.vx = direction.dir_to_vx if pmid.between? ID_ENEMY, ID_ENEMY_MAX
       game.cast_fx 0, 0, 10, x, y, 24, 24, -10, 0, 1
     when TILE_SLOW_ROCKET_UP then

data/src/objects/living_object.rb

@@ -554,7 +554,7 @@ class LivingObject < GameObject
     end
   end
   
-  def use_tile
+  def use_everything
     return if busy?
     
     # Lever behind player
@@ -569,6 +569,12 @@ class LivingObject < GameObject
       return
     end
     
+    use_tile
+  end
+  
+  def use_tile
+    return if busy?
+    
     # Tile below player (magic floor tiles)
     case map_tile = game.map[x / TILE_SIZE, (y + ObjectDef[pmid].rect.bottom + 1) / TILE_SIZE]
     when TILE_ROCKET_UP, TILE_ROCKET_UP_2, TILE_ROCKET_UP_3 then

data/src/states/game.rb

@@ -137,7 +137,7 @@ class Game < State
       end
     end
     
-    return if not @result.nil?
+    return if not @result.nil? or @paused
     
     @frame = (@frame + 1) % 2400
     @message_opacity -= 3 if @message_opacity > 0
@@ -226,7 +226,7 @@ class Game < State
     
     if frame > 2 then
       player.jump     if jump_pressed?
-      #player.use_tile if use_pressed?
+      player.use_tile if use_pressed?
       player.act      if action_pressed?
     end
     
@@ -299,10 +299,10 @@ class Game < State
       elsif @paused then
         @paused = false if id == Gosu::KbP
       else
-        @paused = true  if id == Gosu::KbP
-        player.jump     if jump?    id and fly_time_left == 0
-        player.use_tile if use?     id and fly_time_left == 0
-        player.act      if action?  id
+        @paused = true if id == Gosu::KbP
+        player.jump           if jump?    id and fly_time_left == 0
+        player.use_everything if use?     id and fly_time_left == 0
+        player.act            if action?  id
       end
     when :lost then
       if menu_cancel? id then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: petermorphose
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Julian Raschke
@@ -55,6 +55,20 @@ dependencies:
         version: "2.0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: require_relative
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
 - julian@raschke.de