33 files changed, 670 insertions, 597 deletions

@@ -1,18 +0,0 @@
-//
-//  Bottle.h
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "ValuableObject.h"
-
-@interface Bottle : ValuableObject {
-
-}
-
-- (id)init;
-
-@end
@@ -1,32 +0,0 @@
-//
-//  Bottle.m
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import "Bottle.h"
-
-
-@implementation Bottle
-
-- (id)init
-{
-        self = [super init];
-        
-        if (nil != self)
-        {
-                sprite = [CCSprite spriteWithFile:@"bottle.png"];
-        weight = 6;
-        }
-        
-        return self;
-}
-
-- (int)pointValue
-{
-        return 25;
-}
-
-@end
@@ -1,18 +0,0 @@
-//
-//  Cherry.h
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "ValuableObject.h"
-
-@interface Cherry : ValuableObject {
-
-}
-
-- (id)init;
-
-@end
@@ -1,32 +0,0 @@
-//
-//  Cherry.m
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import "Cherry.h"
-
-
-@implementation Cherry
-
-- (id)init
-{
-        self = [super init];
-        
-        if (nil != self)
-        {
-                sprite = [CCSprite spriteWithFile:@"cherry.png"];
-        weight = 5;
-        }
-        
-        return self;
-}
-
-- (int)pointValue
-{
-        return 10;
-}
-
-@end
@@ -9,8 +9,9 @@
 #import <Foundation/Foundation.h>
 #import "cocos2d.h"
 #import "GameMode.h"
+#import "FallingObjectDelegate.h"
 
-@interface ClassicGameMode : GameMode {
+@interface ClassicGameMode : GameMode <FallingObjectDelegate> {
         float addSpeed;
 }
 
@@ -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
@@ -15,14 +15,16 @@
     int weight;
     id<FallingObjectDelegate> delegate;
     BOOL flags[4];
+    int objectType;
 }
 
 @property (readonly) CCSprite* sprite;
 @property (readonly) int weight;
+@property (readonly) int objectType;
 @property (nonatomic,retain) id<FallingObjectDelegate> delegate;
-- (id)init;
+- (id)initWithSpriteFilename:(NSString*)filename weight:(int)weight objectType:(int)objectType;
 - (BOOL)tick;
-- (void)collideWithCart;
-- (void)collideWithFloor;
+- (BOOL)flag:(int)flag;
+- (void)setFlag:(int)flag withValue:(BOOL)value;
 
 @end
@@ -11,15 +11,17 @@
 
 @implementation FallingObject
 
-@synthesize sprite, weight, delegate;
+@synthesize sprite, weight, objectType, delegate;
 
