1 files changed, 80 insertions, 31 deletions

@@ -8,17 +8,36 @@
 
 #import "ClassicGameMode.h"
 #import "FallingObject.h"
-#import "Cherry.h"
-#import "Bottle.h"
-#import "OneUp.h"
-#import "Rock.h"
 #import "GameOverScene.h"
 #import "SimpleAudioEngine.h"
-#import "CCNotifications.h"
-#import "TestFlight.h"
 
 @implementation ClassicGameMode
 
+typedef enum {
+    kCherryObject = 0,
+    kEnergyDrinkObject,
+    kOneUpObject,
+    kRockObject
+} FallingObjects;
+
+static GameModeInfo* info;
+
++ (GameModeInfo*)info
+{
+    if (info == nil)
+    {
+        info = [[GameModeInfo alloc] initWithName:@"Collect" 
+                                         location:@"Paris"
+                                       numOfStars:3
+                                    imageFilename:[[NSBundle mainBundle] pathForResource:@"paris" ofType:@"png"]
+                                         unlocked:YES
+                                        gameClass:[ClassicGameMode class]
+                               globalHighscoreKey:@"Classic"];
+    }
+    
+    return info;
+}
+
 - (void)tick:(ccTime)dt
 {
         int lastScore = score;
@@ -29,7 +48,7 @@
         {
         [self unscheduleAllSelectors];
 
-        [[CCDirector sharedDirector] replaceScene:[CCTransitionSlideInT transitionWithDuration:1.5f scene:[GameOverScene sceneWithScore:score gameMode:@"Collect"]]];
+        [[CCDirector sharedDirector] replaceScene:[CCTransitionSlideInT transitionWithDuration:1.5f scene:[GameOverScene sceneWithScore:score gameMode:[ClassicGameMode info]]]];
         } else if (score > lastScore)
         {
                 if ((lastScore < 6500) && (score >= 6500))
@@ -42,24 +61,14 @@
                         [self unschedule:@selector(randomlyAddObject:)];
                         [self schedule:@selector(randomlyAddObject:) interval:0.7f];
                         addSpeed = 0.7f;
-                } else if ((lastScore < 3000) && (score >= 3000))
-        {
-            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];
-                
-                [TestFlight passCheckpoint:@"Unlocked Jump Mode"];
-            }
                 } else if ((lastScore < 2500) && (score >= 2500))
                 {
                         [self unschedule:@selector(randomlyAddObject:)];
                         [self schedule:@selector(randomlyAddObject:) interval:0.8f];
                         addSpeed = 0.8f;
+        } else if ((lastScore < 2000) && (score >= 2000))
+        {
+            [[ClassicGameMode info] setStar:1 withMessage:@"Get 2000 points"];
                 } else if ((lastScore < 1500) && (score >= 1500))
                 {
                         [self unschedule:@selector(randomlyAddObject:)];
@@ -70,6 +79,8 @@
                         [self unschedule:@selector(randomlyAddObject:)];
                         [self schedule:@selector(randomlyAddObject:) interval:1.0f];
                         addSpeed = 1.0f;
+            
+            [[ClassicGameMode info] setStar:0 withMessage:@"Get 500 points"];
                 } else if ((lastScore < 150) && (score >= 150))
                 {
                         [self unschedule:@selector(randomlyAddObject:)];
@@ -83,6 +94,7 @@
 {
         FallingObject* object;
     int oneuppercent = 98 - (lives == 1 ? 1 : 0);
+    int recipeIdentifier;
 
         if (score < 1000)
         {
@@ -90,31 +102,33 @@
                 
                 if (randomval < 65)
                 {
-                        object = [[Cherry alloc] init];
+            recipeIdentifier = kCherryObject;
                 } else if (randomval < oneuppercent)
                 {
-                        object = [[Bottle alloc] init];
+                        recipeIdentifier = kEnergyDrinkObject;
                 } else {
-                        object = [[OneUp alloc] init];
+                        recipeIdentifier = kOneUpObject;
                 }
         } else {
                 int randomval = arc4random()%100;
                 
                 if (randomval < 40)
                 {
-                        object = [[Cherry alloc] init];
+                        recipeIdentifier = kCherryObject;
                 } else if (randomval < 70)
                 {
-                        object = [[Rock alloc] init];
+                        recipeIdentifier = kRockObject;
                 } else if (randomval < oneuppercent)
                 {
-                        object = [[Bottle alloc] init];
+                        recipeIdentifier = kEnergyDrinkObject;
                 } else {
-                        object = [[OneUp alloc] init];
+                        recipeIdentifier = kOneUpObject;
                 }
         }
         
         int objectX = arc4random()%448+16;
+    object = [[objectFactory buildFallingObjectWithRecipeIdentifier:recipeIdentifier] retain];
+    object.delegate = self;
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
         [self addChild:object.sprite];
@@ -126,8 +140,8 @@
         {
                 if (arc4random() % 100 > 80)
                 {
-                        object = [[Rock alloc] init];
-                        
+                        object = [[objectFactory buildFallingObjectWithRecipeIdentifier:kRockObject] retain];
+            object.delegate = self;
                         objectX = arc4random()%448+16;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
@@ -142,8 +156,8 @@
         {
                 if (arc4random() % 100 > 80)
                 {
-                        object = [[Rock alloc] init];
-                        
+                        object = [[objectFactory buildFallingObjectWithRecipeIdentifier:kRockObject] retain];
+            object.delegate = self;
                         objectX = arc4random()%448+16;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
@@ -166,6 +180,11 @@
                 [self addChild:backgroundImage z:-1];
                 
                 addSpeed = 2.5f;
+        
+        [objectFactory createRecipeWithIdentifier:kCherryObject spriteFilename:@"cherry.png" weight:5];
+        [objectFactory createRecipeWithIdentifier:kEnergyDrinkObject spriteFilename:@"bottle.png" weight:6];
+        [objectFactory createRecipeWithIdentifier:kOneUpObject spriteFilename:@"oneup.png" weight:10];
+        [objectFactory createRecipeWithIdentifier:kRockObject spriteFilename:@"rock.png" weight:7];
         }
         
         return self;
@@ -178,4 +197,34 @@
     [self schedule:@selector(randomlyAddObject:) interval:addSpeed];
 }
 
+- (void)didCatchItem:(FallingObject *)item
+{
+    if (item.objectType == kCherryObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Item1" ofType:@"wav"]];
+        self.score += 10;
+    } else if (item.objectType == kEnergyDrinkObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Item1" ofType:@"wav"]];
+        self.score += 25;
+    } else if (item.objectType == kOneUpObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"1up" ofType:@"wav"]];
+        self.lives++;
+    } else if (item.objectType == kRockObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Damage1" ofType:@"wav"]];
+        self.lives--;
+    }
+}
+
+- (void)didMissItem:(FallingObject *)item
+{
+    if ((item.objectType == kCherryObject) || (item.objectType == kEnergyDrinkObject))
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Damage1" ofType:@"wav"]];
+        self.lives--;
+    }
+}
+
 @end