8 files changed, 158 insertions, 1 deletions

@@ -105,6 +105,10 @@
                 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; };
                 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFDF13FC2708002B21AF /* tutorial.png */; };
                 6C39CFE213FC2713002B21AF /* tutorial2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE113FC2713002B21AF /* tutorial2.png */; };
+                6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C39CFE413FC4635002B21AF /* JumpGameMode.m */; };
+                6C39CFE713FC46CD002B21AF /* water.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE613FC46CD002B21AF /* water.png */; };
+                6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFE813FC8AC4002B21AF /* jump2.png */; };
+                6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C39CFEA13FC8ACA002B21AF /* jump.png */; };
                 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; };
                 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */; };
                 6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC89DDE13F31413003704F7 /* TutorialMode.m */; };
@@ -411,6 +415,11 @@
                 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; };
                 6C39CFDF13FC2708002B21AF /* tutorial.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial.png; sourceTree = "<group>"; };
                 6C39CFE113FC2713002B21AF /* tutorial2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tutorial2.png; sourceTree = "<group>"; };
+                6C39CFE313FC4635002B21AF /* JumpGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpGameMode.h; sourceTree = "<group>"; };
+                6C39CFE413FC4635002B21AF /* JumpGameMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JumpGameMode.m; sourceTree = "<group>"; };
+                6C39CFE613FC46CD002B21AF /* water.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = water.png; sourceTree = "<group>"; };
+                6C39CFE813FC8AC4002B21AF /* jump2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump2.png; sourceTree = "<group>"; };
+                6C39CFEA13FC8ACA002B21AF /* jump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = jump.png; sourceTree = "<group>"; };
                 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; };
                 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
                 6CC89DDD13F31413003704F7 /* TutorialMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialMode.h; sourceTree = "<group>"; };
@@ -729,6 +738,7 @@
                 3F6C7F4D13D647B600C038FE /* Sprites */ = {
                         isa = PBXGroup;
                         children = (
+                                6C39CFE613FC46CD002B21AF /* water.png */,
                                 6C29041113EAEC8A0032DA0F /* framestuff.png */,
                                 3F6C7EE013D636BE00C038FE /* rock.png */,
                                 3F63FA3E13D4EE53003B3D14 /* oneup.png */,
@@ -765,6 +775,8 @@
                 3F7D0EC713D8E6B000B6CE14 /* Buttons */ = {
                         isa = PBXGroup;
                         children = (
+                                6C39CFEA13FC8ACA002B21AF /* jump.png */,
+                                6C39CFE813FC8AC4002B21AF /* jump2.png */,
                                 6C39CFE113FC2713002B21AF /* tutorial2.png */,
                                 6C39CFDF13FC2708002B21AF /* tutorial.png */,
                                 3F7D0F4813D8F17C00B6CE14 /* highscores.png */,
@@ -871,6 +883,8 @@
                                 3FE79CD313D4DE37001A6B93 /* ClassicGameMode.m */,
                                 6CC89DDD13F31413003704F7 /* TutorialMode.h */,
                                 6CC89DDE13F31413003704F7 /* TutorialMode.m */,
+                                6C39CFE313FC4635002B21AF /* JumpGameMode.h */,
+                                6C39CFE413FC4635002B21AF /* JumpGameMode.m */,
                         );
                         name = "Game Modes";
                         sourceTree = "<group>";
@@ -1363,6 +1377,9 @@
                                 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */,
                                 6C39CFE013FC2708002B21AF /* tutorial.png in Resources */,
                                 6C39CFE213FC2713002B21AF /* tutorial2.png in Resources */,
+                                6C39CFE713FC46CD002B21AF /* water.png in Resources */,
+                                6C39CFE913FC8AC4002B21AF /* jump2.png in Resources */,
+                                6C39CFEB13FC8ACA002B21AF /* jump.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -1407,6 +1424,7 @@
                                 6C0C141113F2099B003A31B2 /* Cart.m in Sources */,
                                 6C0C141413F20E98003A31B2 /* GameMode.m in Sources */,
                                 6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */,
+                                6C39CFE513FC4635002B21AF /* JumpGameMode.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -0,0 +1,21 @@
+//
+//  JumpGameMode.h
+//  Cart Collect
+//
+//  Created by Starla Insigna on 8/17/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "GameMode.h"
+
+@interface JumpGameMode : GameMode <CCStandardTouchDelegate> {
+    CCSprite* water;
+    int waterTick;
+    BOOL wave;
+    CGPoint gestureStartPoint;
+    int jumpTick;
+    BOOL jump;
+    float swipeVarianceModifer;
+}
+
+@end
@@ -0,0 +1,110 @@
+//
+//  JumpGameMode.m
+//  Cart Collect
+//
+//  Created by Starla Insigna on 8/17/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "JumpGameMode.h"
+
+#define kMinimumGestureLength  25
+#define kMaximumVariance   5
+
+@implementation JumpGameMode
+
+- (id)init
+{
+    self = [super init];
+    
+    if (nil != self)
+    {
+        water = [CCSprite spriteWithFile:@"water.png"];
+        water.position = ccp(240, -80);
+        [self addChild:water];
+        
+        self.isTouchEnabled = YES;
+        
+        waterTick = 0;
+        wave = NO;
+    }
+    
+    return self;
+}
+
+- (void)onEnterTransitionDidFinish
+{
+    [super onEnterTransitionDidFinish];
+    
+    [self scheduleDelayedAction:^{
+        wave = YES;
+    } delay:3.0f];
+}
+
+- (void)tick:(ccTime)dt
+{
+    [super tick:dt];
+    
+    if (wave)
+    {
+        waterTick++;
+        
+        water.position = ccp(240, 160 * sin(waterTick / (36 * M_PI)) - 80);
+        
+        if (waterTick == 180)
+        {
+            wave = NO;
+            
+            [self scheduleDelayedAction:^{
+                wave = YES;
+            } delay:10.0f];
+        } else if (waterTick == 360)
+        {
+            wave = NO;
+            waterTick = 0;
+        }
+    }
+    
+    if (jump)
+    {
+        jumpTick++;
+        
+        cart.sprite.position = ccp(cart.sprite.position.x, MAX(100 * sin(jumpTick / (2 * M_PI)) + 22, water.position.y+80+11));
+        
+        if (jumpTick == 20)
+        {
+            jump = NO;
+            jumpTick = 0;
+        }
+    } else {
+        cart.sprite.position = ccp(cart.sprite.position.x, MAX(22, water.position.y+80+11));
+    }
+}
+
+- (void)ccTouchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    UITouch* touch = [touches anyObject];
+    gestureStartPoint = [touch locationInView:nil];
+}
+
+- (void)ccTouchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    UITouch* touch = [touches anyObject];
+    CGPoint gestureCurrentPosition = [touch locationInView:nil];
+    CGFloat deltaX = fabsf(gestureStartPoint.x - gestureCurrentPosition.x);
+    CGFloat deltaY = fabsf(gestureStartPoint.y - gestureCurrentPosition.y);
+    
+    if ((deltaX >= kMinimumGestureLength) && (deltaY <= kMaximumVariance*swipeVarianceModifer) && (cart.sprite.position.y == 22))
+    {
+        jump = YES;
+    }
+}
+
+- (void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration
+{
+    [super accelerometer:accelerometer didAccelerate:acceleration];
+    
+    swipeVarianceModifer = MAX(1,(fabsf(acceleration.y) * 480)/kMaximumVariance);
+}
+
+@end
@@ -17,6 +17,7 @@
 - (id)init;
 - (void)newgame;
 - (void)tutorial;
+- (void)jump;
 - (void)highscores;
 
 @end
@@ -11,6 +11,7 @@
 #import "ClassicGameMode.h"
 #import "TutorialMode.h"
 #import "Cart_CollectAppDelegate.h"
+#import "JumpGameMode.h"
 
 @implementation MainMenuLayer
 
@@ -46,9 +47,10 @@
                 
                 CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"newgame.png" selectedImage:@"newgame2.png" target:self selector:@selector(newgame)];
         CCMenuItemImage* tutorialMenuItem = [CCMenuItemImage itemFromNormalImage:@"tutorial.png" selectedImage:@"tutorial2.png" target:self selector:@selector(tutorial)];
+        CCMenuItemImage* jumpMenuItem = [CCMenuItemImage itemFromNormalImage:@"jump.png" selectedImage:@"jump2.png" target:self selector:@selector(jump)];
                 CCMenuItemImage* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)];
                 
-                CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, tutorialMenuItem, highscoresMenuItem, nil];
+                CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, tutorialMenuItem, jumpMenuItem, highscoresMenuItem, nil];
                 [menu alignItemsVertically];
                 menu.position = ccp(240, 100);
                 [self addChild:menu];
@@ -67,6 +69,11 @@
     [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
 }
 
+- (void)jump
+{
+    [[CCDirector sharedDirector] replaceScene:[JumpGameMode scene]];
+}
+
 - (void)highscores
 {
         HighscoreListController* listController = [[HighscoreListController alloc] initWithStyle:UITableViewStylePlain];