-- (id)init
+- (id)initWithSpriteFilename:(NSString*)filename weight:(int)m_weight objectType:(int)m_objectType
 {
         self = [super init];
         
         if (nil != self)
         {
-
+        sprite = [CCSprite spriteWithFile:filename];
+        weight = m_weight;
+        objectType = m_objectType;
         }
         
         return self;
@@ -44,8 +46,6 @@
             {
                 if (gameLayer.cart.sprite.position.y < (sprite.position.y + second.height/2 + first.height/2))
                 {
-                    [self collideWithCart];
-                    
                     if ((delegate != nil) && ([delegate respondsToSelector:@selector(didCatchItem:)]))
                     {
                         [delegate didCatchItem:self];
@@ -65,8 +65,6 @@
     // Collision detection with floor
     if (sprite.position.y - (sprite.contentSize.height/2) < 0)
     {
-        [self collideWithFloor];
-        
         if ((delegate != nil) && ([delegate respondsToSelector:@selector(didMissItem:)]))
         {
             [delegate didMissItem:self];
@@ -83,14 +81,14 @@
     return NO;
 }
 
-- (void)collideWithCart
+- (BOOL)flag:(int)flag
 {
-
+    return flags[flag];
 }
 
-- (void)collideWithFloor
+- (void)setFlag:(int)flag withValue:(BOOL)value
 {
-
+    flags[flag] = value;
 }
 
 - (void)dealloc
@@ -0,0 +1,20 @@
+//
+//  FallingObjectFactory.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 9/10/11.
+//  Copyright (c) 2011 Four Island. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "FallingObject.h"
+
+@interface FallingObjectFactory : NSObject {
+    NSMutableDictionary* recipes;
+}
+
+- (id)init;
+- (void)createRecipeWithIdentifier:(int)identifier spriteFilename:(NSString*)filename weight:(int)weight;
+- (FallingObject*)buildFallingObjectWithRecipeIdentifier:(int)identifier;
+
+@end
@@ -0,0 +1,70 @@
+//
+//  FallingObjectFactory.m
+//  Cartographic
+//
+//  Created by Starla Insigna on 9/10/11.
+//  Copyright (c) 2011 Four Island. All rights reserved.
+//
+
+#import "FallingObjectFactory.h"
+
+@interface FallingObjectRecipe : NSObject {
+    NSString* spriteFilename;
+    int weight;
+}
+
+@property (readonly) NSString* spriteFilename;
+@property (readonly) int weight;
+- (id)initWithSpriteFilename:(NSString*)filename weight:(int)m_weight;
+
+@end
+
+@implementation FallingObjectRecipe
+
+@synthesize spriteFilename, weight;
+
+- (id)initWithSpriteFilename:(NSString*)filename weight:(int)m_weight
+{
+    self = [super init];
+    
+    if (nil != self)
+    {
+        spriteFilename = [filename retain];
+        weight = m_weight;
+    }
+    
+    return self;
+}
+
+@end
+
+@implementation FallingObjectFactory
+
+- (id)init
+{
+    self = [super init];
+    
+    if (nil != self)
+    {
+        recipes = [[NSMutableDictionary alloc] init];
+    }
+    
+    return self;
+}
+
+- (void)createRecipeWithIdentifier:(int)identifier spriteFilename:(NSString*)filename weight:(int)weight
+{
+    FallingObjectRecipe* recipe = [[FallingObjectRecipe alloc] initWithSpriteFilename:filename weight:weight];
+    [recipes setObject:recipe forKey:[NSNumber numberWithInt:identifier]];
+    [recipe release];
+}
+
+- (FallingObject*)buildFallingObjectWithRecipeIdentifier:(int)identifier
+{
+    FallingObjectRecipe* recipe = [recipes objectForKey:[NSNumber numberWithInt:identifier]];
+    FallingObject* object = [[FallingObject alloc] initWithSpriteFilename:recipe.spriteFilename weight:recipe.weight objectType:identifier];
+    
+    return [object autorelease];
+}
+
+@end
@@ -8,6 +8,8 @@
 
 #import "CCLayer.h"
 #import "Cart.h"
+#import "FallingObjectFactory.h"
+#import "GameModeInfo.h"
 #import <CoreMotion/CoreMotion.h>
 
 #define GAME_SCENE 436
@@ -19,6 +21,7 @@
         int lives;
     int pointMultiplier;
     Cart* cart;
+    FallingObjectFactory* objectFactory;
     
     CCLayerColor* shadedLayer;
     CCLayer* pauseLayer;
@@ -40,7 +43,6 @@
 @property (nonatomic,assign) int lives;
 @property (nonatomic,assign) int pointMultiplier;
 @property (readonly) BOOL isPaused;
-+ (CCScene*)scene;
 - (void)tick:(ccTime)dt;
 - (BOOL)canPause;
 - (void)pause;
@@ -48,6 +50,7 @@
 - (void)mainmenu;
 - (void)scheduleDelayedAction:(void(^)(void))delayedAction delay:(float)delay;
 - (void)runDelayedAction;
++ (GameModeInfo*)info;
 - (void)setPitch:(double)m_pitch;
 
 @end
@@ -14,19 +14,6 @@
 
 @synthesize cart, score, lives, isPaused, pointMultiplier;
 
-+ (CCScene*)scene
-{
-        CCScene* scene = [CCScene node];
-    
-        GameMode* layer = [self node];
-    layer.tag = GAME_LAYER;
-        [scene addChild:layer];
-        
-        scene.tag = GAME_SCENE;
-        
-        return scene;
-}
-
 - (id)init
 {
     self = [super init];
@@ -52,6 +39,8 @@
                 score = 0;
                 lives = 3;
         pointMultiplier = 1;
+        
+        objectFactory = [[FallingObjectFactory alloc] init];
                 
         if ([self canPause])
         {
@@ -259,10 +248,17 @@
     }
 }
 
++ (GameModeInfo*)info
+{
+  [NSException raise:@"Unimplemented method" format:@"Method -info of GameMode subclasses must be overridden"];
+  
+  return nil;
+}
+
 - (void)setPitch:(double)m_pitch
 {
     pitch = m_pitch;
-    
+
     [cart deviceDidRotate:pitch];
 }
 
@@ -0,0 +1,38 @@
+//
+//  GameModeInfo.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 11/28/11.
+//  Copyright (c) 2011 Four Island. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "cocos2d.h"
+
+@interface GameModeInfo : NSObject {
+    NSString* name;
+    NSString* location;
+    BOOL* stars;
+    int numOfStars;
+    BOOL unlocked;
+    UIImage* image;
+    NSString* unlockCondition;
+    Class gameClass;
+    NSString* globalHighscoreKey;
+}
+
+@property (readonly) NSString* name;
+@property (readonly) NSString* location;
+@property (readonly) int numOfStars;
+@property (readonly) UIImage* image;
+@property (readonly) BOOL unlocked;
+@property (readonly) NSString* globalHighscoreKey;
+- (id)initWithName:(NSString*)m_name location:(NSString*)m_location numOfStars:(int)m_numOfStars imageFilename:(NSString*)m_imageFilename unlocked:(BOOL)m_unlocked gameClass:(Class)m_gameClass globalHighscoreKey:(NSString*)m_globalHighscoreKey;
+- (void)setStar:(int)star_id withMessage:(NSString*)message;
+- (BOOL)star:(int)star_id;
+- (int)starsCollected;
+- (CCScene*)scene;
+- (void)unlock;
+- (void)dealloc;
+
+@end
@@ -0,0 +1,126 @@
+//
+//  GameModeInfo.m
+//  Cartographic
+//
+//  Created by Starla Insigna on 11/28/11.
+//  Copyright (c) 2011 Four Island. All rights reserved.
+//
+
+#import "GameModeInfo.h"
+#import "CCNotifications.h"
+#import "GameMode.h"
+#import "GameModeManager.h"
+#import "TestFlight.h"
+
+@implementation GameModeInfo
+
+@synthesize name, location, numOfStars, image, unlocked, globalHighscoreKey;
+
+- (id)initWithName:(NSString*)m_name location:(NSString*)m_location numOfStars:(int)m_numOfStars imageFilename:(NSString*)m_imageFilename unlocked:(BOOL)m_unlocked gameClass:(Class)m_gameClass globalHighscoreKey:(NSString*)m_globalHighscoreKey
+{
+    self = [super init];
+    
+    if (nil != self)
+    {
+        name = m_name;
+        location = m_location;
+        numOfStars = m_numOfStars;
+        image = [[UIImage alloc] initWithContentsOfFile:m_imageFilename];
+        globalHighscoreKey = m_globalHighscoreKey;
+        
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        unlocked = [defaults boolForKey:[NSString stringWithFormat:@"gameModeUnlocked-%@", name]];
+        if (!unlocked)
+        {
+            unlocked = m_unlocked;
+        }
+        
+        stars = (BOOL*) calloc(numOfStars, sizeof(BOOL));
+        for (int i=0; i<numOfStars; i++)
+        {
+            stars[i] = [defaults boolForKey:[NSString stringWithFormat:@"gameModeStar-%@-%d", name, i]];
+        }
+        
+        if ([m_gameClass isSubclassOfClass:[GameMode class]])
+        {
+            gameClass = m_gameClass;
+        } else {
+            [NSException raise:@"Invalid gameClass value" format:@"gameClass must be a subclass of GameMode"];
+        }
+    }
+
+    return self;
+}
+
+- (void)setStar:(int)star_id withMessage:(NSString*)message
+{
+    if (!stars[star_id])
+    {
+        stars[star_id] = YES;
+        
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setBool:YES forKey:[NSString stringWithFormat:@"gameModeStar-%@-%d", name, star_id]];
+
+        [[CCNotifications sharedManager] addWithTitle:@"Star Achieved!" message:message image:[NSString stringWithFormat:@"star_%d.png", star_id+1]];
+        
+        [GameModeManager sharedInstance].stars++;
+    }
+}
+
+- (BOOL)star:(int)star_id
+{
+    return stars[star_id];
+}
+
+- (int)starsCollected
+{
+    int result = 0;
+    
+    for (int i=0; i<numOfStars; i++)
+    {
+        if (stars[i])
+        {
+            result++;
+        }
+    }
+    
+    return result;
+}
+
+- (CCScene*)scene
+{
+    CCScene* scene = [CCScene node];
+    
+        GameMode* layer = [[((GameMode*) [gameClass alloc]) init] autorelease];
+    layer.tag = GAME_LAYER;
+        [scene addChild:layer];
+        
+        scene.tag = GAME_SCENE;
+        
+        return scene;
+}
+
+- (void)unlock
+{
+    if (!unlocked)
+    {
+        unlocked = YES;
+        
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setBool:YES forKey:[NSString stringWithFormat:@"gameModeUnlocked-%@", name]];
+        
+        CCTexture2D* texture = [[CCTexture2D alloc] initWithImage:image];
+        [[CCNotifications sharedManager] addWithTitle:name message:@"You've unlocked a new game mode!" texture:texture];
+        [texture release];
+        
+        [TestFlight passCheckpoint:[NSString stringWithFormat:@"Unlocked %@ Mode", name]];
+    }
+}
+
+- (void)dealloc
+{
+    free(stars);
+    [super dealloc];
+}
+
+@end
@@ -0,0 +1,20 @@
+//
+//  GameModeManager.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 11/29/11.
+//  Copyright (c) 2011 Four Island. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface GameModeManager : NSObject {
+    NSArray* gameModes;
+    int stars;
+}
+
+@property (readonly) NSArray* gameModes;
+@property (assign) int stars;
++ (GameModeManager*)sharedInstance;
+
+@end
@@ -0,0 +1,68 @@
+//
+//  GameModeManager.m
+//  Cartographic
+//
+//  Created by Starla Insigna on 11/29/11.
+//  Copyright (c) 2011 Four Island. All rights reserved.
+//
+
+#import "GameModeManager.h"
+#import "GameModeInfo.h"
+#import "TutorialMode.h"
+#import "ClassicGameMode.h"
+#import "JumpGameMode.h"
+
+@implementation GameModeManager
+
+@synthesize gameModes;
+
+static GameModeManager* sharedInstance = nil;
+
++ (GameModeManager*)sharedInstance
+{
+    if (sharedInstance == nil)
+    {
+        sharedInstance = [[GameModeManager alloc] init];
+    }
+    
+    return sharedInstance;
+}
+
+- (id)init
+{
+    self = [super init];
+    
+    if (nil != self)
+    {
+        gameModes = [[NSArray alloc] initWithObjects:
+                     [TutorialMode info],
+                     [ClassicGameMode info],
+                     [JumpGameMode info],
+                     nil];
+        
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        stars = [defaults integerForKey:@"stars"];
+    }
+    
+    return self;
+}
+
+- (void)setStars:(int)m_stars
+{
+    if (stars != m_stars)
+    {
+        stars = m_stars;
+        
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setInteger:m_stars forKey:@"stars"];
+
+        // Here, unlock game modes that have reached enough stars
+    }
+}
+
+- (int)stars
+{
+    return stars;
+}
+
+@end
@@ -8,23 +8,17 @@
 
 #import "cocos2d.h"
 #import "GameModeSelectionDelegate.h"
+#import "GameModeInfo.h"
 
 @interface GameModeSelection : CCMenuItem {
-    NSString* name;
-    NSString* location;
-    BOOL unlocked;
-    NSString* unlockCondition;
+    GameModeInfo* gameMode;
     id<GameModeSelectionDelegate> delegate;
 }
 
-@property (readonly) NSString* name;
-@property (readonly) NSString* location;
-@property (readonly) BOOL unlocked;
+@property (readonly) GameModeInfo* gameMode;
 @property (nonatomic,retain) id<GameModeSelectionDelegate> delegate;
-+ (id)selectionWithName:(NSString*)name location:(NSString*)location filename:(NSString*)filename unlocked:(BOOL)unlocked;
-+ (id)selectionWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename unlockCondition:(NSString*)unlockCondition;
-- (id)initWithName:(NSString*)name location:(NSString*)location filename:(NSString*)filename unlocked:(BOOL)unlocked;
-- (id)initWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename unlockCondition:(NSString*)unlockCondition;
++ (id)selectionWithGameModeInfo:(GameModeInfo*)m_gameMode;
+- (id)initWithGameModeInfo:(GameModeInfo*)m_gameMode;
 - (void)buttonTapped;
 
 @end
@@ -13,42 +13,34 @@
 
 @implementation GameModeSelection
 
-@synthesize name, location, unlocked, delegate;
+@synthesize gameMode, delegate;
 
-+ (id)selectionWithName:(NSString*)name location:(NSString*)location filename:(NSString*)filename unlocked:(BOOL)unlocked
++ (id)selectionWithGameModeInfo:(GameModeInfo*)m_gameMode
 {
-    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename unlocked:unlocked] autorelease];
+    return [[[GameModeSelection alloc] initWithGameModeInfo:m_gameMode] autorelease];
 }
 
