4 files changed, 35 insertions, 1 deletions

@@ -14,6 +14,8 @@
 #import "RootViewController.h"
 #import "MainMenuLayer.h"
 #import "TestFlight.h"
+#import "CCNotifications.h"
+#import "notificationDesign.h"
 
 @implementation Cart_CollectAppDelegate
 
@@ -64,6 +66,8 @@
         
         
         CCDirector *director = [CCDirector sharedDirector];
+    CCNotifications* notifications = [CCNotifications sharedManager];
+    [director setNotificationNode:notifications];
         
         // Init the View Controller
         viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil];
@@ -14,6 +14,7 @@
 #import "Rock.h"
 #import "GameOverScene.h"
 #import "SimpleAudioEngine.h"
+#import "CCNotifications.h"
 
 @implementation ClassicGameMode
 
@@ -35,6 +36,17 @@
                         [self unschedule:@selector(randomlyAddObject:)];
                         [self schedule:@selector(randomlyAddObject:) interval:0.6f];
                         addSpeed = 0.6f;
+        } else if ((lastScore < 5000) && (score >= 5000))
+        {
+            NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+            
+            if (![defaults boolForKey:@"unlockedJumpMode"])
+            {
+                [[CCNotifications sharedManager] addWithTitle:@"Jump" message:@"You've unlocked a new game mode!" image:@"venice.png"];
+                
+                [defaults setBool:YES forKey:@"unlockedJumpMode"];
+                [defaults synchronize];
+            }
                 } else if ((lastScore < 4500) && (score >= 4500))
                 {
                         [self unschedule:@selector(randomlyAddObject:)];
@@ -84,13 +84,16 @@
 {
     [cart tick];
     
+    NSMutableSet* discardedObjects = [NSMutableSet set];
     for (FallingObject* object in objects)
         {
         if ([object tick])
         {
-            [objects removeObject:object];
+            [discardedObjects addObject:object];
         }
     }
+    
+    [objects minusSet:discardedObjects];
 }
 
 - (BOOL)canPause
@@ -14,6 +14,7 @@
 #import "TutorialMode.h"
 #import "ClassicGameMode.h"
 #import "NMPanelMenu.h"
+#import "JumpGameMode.h"
 
 @implementation GameModeSelectionLayer
 
@@ -56,6 +57,17 @@
         
         [gameModes addObject:collectSelection];
         
+        GameModeSelection* jumpSelection;
+        
+        if ([defaults boolForKey:@"unlockedJumpMode"])
+        {
+            jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES];
+        } else {
+            jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlockCondition:@"Get 5000 points in Collect!"];
+        }
+        
+        [gameModes addObject:jumpSelection];
+        
         CCMenu* menu = [CCMenu menuWithItems:nil];
         float onePanelWide = 128;
         float padding = 15;
@@ -126,6 +138,9 @@
     } else if ([gameMode.name isEqual:@"Collect"])
     {
         [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]];
+    } else if ([gameMode.name isEqual:@"Jump"])
+    {
+        [[CCDirector sharedDirector] replaceScene:[JumpGameMode scene]];
     }
 }