Permalink
Browse files

added music for level5

  • Loading branch information...
1 parent cece754 commit e097bfd5708a85a1dd083820c7e9abb476cc0413 @mattetti committed Jan 10, 2010
Showing with 44 additions and 25 deletions.
  1. +3 −3 image_layer.rb
  2. +15 −18 modules/game_config.rb
  3. +24 −4 phileas_frog.xcodeproj/project.pbxproj
  4. +2 −0 rb_main.rb
  5. BIN sounds/level_5.mp3
View
@@ -102,10 +102,10 @@ def update
angle = item.angle
visible = item.visible
- self.bounds = CGRectMake(0, 0, @width, @height)
- self.position = CGPointMake(@x, @y)
+ self.bounds = CGRectMake(0, 0, @width, @height)
+ self.position = CGPointMake(@x, @y)
self.transform = CATransform3DMakeRotation(angle, 0, 0, 1.0)
- self.hidden = !visible
+ self.hidden = !visible
end
# for debugging purposes
View
@@ -22,7 +22,7 @@ module GameConfig
module_function
def starting_lives
- 5
+ 7
end
def data
@@ -63,30 +63,27 @@ def data
{ :name => 'hiphop',
:rubies => 2,
:bombs => 5,
- :score_limit => 999999,
+ :score_limit => 550,
:vehicle => 'skate',
:bomb_image => 'coke',
:bomb_ratio => 0.67,
:ruby_ratio => 1.5,
:player_width => 0.18,
:player_height => 0.2
- }
+ },
+ { :name => 'Disco',
+ :rubies => 2,
+ :bombs => 5,
+ :score_limit => 9999999,
+ :vehicle => nil,
+ :bomb_image => 'disco_ball',
+ :bomb_ratio => 0.93,
+ :ruby_ratio => 1.5,
+ :player_width => 0.2,
+ :player_height => 0.25
+ }
]
}
end
-end
-
-
-
-# { :name => 'Disco',
-# :rubies => 2,
-# :bombs => 5,
-# :score_limit => 9999999,
-# :vehicle => nil,
-# :bomb_image => 'disco_ball',
-# :bomb_ratio => 0.93,
-# :ruby_ratio => 1.5,
-# :player_width => 0.2,
-# :player_height => 0.25
-# }
+end
@@ -28,6 +28,11 @@
2B36B4181062115D008347E0 /* falling_ruby.rb in Resources */ = {isa = PBXBuildFile; fileRef = 2B36B4171062115D008347E0 /* falling_ruby.rb */; };
2B47099710B7452A0074E6F0 /* heart.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B47099610B7452A0074E6F0 /* heart.pdf */; };
2B4709B410B746ED0074E6F0 /* asteroid.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B4709B310B746ED0074E6F0 /* asteroid.pdf */; };
+ 2B470A2310B8723B0074E6F0 /* background_level_5.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B470A2010B8723B0074E6F0 /* background_level_5.pdf */; };
+ 2B470A2410B8723B0074E6F0 /* disco_ball.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B470A2110B8723B0074E6F0 /* disco_ball.pdf */; };
+ 2B470A2510B8723B0074E6F0 /* frog_level_5.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B470A2210B8723B0074E6F0 /* frog_level_5.pdf */; };
+ 2B470A2710B872430074E6F0 /* splash_5.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B470A2610B872430074E6F0 /* splash_5.pdf */; };
+ 2B470A2910B8724A0074E6F0 /* level_5.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 2B470A2810B8724A0074E6F0 /* level_5.mp3 */; };
2B5F663B10AD21D9007A6C17 /* ns_button.rb in Resources */ = {isa = PBXBuildFile; fileRef = 2B5F663A10AD21D9007A6C17 /* ns_button.rb */; };
2B6C306410B1DB7E00325E82 /* background_level_1.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B6C304710B1DB7E00325E82 /* background_level_1.pdf */; };
2B6C306510B1DB7E00325E82 /* background_level_2.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 2B6C304810B1DB7E00325E82 /* background_level_2.pdf */; };
@@ -94,6 +99,11 @@
2B36B4171062115D008347E0 /* falling_ruby.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = falling_ruby.rb; sourceTree = "<group>"; };
2B47099610B7452A0074E6F0 /* heart.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = heart.pdf; sourceTree = "<group>"; };
2B4709B310B746ED0074E6F0 /* asteroid.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = asteroid.pdf; sourceTree = "<group>"; };
+ 2B470A2010B8723B0074E6F0 /* background_level_5.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = background_level_5.pdf; path = disco_level/background_level_5.pdf; sourceTree = SOURCE_ROOT; };
+ 2B470A2110B8723B0074E6F0 /* disco_ball.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = disco_ball.pdf; path = disco_level/disco_ball.pdf; sourceTree = SOURCE_ROOT; };
+ 2B470A2210B8723B0074E6F0 /* frog_level_5.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = frog_level_5.pdf; path = disco_level/frog_level_5.pdf; sourceTree = SOURCE_ROOT; };
+ 2B470A2610B872430074E6F0 /* splash_5.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = splash_5.pdf; path = disco_level/splash_5.pdf; sourceTree = SOURCE_ROOT; };
+ 2B470A2810B8724A0074E6F0 /* level_5.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = level_5.mp3; path = disco_level/level_5.mp3; sourceTree = SOURCE_ROOT; };
2B5F663A10AD21D9007A6C17 /* ns_button.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = ns_button.rb; sourceTree = "<group>"; };
2B6C304710B1DB7E00325E82 /* background_level_1.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = background_level_1.pdf; sourceTree = "<group>"; };
2B6C304810B1DB7E00325E82 /* background_level_2.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = background_level_2.pdf; sourceTree = "<group>"; };
@@ -136,12 +146,12 @@
2B75C4231067663A009E255F /* keyboard_control_view.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = keyboard_control_view.rb; sourceTree = "<group>"; };
2B75C4311067667F009E255F /* rb_main.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = rb_main.rb; sourceTree = "<group>"; };
2B935D82103FBB6800B50D72 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+ 2B93D12D10D1E2EE0059D1A9 /* phileas_frog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = phileas_frog.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BBE0E5010564E92002B4E39 /* player.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = player.rb; sourceTree = "<group>"; };
2BD5639C1069C9C9005C2DCF /* vehicle.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = vehicle.rb; sourceTree = "<group>"; };
2BE3A9EC1081CD98005F562A /* phileas.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = phileas.icns; sourceTree = "<group>"; };
4DE3BE130D8651D900ECA448 /* MacRuby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MacRuby.framework; path = /Library/Frameworks/MacRuby.framework; sourceTree = "<absolute>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 8D1107320486CEB800E47090 /* phileas_frog.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = phileas_frog.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -195,7 +205,7 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
- 8D1107320486CEB800E47090 /* phileas_frog.app */,
+ 2B93D12D10D1E2EE0059D1A9 /* phileas_frog.app */,
);
name = Products;
sourceTree = "<group>";
@@ -256,6 +266,10 @@
2B6C304610B1DB7E00325E82 /* graphics */ = {
isa = PBXGroup;
children = (
+ 2B470A2010B8723B0074E6F0 /* background_level_5.pdf */,
+ 2B470A2610B872430074E6F0 /* splash_5.pdf */,
+ 2B470A2110B8723B0074E6F0 /* disco_ball.pdf */,
+ 2B470A2210B8723B0074E6F0 /* frog_level_5.pdf */,
2B4709B310B746ED0074E6F0 /* asteroid.pdf */,
2B47099610B7452A0074E6F0 /* heart.pdf */,
2B6C309410B1DCC300325E82 /* fullscreen.pdf */,
@@ -302,6 +316,7 @@
2B6C308D10B1DC8800325E82 /* sounds */ = {
isa = PBXGroup;
children = (
+ 2B470A2810B8724A0074E6F0 /* level_5.mp3 */,
2B6C314810B52C5000325E82 /* level_4.mp3 */,
2B6C308E10B1DC8800325E82 /* level_1.mp3 */,
2B6C308F10B1DC8800325E82 /* level_2.mp3 */,
@@ -340,7 +355,7 @@
name = PhileasFrog;
productInstallPath = "$(HOME)/Applications";
productName = ruby_land;
- productReference = 8D1107320486CEB800E47090 /* phileas_frog.app */;
+ productReference = 2B93D12D10D1E2EE0059D1A9 /* phileas_frog.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -419,6 +434,11 @@
2B6C314910B52C5000325E82 /* level_4.mp3 in Resources */,
2B47099710B7452A0074E6F0 /* heart.pdf in Resources */,
2B4709B410B746ED0074E6F0 /* asteroid.pdf in Resources */,
+ 2B470A2310B8723B0074E6F0 /* background_level_5.pdf in Resources */,
+ 2B470A2410B8723B0074E6F0 /* disco_ball.pdf in Resources */,
+ 2B470A2510B8723B0074E6F0 /* frog_level_5.pdf in Resources */,
+ 2B470A2710B872430074E6F0 /* splash_5.pdf in Resources */,
+ 2B470A2910B8724A0074E6F0 /* level_5.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -436,7 +456,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# The macruby_deploy command-line tool will make sure your app will embed the MacRuby framework. Default options will be used. Pass the -h option to get more details.\nPATH=\"$PATH:/usr/local/bin\" macruby_deploy \"$TARGET_BUILD_DIR/$PROJECT_NAME.app\" --embed --no-stdlib --compile";
+ shellScript = "# The macruby_deploy command-line tool will make sure your app will embed the MacRuby framework. Default options will be used. Pass the -h option to get more details.\nPATH=\"$PATH:/usr/local/bin\" macruby_deploy \"$TARGET_BUILD_DIR/$PROJECT_NAME.app\" --no-stdlib --compile --embed";
};
/* End PBXShellScriptBuildPhase section */
View
@@ -21,6 +21,8 @@
framework 'Cocoa'
framework 'QuartzCore'
+puts NSBundle.mainBundle.localizations
+
# Loading all the Ruby project files.
dir_path = NSBundle.mainBundle.resourcePath.fileSystemRepresentation
$LOAD_PATH.unshift(dir_path)
View
Binary file not shown.

0 comments on commit e097bfd

Please sign in to comment.