-+ (id)selectionWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename unlockCondition:(NSString*)unlockCondition
-{
-    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename unlockCondition:unlockCondition] autorelease];
-}
-
-- (id)initWithName:(NSString*)m_name location:(NSString*)m_location filename:(NSString*)filename unlocked:(BOOL)m_unlocked;
+- (id)initWithGameModeInfo:(GameModeInfo*)m_gameMode
 {
     self = [super initWithTarget:nil selector:nil];
     
     if (nil != self)
     {
+        if (!m_gameMode.unlocked)
+        {
+            @throw [NSException exceptionWithName:NSInvalidArgumentException
+                                           reason:@"Game mode must be unlocked to appear on selection screen"
+                                         userInfo:nil];
+        }
+        
         self.anchorPoint = CGPointMake(0.5f, 0.5f);
         
-        name = m_name;
-        location = m_location;
-        unlocked = m_unlocked;
+        gameMode = m_gameMode;
         
         contentSize_ = CGSizeMake(128, 320);
         
-        NSString* filenameMod;
-        
-        if (unlocked)
-        {
-            filenameMod = [NSString stringWithFormat:@"%@-unlocked", filename];
-        } else {
-            filenameMod = [NSString stringWithFormat:@"%@-locked", filename];
-            name = [@"" stringByPaddingToLength:name.length withString:@"?" startingAtIndex:0];
-            location = [@"" stringByPaddingToLength:location.length withString:@"?" startingAtIndex:0];
-        }
+        NSString* name = gameMode.name;
+        NSString* location = gameMode.location;
         
         // First, create the frame that we will put the level picture inside
         CGImageRef framestuff = [[UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"framestuff" ofType:@"png"]] CGImage];
@@ -93,7 +85,7 @@
         UIImage* selectionBackground = UIGraphicsGetImageFromCurrentImageContext();
         
         // Now we want to put the level image inside the frame without messing up the frame itself
-        UIImage* innerPicture = [UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:filename ofType:@"png"]];
+        UIImage* innerPicture = gameMode.image;
         CGContextClipToMask(context, CGRectMake(0, 0, boxSize.width, boxSize.height), [[selectionBackground opaqueMaskFromWhiteImage] CGImage]);
         [innerPicture drawInRect:CGRectMake(6, 6, 128, 128)];
         selectionBackground = UIGraphicsGetImageFromCurrentImageContext();
@@ -104,26 +96,13 @@
         context = UIGraphicsGetCurrentContext();
         CGContextSaveGState(context);
         
-        if (unlocked)
-        {
-            CGContextSetShadow(context, CGSizeMake(-6, 6), 4.0f);
-            [selectionBackground drawInRect:CGRectMake(10, 0, boxSize.width, boxSize.height)];
-        } else {
-            // Draw the picture in grayscale if the level has not yet been unlocked
-            CGContextClipToMask(context, CGRectMake(10, 0, boxSize.width, boxSize.height), [selectionBackground CGImage]);
-            CGContextSetFillColorWithColor(context, [[UIColor whiteColor] CGColor]);
-            CGContextFillRect(context, CGRectMake(10, 0, boxSize.width, boxSize.height));
-            CGContextRestoreGState(context);
-            
-            CGContextSaveGState(context);
-            CGContextSetShadow(context, CGSizeMake(-6, 6), 4.0f);
-            [selectionBackground drawInRect:CGRectMake(10, 0, boxSize.width, boxSize.height) blendMode:kCGBlendModeLuminosity alpha:1.0];
-        }
+        CGContextSetShadow(context, CGSizeMake(-6, 6), 4.0f);
+        [selectionBackground drawInRect:CGRectMake(10, 0, boxSize.width, boxSize.height)];
         
         CGContextRestoreGState(context);
         CGImageRef pictureRef = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
         
-        CCSprite* picture = [CCSprite spriteWithCGImage:pictureRef key:[NSString stringWithFormat:@"gms-%@", filenameMod]];
+        CCSprite* picture = [CCSprite spriteWithCGImage:pictureRef key:[NSString stringWithFormat:@"gms-%@", name]];
         
         // We're also going to need a "selected" image state for the button
         CGContextSaveGState(context);
@@ -133,7 +112,7 @@
         CGContextRestoreGState(context);
         CGImageRef selectedButtonRef = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
         UIGraphicsEndImageContext();
-        CCSprite* selectedButton = [CCSprite spriteWithCGImage:selectedButtonRef key:[NSString stringWithFormat:@"gms-%@-selected", filenameMod]];
+        CCSprite* selectedButton = [CCSprite spriteWithCGImage:selectedButtonRef key:[NSString stringWithFormat:@"gms-%@-selected", name]];
         
         CCMenuItemSprite* pictureMenuItem = [CCMenuItemSprite itemFromNormalSprite:picture selectedSprite:selectedButton target:self selector:@selector(buttonTapped)];
         NMPanelMenu* theMenu = [NMPanelMenu menuWithItems:pictureMenuItem, nil];
@@ -155,64 +134,42 @@
         
         CGImageRef titleImage = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
         UIGraphicsEndImageContext();
-        CCSprite* titleSprite = [CCSprite spriteWithCGImage:titleImage key:[NSString stringWithFormat:@"gms-%@-title", filenameMod]];
+        CCSprite* titleSprite = [CCSprite spriteWithCGImage:titleImage key:[NSString stringWithFormat:@"gms-%@-title", name]];
         titleSprite.position = ccp(-10, (boxSize.height)/2+(combinedTitleSize.height)/2);
         [self addChild:titleSprite];
         
-        if (unlocked)
+        Highscore* localHighscore = [Highscore localHighscoreForGameMode:name];
+            
+        if (localHighscore != nil)
         {
-            Highscore* localHighscore = [Highscore localHighscoreForGameMode:name];
+            // Render the highscore label
+            NSString* highscoreString = [NSString stringWithFormat:@"Highscore: %d", localHighscore.score];
+            UIFont* highscoreFont = [UIFont fontWithName:@"AmericanTypewriter" size:16.0f];
+            CGSize highscoreSize = [highscoreString sizeWithFont:highscoreFont];
+            
+            UIGraphicsBeginImageContext(CGSizeMake(highscoreSize.width+10, highscoreSize.height+10));
+            CGContextRef context = UIGraphicsGetCurrentContext();
+            CGContextSetShadow(context, CGSizeMake(-6, 6), 4.0f);
+            [highscoreString drawInRect:CGRectMake(10, 0, highscoreSize.width, highscoreSize.height) withFont:highscoreFont];
             
-            if (localHighscore != nil)
-            {
-                // Render the highscore label
-                NSString* highscoreString = [NSString stringWithFormat:@"Highscore: %d", localHighscore.score];
-                UIFont* highscoreFont = [UIFont fontWithName:@"AmericanTypewriter" size:16.0f];
-                CGSize highscoreSize = [highscoreString sizeWithFont:highscoreFont];
-                
-                UIGraphicsBeginImageContext(CGSizeMake(highscoreSize.width+10, highscoreSize.height+10));
-                CGContextRef context = UIGraphicsGetCurrentContext();
-                CGContextSetShadow(context, CGSizeMake(-6, 6), 4.0f);
-                [highscoreString drawInRect:CGRectMake(10, 0, highscoreSize.width, highscoreSize.height) withFont:highscoreFont];
-                
-                CGImageRef highscoreImage = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
-                UIGraphicsEndImageContext();
-                CCSprite* highscoreSprite = [CCSprite spriteWithCGImage:highscoreImage key:[NSString stringWithFormat:@"gms-%@-highscore-%d", filename, localHighscore.score]];
-                highscoreSprite.position = ccp(-5, 0-64-(highscoreSize.height)/2-10);
-                [self addChild:highscoreSprite];
-            }
+            CGImageRef highscoreImage = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
+            UIGraphicsEndImageContext();
+            CCSprite* highscoreSprite = [CCSprite spriteWithCGImage:highscoreImage key:[NSString stringWithFormat:@"gms-%@-highscore-%d", name, localHighscore.score]];
+            highscoreSprite.position = ccp(-5, 0-64-(highscoreSize.height)/2-10);
+            [self addChild:highscoreSprite];
         }
     }
     
     return self;
 }
 
-- (id)initWithName:(NSString *)m_name location:(NSString *)m_location filename:(NSString *)m_filename unlockCondition:(NSString*)m_unlockCondition
-{
-    self = [self initWithName:m_name location:m_location filename:m_filename unlocked:NO];
-    
-    if (nil != self)
-    {
-        unlockCondition = m_unlockCondition;
-    }
-    
-    return self;
-}
-
 - (void)buttonTapped
 {
-    if (unlocked)
+    if (delegate != nil)
     {
-        if (delegate != nil)
-        {
-            [delegate didSelectGameMode:self];
-        } else {
-            NSLog(@"I don't have a GameModeSelectionDelegate to call for some reason...");
-        }
+        [delegate didSelectGameMode:self];
     } else {
-        UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"To unlock this game mode:" message:unlockCondition delegate:nil cancelButtonTitle:@"Cancel" otherButtonTitles:nil];
-        [alertView show];
-        [alertView release];
+        NSLog(@"I don't have a GameModeSelectionDelegate to call for some reason...");
     }
 }
 
@@ -11,11 +11,10 @@
 #import <sqlite3.h>
 #import "Cart_CollectAppDelegate.h"
 #import "MainMenuLayer.h"
-#import "TutorialMode.h"
-#import "ClassicGameMode.h"
 #import "NMPanelMenu.h"
-#import "JumpGameMode.h"
 #import "ZoomFadeTransition.h"
+#import "GameModeInfo.h"
+#import "GameModeManager.h"
 
 @implementation GameModeSelectionLayer
 
@@ -44,31 +43,14 @@
         NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
         gameModes = [[NSMutableArray alloc] init];
         
-        GameModeSelection* tutorialSelection = [GameModeSelection selectionWithName:@"Tutorial" location:@"Florence" filename:@"florence" unlocked:YES];
-        [gameModes addObject:tutorialSelection];
-        
-        GameModeSelection* collectSelection;
-        
-        collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:YES];
-/*        if ([defaults boolForKey:@"hasDoneTutorial"])
-        {
-            collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlocked:YES];
-        } else {
-            collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlockCondition:@"Beat the tutorial!"];
-        }*/
-        
-        [gameModes addObject:collectSelection];
-        
-        GameModeSelection* jumpSelection;
-        jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES];
-/*        if ([defaults boolForKey:@"unlockedJumpMode"])
+        for (GameModeInfo* info in [[GameModeManager sharedInstance] gameModes])
         {
-            jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlocked:YES];
-        } else {
-            jumpSelection = [GameModeSelection selectionWithName:@"Jump" location:@"Venice" filename:@"venice" unlockCondition:@"Get 3000 points in Collect!"];
-        }*/
-        
-        [gameModes addObject:jumpSelection];
+            if (info.unlocked)
+            {
+                GameModeSelection* selection = [GameModeSelection selectionWithGameModeInfo:info];
+                [gameModes addObject:selection];
+            }
+        }
         
         CCMenu* menu = [CCMenu menuWithItems:nil];
         float onePanelWide = 128;
@@ -132,24 +114,15 @@
     [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
 }
 
-- (void)didSelectGameMode:(GameModeSelection *)gameMode
+- (void)didSelectGameMode:(GameModeSelection *)selection
 {
     [scrollView setScrollEnabled:NO];
     [pageControl removeFromSuperview];
     
-    CGPoint opp = [scrollView convertPoint:gameMode.position toView:[[CCDirector sharedDirector] openGLView]];
+    CGPoint opp = [scrollView convertPoint:selection.position toView:[[CCDirector sharedDirector] openGLView]];
     CGPoint endPosition = ccp(0-(opp.x+158), opp.y);
     
-    if ([gameMode.name isEqual:@"Tutorial"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[TutorialMode scene] position:endPosition]];
-    } else if ([gameMode.name isEqual:@"Collect"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[ClassicGameMode scene] position:endPosition]];
-    } else if ([gameMode.name isEqual:@"Jump"])
-    {
-        [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[JumpGameMode scene] position:endPosition]];
-    }
+    [[CCDirector sharedDirector] replaceScene:[ZoomFadeTransition transitionWithDuration:5.0f scene:[selection.gameMode scene] position:endPosition]];
 }
 
 @end
@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "cocos2d.h"
+#import "GameModeInfo.h"
 
 @interface GameOverScene : CCScene <UITextFieldDelegate, UIAlertViewDelegate> {
     CCLayer* theLayer;
@@ -19,12 +20,12 @@
     UIButton* backButton;
     UIButton* playButton;
         int score;
-    NSString* gameMode;
+    GameModeInfo* gameMode;
     BOOL playAgain;
 }
 
-+ (GameOverScene*)sceneWithScore:(int)score gameMode:(NSString*)gameMode;
-- (id)initWithScore:(int)score gameMode:(NSString*)gameMode;
++ (GameOverScene*)sceneWithScore:(int)score gameMode:(GameModeInfo*)gameMode;
+- (id)initWithScore:(int)score gameMode:(GameModeInfo*)gameMode;
 - (void)newgame:(id)sender;
 - (void)submitScore;
 - (void)exit;
@@ -11,17 +11,15 @@
 #import <sqlite3.h>
 #import "cocoslive.h"
 #import "MainMenuLayer.h"
-#import "ClassicGameMode.h"
-#import "JumpGameMode.h"
 
 @implementation GameOverScene
 
-+ (GameOverScene*)sceneWithScore:(int)score gameMode:(NSString*)gameMode
++ (GameOverScene*)sceneWithScore:(int)score gameMode:(GameModeInfo*)gameMode
 {
     return [[[GameOverScene alloc] initWithScore:score gameMode:gameMode] autorelease];
 }
 
-- (id)initWithScore:(int)score2 gameMode:(NSString*)gameMode2
+- (id)initWithScore:(int)m_score gameMode:(GameModeInfo*)m_gameMode
 {
     self = [super init];
         
@@ -37,8 +35,8 @@
                 backgroundImage.position = ccp(240, 160);
                 [theLayer addChild:backgroundImage z:0];
 
-                score = score2;
-        gameMode = gameMode2;
+                score = m_score;
+        gameMode = m_gameMode;
         
         movingLayer = [[UIView alloc] initWithFrame:CGRectMake(0, -320, 480, 320)];
         movingLayer.backgroundColor = [UIColor clearColor];
@@ -47,7 +45,7 @@
         scoreField = [[UILabel alloc] initWithFrame:CGRectMake(205, 320-200, 0, 0)];
         [scoreField setFont:[UIFont systemFontOfSize:20.0f]];
         [scoreField setBackgroundColor:[UIColor clearColor]];
-        [scoreField setText:[NSString stringWithFormat:@"%d", score2]];
+        [scoreField setText:[NSString stringWithFormat:@"%d", score]];
         CGSize labelSize = [scoreField.text sizeWithFont:scoreField.font constrainedToSize:CGSizeMake(160, 31) lineBreakMode:UILineBreakModeClip];
         [scoreField setFrame:CGRectMake(scoreField.frame.origin.x, scoreField.frame.origin.y, labelSize.width, labelSize.height)];
         [movingLayer addSubview:scoreField];
@@ -103,7 +101,7 @@
     textField.enabled = NO;
     submitSwitch.enabled = NO;
         
-        const char* sqlQuery = [[NSString stringWithFormat:@"INSERT INTO highscores (name, score, gameMode) VALUES (\"%@\",%d,\"%@\")", [textField text], score, gameMode] UTF8String];
+        const char* sqlQuery = [[NSString stringWithFormat:@"INSERT INTO highscores (name, score, gameMode) VALUES (\"%@\",%d,\"%@\")", [textField text], score, gameMode.name] UTF8String];
         sqlite3_stmt* compiled_statement;
         
         if (sqlite3_prepare_v2([Cart_CollectAppDelegate database], sqlQuery, -1, &compiled_statement, NULL) == SQLITE_OK)
@@ -128,14 +126,7 @@
     
         CLScoreServerPost* server = [[CLScoreServerPost alloc] initWithGameName:@"Cart Collect" gameKey:@"38f440a074b3264386455a36b2706d8f" delegate:self];
         NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
-    
-    if ([gameMode isEqual:@"Collect"])
-    {
-        [dict setObject:@"Classic" forKey:@"cc_category"];
-    } else {
-        [dict setObject:gameMode forKey:@"cc_category"];
-    }
-    
+    [dict setObject:gameMode.globalHighscoreKey forKey:@"cc_category"];
         [dict setObject:[textField text] forKey:@"cc_playername"];
         [dict setObject:[NSNumber numberWithInt:score] forKey:@"cc_score"];
         [server sendScore:dict];
@@ -224,13 +215,7 @@
         
     if (playAgain)
     {
-        if ([gameMode isEqual:@"Collect"])
-        {
-            [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[ClassicGameMode scene] withColor:ccc3(0, 0, 0)]];
-        } else if ([gameMode isEqual:@"Jump"])
-        {
-            [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[JumpGameMode scene] withColor:ccc3(0, 0, 0)]];
-        }
+        [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[gameMode scene] withColor:ccc3(0, 0, 0)]];
     } else {
         [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
     }
@@ -7,10 +7,11 @@
 //
 
 #import "GameMode.h"
+#import "FallingObjectDelegate.h"
 
 @class LedgeFactory;
 
-@interface JumpGameMode : GameMode <CCStandardTouchDelegate> {
+@interface JumpGameMode : GameMode <CCStandardTouchDelegate, FallingObjectDelegate> {
     CCSprite* water;
     int waterTick;
     BOOL wave;
@@ -20,7 +21,7 @@
     BOOL jump;
     float expectedAngle;
     NSMutableSet* ledges;
-    LedgeFactory* factory;
+    LedgeFactory* ledgeFactory;
     int ledgeScrollSpeed;
     float ledgeAccelerationRate;
     float addSpeed;
@@ -9,12 +9,7 @@
 #import "JumpGameMode.h"
 #import "SimpleAudioEngine.h"
 #import "FallingObject.h"
-#import "Cherry.h"
-#import "Bottle.h"
-#import "OneUp.h"
-#import "Rock.h"
 #import "GameOverScene.h"
-#import "PointMultiplier.h"
 
 #define kMinimumGestureLength  25
 
@@ -46,6 +41,30 @@
 
 @implementation JumpGameMode
 
+typedef enum {
+    kRockObject = 0,
+    kOneUpObject,
+    kPointMultiplierObject
+} FallingObjects;
+
+static GameModeInfo* info;
+
++ (GameModeInfo*)info
+{
+    if (info == nil)
+    {
+        info = [[GameModeInfo alloc] initWithName:@"Jump"
+                                         location:@"Venice"
+                                       numOfStars:3
+                                    imageFilename:[[NSBundle mainBundle] pathForResource:@"venice" ofType:@"png"]
+                                         unlocked:YES
+                                        gameClass:[JumpGameMode class]
+                               globalHighscoreKey:@"Jump"];
+    }
+    
+    return info;
+}
+
 - (id)init
 {
     self = [super init];
@@ -69,9 +88,9 @@
         waterTick = 0;
         wave = NO;
         
-        factory = [[LedgeFactory alloc] init];
+        ledgeFactory = [[LedgeFactory alloc] init];
         ledges = [[NSMutableSet alloc] init];
-        CCTexture2D* texture = [[CCTexture2D alloc] initWithImage:[factory createLedgeWithWidth:6 height:2]];
+        CCTexture2D* texture = [[CCTexture2D alloc] initWithImage:[ledgeFactory createLedgeWithWidth:6 height:2]];
         CCSprite* ledge = [CCSprite spriteWithTexture:texture];
         ledge.position = ccp(80, 32);
         [self addChild:ledge];
@@ -79,7 +98,7 @@
         [texture release];
         
         CCSprite* firstLedge = ledge;
-        texture = [[CCTexture2D alloc] initWithImage:[factory createLedgeWithWidth:10 height:2]];
+        texture = [[CCTexture2D alloc] initWithImage:[ledgeFactory createLedgeWithWidth:10 height:2]];
         ledge = [CCSprite spriteWithTexture:texture];
         ledge.position = ccp(80 + firstLedge.boundingBox.size.width/2 + ledge.boundingBox.size.width/2+64, 32);
         [self addChild:ledge];
@@ -89,6 +108,10 @@
         ledgeScrollSpeed = 0;
         ledgeAccelerationRate = 20.0f;
         addSpeed = 2.5f;
+        
+        [objectFactory createRecipeWithIdentifier:kRockObject spriteFilename:@"rock.png" weight:7];
+        [objectFactory createRecipeWithIdentifier:kOneUpObject spriteFilename:@"oneup.png" weight:10];
+        [objectFactory createRecipeWithIdentifier:kPointMultiplierObject spriteFilename:@"multiplier.png" weight:8];
     }
     
     return self;
@@ -172,7 +195,7 @@
     {
         int ledgeWidth = arc4random() % 9 + 1;
         int ledgeDistance = arc4random() % (ledgeScrollSpeed*ledgeScrollSpeed+1)*3/2;
-        CCTexture2D* texture = [[CCTexture2D alloc] initWithImage:[factory createLedgeWithWidth:ledgeWidth height:2]];
+        CCTexture2D* texture = [[CCTexture2D alloc] initWithImage:[ledgeFactory createLedgeWithWidth:ledgeWidth height:2]];
         CCSprite* ledge = [CCSprite spriteWithTexture:texture];
         ledge.position = ccp(rightmost + rightwidth + ledge.boundingBox.size.width/2+64+ledgeDistance, 32);
         [self addChild:ledge];
@@ -214,7 +237,7 @@
         {
         [self unscheduleAllSelectors];
         
-        [[CCDirector sharedDirector] replaceScene:[CCTransitionSlideInT transitionWithDuration:1.5f scene:[GameOverScene sceneWithScore:score gameMode:@"Jump"]]];
+        [[CCDirector sharedDirector] replaceScene:[CCTransitionSlideInT transitionWithDuration:1.5f scene:[GameOverScene sceneWithScore:score gameMode:[JumpGameMode info]]]];
         }
     
     if (wave)
@@ -355,23 +378,22 @@
 
 - (void)randomlyAddObject:(ccTime)dt
 {
-        FallingObject* object;
-    
+    int recipeIdentifier;
     int randomval = arc4random()%100;
     int pmChance = (5-pointMultiplier)*5 + 30;
     
     if (randomval < 30)
     {
-        object = [[OneUp alloc] init];
+        recipeIdentifier = kOneUpObject;
     } else if (randomval < pmChance)
     {
-        object = [[PointMultiplier alloc] init];
+        recipeIdentifier = kPointMultiplierObject;
     } else {
-        object = [[Rock alloc] init];
+        recipeIdentifier = kRockObject;
     }
         
+    FallingObject* object = [[objectFactory buildFallingObjectWithRecipeIdentifier:recipeIdentifier] retain];
         int objectX;
-    
     CGSize first = [cart.sprite boundingBox].size;
     CGSize second = [object.sprite boundingBox].size;
     
@@ -395,6 +417,7 @@
         break;
     }
     
+    object.delegate = self;
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
     object.fellDuringWave = waterTick > 0;
@@ -407,7 +430,7 @@
         {
                 if (arc4random() % 100 > 80)
                 {
-                        object = [[Rock alloc] init];
+                        object = [[objectFactory buildFallingObjectWithRecipeIdentifier:kRockObject] retain];
                         
                         for (;;)
             {
@@ -429,6 +452,7 @@
                 break;
             }
             
+            object.delegate = self;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
             object.fellDuringWave = waterTick > 0;
@@ -443,7 +467,7 @@
         {
                 if (arc4random() % 100 > 80)
                 {
-                        object = [[Rock alloc] init];
+                        object = [[objectFactory buildFallingObjectWithRecipeIdentifier:kRockObject] retain];
                         
                         for (;;)
             {
@@ -465,6 +489,7 @@
                 break;
             }
             
+            object.delegate = self;
                         object.sprite.position = ccp(objectX, 360);
                         object.sprite.scale = 1;
             object.fellDuringWave = waterTick > 0;
@@ -493,11 +518,28 @@
     }
 }
 
+- (void)didCatchItem:(FallingObject *)item
+{
+    if (item.objectType == kRockObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Damage1" ofType:@"wav"]];
+        self.lives--;
+    } else if (item.objectType == kOneUpObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"1up" ofType:@"wav"]];
+        self.lives++;
+    } else if (item.objectType == kPointMultiplierObject)
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Absorption2" ofType:@"wav"]];
+        self.pointMultiplier++;
+    }
+}
+
 - (void)setPitch:(double)m_pitch
 {
-    [super setPitch:m_pitch];
-    
-    expectedAngle = pitch*M_PI_2;
+  [super setPitch:m_pitch];
+  
+  expectedAngle = pitch*M_PI_2;
 }
 
 @end
@@ -1,18 +0,0 @@
-//
-//  OneUp.h
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "FallingObject.h"
-
-@interface OneUp : FallingObject {
-
-}
-
-- (id)init;
-
-@end
@@ -1,36 +0,0 @@
-//
-//  OneUp.m
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import "OneUp.h"
-#import "GameMode.h"
-#import "SimpleAudioEngine.h"
-
-@implementation OneUp
-
-- (id)init
-{
-        self = [super init];
-        
-        if (nil != self)
-        {
-                sprite = [CCSprite spriteWithFile:@"oneup.png"];
-        weight = 10;
-        }
-        
-        return self;
-}
-
-- (void)collideWithCart
-{
-    GameMode* gameLayer = ((GameMode*) sprite.parent);
-    [gameLayer setLives:gameLayer.lives+1];
-    
-    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"1up" ofType:@"wav"]];
-}
-
-@end
@@ -1,15 +0,0 @@
-//
-//  PointMultiplier.h
-//  Cartographic
-//
-//  Created by Starla Insigna on 9/10/11.
-//  Copyright (c) 2011 Four Island. All rights reserved.
-//
-
-#import "FallingObject.h"
-
-@interface PointMultiplier : FallingObject
-
-- (id)init;
-
-@end
@@ -1,36 +0,0 @@
-//
-//  PointMultiplier.m
-//  Cartographic
-//
-//  Created by Starla Insigna on 9/10/11.
-//  Copyright (c) 2011 Four Island. All rights reserved.
-//
-
-#import "PointMultiplier.h"
-#import "GameMode.h"
-#import "SimpleAudioEngine.h"
-
-@implementation PointMultiplier
-
-- (id)init
-{
-    self = [super init];
-    
-    if (nil != self)
-    {
-        sprite = [CCSprite spriteWithFile:@"multiplier.png"];
-        weight = 8;
-    }
-    
-    return self;
-}
-
-- (void)collideWithCart
-{
-    GameMode* gameLayer = ((GameMode*) sprite.parent);
-    [gameLayer setPointMultiplier:gameLayer.pointMultiplier+1];
-    
-    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Absorption2" ofType:@"wav"]];
-}
-
-@end
@@ -1,18 +0,0 @@
-//
-//  Rock.h
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "FallingObject.h"
-
-@interface Rock : FallingObject {
-
-}
-
-- (id)init;
-
-@end
@@ -1,37 +0,0 @@
-//
-//  Rock.m
-//  Cart Collect
-//
-//  Created by iD Student Account on 7/19/11.
-//  Copyright 2011 __MyCompanyName__. All rights reserved.
-//
-
-#import "Rock.h"
-#import "GameMode.h"
-#import "SimpleAudioEngine.h"
-
-@implementation Rock
-
-- (id)init
-{
-        self = [super init];
-        
-        if (nil != self)
-        {
-                sprite = [CCSprite spriteWithFile:@"rock.png"];
-        weight = 7;
-        }
-        
-        return self;
-}
-
-- (void)collideWithCart
-{
-    GameMode* gameLayer = ((GameMode*) sprite.parent);
-    [gameLayer setLives:gameLayer.lives-1];
-    
-    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Damage1" ofType:@"wav"]];
-}
-
-
-@end
@@ -18,7 +18,7 @@
 
 @property (nonatomic,retain) TutorialBubble* currentTutorial;
 - (void)endTutorial;
-- (FallingObject*)dropSpecificItem:(FallingObject*)item;
+- (FallingObject*)dropSpecificItem:(int)objectType;
 - (FallingObject*)dropRandomItem;
 - (void)randomlyAddObject:(ccTime)dt;
 
@@ -8,11 +8,10 @@
 
 #import "TutorialMode.h"
 #import "FallingObject.h"
-#import "Cherry.h"
-#import "Bottle.h"
-#import "OneUp.h"
-#import "Rock.h"
 #import "GameModeSelectionLayer.h"
+#import "SimpleAudioEngine.h"
+#import "ClassicGameMode.h"
+#import "JumpGameMode.h"
 
 // Item tags:
 //    2000 - first dropped item
@@ -22,10 +21,35 @@
 //    2009 - rock
 //    2010 - random item dropped after death from first rock
 
+typedef enum {
+    kCherryObject = 0,
+    kEnergyDrinkObject,
+    kOneUpObject,
+    kRockObject
+} FallingObjects;
+
 @implementation TutorialMode
 
 @synthesize currentTutorial;
 
+static GameModeInfo* info;
+
++ (GameModeInfo*)info
+{
+    if (info == nil)
+    {
+        info = [[GameModeInfo alloc] initWithName:@"Tutorial"
+                                         location:@"Florence"
+                                       numOfStars:0
+                                    imageFilename:[[NSBundle mainBundle] pathForResource:@"florence" ofType:@"png"] 
+                                         unlocked:YES
+                                        gameClass:[TutorialMode class]
+                               globalHighscoreKey:nil];
+    }
+    
+    return info;
+}
+
 - (id)init
 {
     self = [super init];
@@ -38,6 +62,11 @@
         
         showedDeathBubble = NO;
         randomItemsDropped = 0;
+        
+        [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;
@@ -79,6 +108,24 @@
 
 - (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--;
+    }
+    
     if (item.sprite.tag == 2000)
     {
         TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"Congratulations! If you look at your score, you'll see it increased. Catching items is good. Now, let's see what happens when you don't catch an item." name:@"caught-first"];
@@ -94,6 +141,12 @@
 
 - (void)didMissItem:(FallingObject *)item
 {
+    if ((item.objectType == kCherryObject) || (item.objectType == kEnergyDrinkObject))
+    {
+        [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Damage1" ofType:@"wav"]];
+        self.lives--;
+    }
+    
     if (item.sprite.tag == 2000)
     {
         TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"Whoops, you missed it! Look at your lives counter--you lost one! If you lose all of your lives, you lose the game. Try catching the item again." name:@"missed-first"];
@@ -111,7 +164,6 @@
         [self scheduleDelayedAction:^{
             FallingObject* object = [self dropRandomItem];
             object.sprite.tag = 2002;
-            [object release];
         } delay:1.0f];
     }
 }
@@ -181,7 +233,6 @@
         [self scheduleDelayedAction:^{
             FallingObject* object = [self dropRandomItem];
             object.sprite.tag = 2000;
-            [object release];
         } delay:3.0f];
     } else if ([currentTutorial.name isEqual:@"caught-first"])
     {
@@ -198,29 +249,24 @@
             }
             
             object.sprite.tag = 2001;
-            
-            [object release];
         } delay:1.0f];
     } else if ([currentTutorial.name isEqual:@"missed-first"])
     {
         [self scheduleDelayedAction:^{
             FallingObject* object = [self dropRandomItem];
             object.sprite.tag = 2002;
-            [object release];
         } delay:1.0f];
     } else if (([currentTutorial.name isEqual:@"caught-second"]) || ([currentTutorial.name isEqual:@"missed-second"]))
     {
         [self scheduleDelayedAction:^{
-            FallingObject* object = [self dropSpecificItem:[[OneUp alloc] init]];
+            FallingObject* object = [self dropSpecificItem:kOneUpObject];
             object.sprite.tag = 2003;
-            [object release];
         } delay:2.0f];
     } else if ([currentTutorial.name isEqual:@"gameover-rock"])
     {
         [self scheduleDelayedAction:^{
             FallingObject* object = [self dropRandomItem];
             object.sprite.tag = 2010;
-            [object release];
         } delay:1.0f];
     } else if ([currentTutorial.name isEqual:@"intense"])
     {
@@ -254,8 +300,9 @@
     }
 }
 
-- (FallingObject*)dropSpecificItem:(FallingObject*)object
+- (FallingObject*)dropSpecificItem:(int)objectType
 {
+    FallingObject* object = [[objectFactory buildFallingObjectWithRecipeIdentifier:objectType] retain];
     int objectX = arc4random()%448+16;
         object.sprite.position = ccp(objectX, 360);
         object.sprite.scale = 1;
@@ -265,27 +312,27 @@
         
         [objects addObject:object];
     
-    return object;
+    return [object autorelease];
 }
 
 - (FallingObject*)dropRandomItem
 {
-    FallingObject* object;
     int randomval = arc4random()%100;
+    int recipeIdentifier;
     
     if (randomval < 65)
     {
-        object = [[Cherry alloc] init];
+        recipeIdentifier = kCherryObject;
     } else {
-        object = [[Bottle alloc] init];
+        recipeIdentifier = kEnergyDrinkObject;
     }
     
-    return [self dropSpecificItem:object];
+    return [self dropSpecificItem:recipeIdentifier];
 }
 
 - (void)randomlyAddObject:(ccTime)dt
 {
-        FallingObject* object;
+        int recipeIdentifier;
     
         if (randomItemsDropped < 5)
         {
@@ -293,17 +340,16 @@
                 
                 if (randomval < 65)
                 {
-                        object = [[Cherry alloc] init];
+            recipeIdentifier = kCherryObject;
                 } else if (randomval < 98)
                 {
-                        object = [[Bottle alloc] init];
+                        recipeIdentifier = kEnergyDrinkObject;
                 } else {
-                        object = [[OneUp alloc] init];
+                        recipeIdentifier = kOneUpObject;
                 }
     } else if (randomItemsDropped == 5)
     {
-        object = [[Rock alloc] init];
-        object.sprite.tag = 2009;
+        recipeIdentifier = kRockObject;
         
         [self unschedule:@selector(randomlyAddObject:)];
         } else if (randomItemsDropped < 15) {
@@ -311,15 +357,15 @@
                 
                 if (randomval < 40)
                 {
-                        object = [[Cherry alloc] init];
+                        recipeIdentifier = kCherryObject;
                 } else if (randomval < 70)
                 {
-                        object = [[Rock alloc] init];
+                        recipeIdentifier = kRockObject;
                 } else if (randomval < 98)
                 {
-                        object = [[Bottle alloc] init];
+                        recipeIdentifier = kEnergyDrinkObject;
                 } else {
-                        object = [[OneUp alloc] init];
+                        recipeIdentifier = kOneUpObject;
                 }
         } else if (randomItemsDropped == 15)
     {
@@ -331,8 +377,8 @@
         
         [self unschedule:@selector(randomlyAddObject:)];
         
-        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
-        [defaults setBool:YES forKey:@"hasDoneTutorial"];
+        [[ClassicGameMode info] unlock];
+        [[JumpGameMode info] unlock];
         
         return;
     } else {
@@ -341,8 +387,12 @@
         return;
     }
     
-    [self dropSpecificItem:object];
-    [object release];
+    FallingObject* object = [self dropSpecificItem:recipeIdentifier];
+
+    if (randomItemsDropped == 5)
+    {
+        object.sprite.tag = 2009;
+    }
     
     randomItemsDropped++;
 }
@@ -1,15 +0,0 @@
-//
-//  ValuableObject.h
-//  Cart Collect
-//
-//  Created by Starla Insigna on 8/9/11.
-//  Copyright 2011 Four Island. All rights reserved.
-//
-
-#import "FallingObject.h"
-
-@interface ValuableObject : FallingObject
-
-- (int)pointValue;
-
-@end
@@ -1,46 +0,0 @@
-//
-//  ValuableObject.m
-//  Cart Collect
-//
-//  Created by Starla Insigna on 8/9/11.
-//  Copyright 2011 Four Island. All rights reserved.
-//
-
-#import "ValuableObject.h"
-#import "GameMode.h"
-#import "SimpleAudioEngine.h"
-
-@implementation ValuableObject
-
-- (id)init
-{
-    self = [super init];
-    if (self) {
-        // Initialization code here.
-    }
-    
-    return self;
-}
-
-- (void)collideWithCart
-{
-    GameMode* gameLayer = ((GameMode*) sprite.parent);
-    [gameLayer setScore:gameLayer.score+self.pointValue];
-    
-    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Item1" ofType:@"wav"]];
-}
-
-- (void)collideWithFloor
-{
-    GameMode* gameLayer = ((GameMode*) sprite.parent);
-    [gameLayer setLives:gameLayer.lives-1];
-    
-    [[SimpleAudioEngine sharedEngine] playEffect:[[NSBundle mainBundle] pathForResource:@"Damage1" ofType:@"wav"]];
-}
-
-- (int)pointValue
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)] userInfo:nil];
-}
-
-@end