16 files changed, 762 insertions, 15 deletions

@@ -0,0 +1,19 @@
+//
+//  CocosOverlayScrollView.h
+//  shapes
+//
+//  Created by Nate Murray on 8/23/10.
+//  Copyright 2010 LittleHiccup. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "cocos2d.h"
+
+@interface CocosOverlayScrollView : UIScrollView <UIScrollViewDelegate>
+{
+    CCNode* targetLayer;
+    UIPageControl* pageControl;
+}
+@property(nonatomic, retain) CCNode* targetLayer;
+-(id) initWithFrame: (CGRect) frameRect numPages: (int) numPages width: (float) width layer: (CCNode*) layer pageControl:(UIPageControl*)pageControl;
+@end
@@ -0,0 +1,106 @@
+//
+//  CocosOverlayScrollView.m
+//  shapes
+//
+//  Created by Nate Murray on 8/23/10.
+//  Copyright 2010 LittleHiccup. All rights reserved.
+//
+
+#import "CocosOverlayScrollView.h"
+
+@implementation CocosOverlayScrollView
+@synthesize targetLayer;
+
+// Configure your favorite UIScrollView options here
+-(id) initWithFrame: (CGRect) frameRect numPages: (int) numPages width: (float) width layer: (CCNode*) layer pageControl:(UIPageControl *)m_pageControl{
+    if ((self = [super initWithFrame: frameRect])){ 
+        self.contentSize = CGSizeMake(width*numPages, 320);
+        self.bounces = YES;
+        self.delaysContentTouches = NO;
+        self.delegate = self;
+        self.pagingEnabled = YES;
+        self.scrollsToTop = NO;
+        self.showsVerticalScrollIndicator = NO;
+        self.showsHorizontalScrollIndicator = NO;
+        [self setUserInteractionEnabled:TRUE];
+        [self setScrollEnabled:TRUE];
+        self.targetLayer = layer;
+        // self.canCancelContentTouches  = YES;
+        pageControl = m_pageControl;
+    }
+    return self;
+}
+
+-(void) touchesBegan: (NSSet *) touches withEvent: (UIEvent *) event
+{
+    if (!self.dragging)
+    {
+        // UITouch* touch = [[touches allObjects] objectAtIndex:0];
+        // CGPoint location = [touch locationInView: [[touch view] superview]];
+        // CCLOG(@"touch at l.x:%f l.y:%f", location.x, location.y);
+
+        [self.nextResponder touchesBegan: touches withEvent:event];
+        [[[CCDirector sharedDirector] openGLView] touchesBegan:touches withEvent:event];
+    }
+
+    [super touchesBegan: touches withEvent: event];
+}
+
+-(void) touchesEnded: (NSSet *) touches withEvent: (UIEvent *) event
+{
+    if (!self.dragging)
+    {
+        [self.nextResponder touchesEnded: touches withEvent:event];
+        [[[CCDirector sharedDirector] openGLView] touchesEnded:touches withEvent:event];
+    }
+
+    [super touchesEnded: touches withEvent: event];
+}
+
+-(void) touchesCancelled: (NSSet *) touches withEvent: (UIEvent *) event
+{
+    // if (!self.dragging)
+    // {
+        // CCLOG(@"CocosOverlayScrollView touchesEnded not dragging");
+        [self.nextResponder touchesCancelled: touches withEvent:event];
+        [[[CCDirector sharedDirector] openGLView] touchesCancelled:touches withEvent:event];
+    // }
+    [super touchesCancelled: touches withEvent: event];
+}
+
+
+- (void)scrollViewWillBeginDecelerating:(UIScrollView *)scrollView
+{
+  // TODO - Custom code for handling deceleration of the scroll view
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    CGPoint dragPt = [scrollView contentOffset];
+    dragPt = [[CCDirector sharedDirector] convertToGL:dragPt];
+
+    dragPt.y = dragPt.y * -1;
+    dragPt.x = dragPt.x * -1;
+
+    CGPoint newLayerPosition = CGPointMake(dragPt.x, dragPt.y);
+
+    [targetLayer setPosition:newLayerPosition];
+}
+
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
+{
+    // CGPoint dragPt = [scrollView contentOffset];
+    // etc.
+}
+
+-(void) dealloc {
+    self.targetLayer = nil;
+    [super dealloc];
+}
+
+- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
+{
+    [pageControl setCurrentPage:(NSUInteger)([scrollView contentOffset].x / [scrollView frame].size.width)];
+}
+
+@end
\ No newline at end of file
@@ -0,0 +1,32 @@
+//
+//  GameModeSelection.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/18/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "cocos2d.h"
+#import "GameModeSelectionDelegate.h"
+
+@interface GameModeSelection : CCMenuItem {
+    NSString* name;
+    NSString* location;
+    BOOL unlocked;
+    NSString* unlockCondition;
+    id<GameModeSelectionDelegate> delegate;
+}
+
+@property (readonly) NSString* name;
+@property (readonly) NSString* location;
+@property (readonly) BOOL unlocked;
+@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 highscore:(int)highscore;
++ (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 highscore:(int)highscore;
+- (id)initWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename unlockCondition:(NSString*)unlockCondition;
+- (void)buttonTapped;
+
+@end
@@ -0,0 +1,228 @@
+//
+//  GameModeSelection.m
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/18/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "GameModeSelection.h"
+#import "UIImage+ColorMasking.h"
+#import "NMPanelMenu.h"
+
+@implementation GameModeSelection
+
+@synthesize name, location, unlocked, delegate;
+
++ (id)selectionWithName:(NSString*)name location:(NSString*)location filename:(NSString*)filename unlocked:(BOOL)unlocked
+{
+    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename unlocked:unlocked] autorelease];
+}
+
++ (id)selectionWithName:(NSString *)name location:(NSString *)location filename:(NSString *)filename highscore:(int)highscore
+{
+    return [[[GameModeSelection alloc] initWithName:name location:location filename:filename highscore:highscore] 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;
+{
+    self = [super initWithTarget:nil selector:nil];
+    
+    if (nil != self)
+    {
+        self.anchorPoint = CGPointMake(0.5f, 0.5f);
+        
+        name = m_name;
+        location = m_location;
+        unlocked = m_unlocked;
+        
+        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];
+        }
+        
+        // First, create the frame that we will put the level picture inside
+        CGImageRef framestuff = [[UIImage imageWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"framestuff" ofType:@"png"]] CGImage];
+        CGImageRef topLeftRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(0, 0, 8, 8));
+        CGImageRef topRightRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(8, 0, 8, 8));
+        CGImageRef bottomLeftRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(0, 8, 8, 8));
+        CGImageRef bottomRightRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(8, 8, 8, 8));
+        CGImageRef topBorderRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(0, 16, 8, 8));
+        CGImageRef leftBorderRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(8, 16, 8, 8));
+        CGImageRef rightBorderRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(0, 24, 8, 8));
+        CGImageRef bottomBorderRef = CGImageCreateWithImageInRect(framestuff, CGRectMake(8, 24, 8, 8));
+        UIImage* topLeft = [UIImage imageWithCGImage:topLeftRef];
+        UIImage* topRight = [UIImage imageWithCGImage:topRightRef];
+        UIImage* bottomLeft = [UIImage imageWithCGImage:bottomLeftRef];
+        UIImage* bottomRight = [UIImage imageWithCGImage:bottomRightRef];
+        UIImage* topBorder = [UIImage imageWithCGImage:topBorderRef];
+        UIImage* leftBorder = [UIImage imageWithCGImage:leftBorderRef];
+        UIImage* rightBorder = [UIImage imageWithCGImage:rightBorderRef];
+        UIImage* bottomBorder = [UIImage imageWithCGImage:bottomBorderRef];
+        CGImageRelease(topLeftRef);
+        CGImageRelease(topRightRef);
+        CGImageRelease(bottomLeftRef);
+        CGImageRelease(bottomRightRef);
+        CGImageRelease(topBorderRef);
+        CGImageRelease(leftBorderRef);
+        CGImageRelease(rightBorderRef);
+        CGImageRelease(bottomBorderRef);
+        
+        CGSize boxSize = CGSizeMake(128+12, 128+12);
+        UIGraphicsBeginImageContext(boxSize);
+        CGContextRef context = UIGraphicsGetCurrentContext();
+        [topLeft drawInRect:CGRectMake(0, 0, 8, 8)];
+        [topBorder drawInRect:CGRectMake(8, 0, boxSize.width-16, 8)];
+        [topRight drawInRect:CGRectMake(8+boxSize.width-16, 0, 8, 8)];
+        [rightBorder drawInRect:CGRectMake(8+boxSize.width-16, 8, 8, boxSize.height-16)];
+        [bottomRight drawInRect:CGRectMake(8+boxSize.width-16, 8+boxSize.height-16, 8, 8)];
+        [bottomBorder drawInRect:CGRectMake(8, 8+boxSize.height-16, boxSize.width-16, 8)];
+        [bottomLeft drawInRect:CGRectMake(0, 8+boxSize.height-16, 8, 8)];
+        [leftBorder drawInRect:CGRectMake(0, 8, 8, boxSize.height-16)];
+        CGContextSetFillColorWithColor(context, [[UIColor whiteColor] CGColor]);
+        CGContextFillRect(context, CGRectMake(8, 8, boxSize.width-16, boxSize.height-16));
+        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"]];
+        CGContextClipToMask(context, CGRectMake(0, 0, boxSize.width, boxSize.height), [[selectionBackground opaqueMaskFromWhiteImage] CGImage]);
+        [innerPicture drawInRect:CGRectMake(6, 6, 128, 128)];
+        selectionBackground = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+        
+        // The frame needs a shadow, so let's redraw it in a new context
+        UIGraphicsBeginImageContext(CGSizeMake(boxSize.width+10, boxSize.height+10));
+        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];
+        }
+        
+        CGContextRestoreGState(context);
+        CGImageRef pictureRef = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
+        
+        CCSprite* picture = [CCSprite spriteWithCGImage:pictureRef key:[NSString stringWithFormat:@"gms-%@", filenameMod]];
+        
+        // We're also going to need a "selected" image state for the button
+        CGContextSaveGState(context);
+        CGContextClipToMask(context, CGRectMake(10, 0, boxSize.width, boxSize.height), [selectionBackground CGImage]);
+        CGContextSetFillColorWithColor(context, [[UIColor colorWithRed:0 green:0 blue:0 alpha:0.5] CGColor]);
+        CGContextFillRect(context, CGRectMake(10, 0, boxSize.width, boxSize.height));
+        CGContextRestoreGState(context);
+        CGImageRef selectedButtonRef = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
+        UIGraphicsEndImageContext();
+        CCSprite* selectedButton = [CCSprite spriteWithCGImage:selectedButtonRef key:[NSString stringWithFormat:@"gms-%@-selected", filenameMod]];
+        
+        CCMenuItemSprite* pictureMenuItem = [CCMenuItemSprite itemFromNormalSprite:picture selectedSprite:selectedButton target:self selector:@selector(buttonTapped)];
+        NMPanelMenu* theMenu = [NMPanelMenu menuWithItems:pictureMenuItem, nil];
+        theMenu.position = ccp(-5, 0);
+        [self addChild:theMenu];
+        
+        // Render the titles
+        UIFont* titleFont = [UIFont fontWithName:@"AmericanTypewriter-Bold" size:18.0f];
+        CGSize titleSize = [location sizeWithFont:titleFont constrainedToSize:CGSizeMake(128, 0)];
+        UIFont* subtitleFont = [UIFont fontWithName:@"AmericanTypewriter" size:18.0f];
+        CGSize subtitleSize = [name sizeWithFont:subtitleFont constrainedToSize:CGSizeMake(128, 0)];
+        CGSize combinedTitleSize = CGSizeMake(128, titleSize.height + 10 + subtitleSize.height + 10);
+        
+        UIGraphicsBeginImageContext(combinedTitleSize);
+        context = UIGraphicsGetCurrentContext();
+        CGContextSetShadow(context, CGSizeMake(-6, 6), 4.0f);
+        [location drawInRect:CGRectMake(10, 0, 128, titleSize.height) withFont:titleFont lineBreakMode:UILineBreakModeWordWrap alignment:UITextAlignmentCenter];
+        [name drawInRect:CGRectMake(10, titleSize.height, 128, subtitleSize.height) withFont:subtitleFont lineBreakMode:UILineBreakModeWordWrap alignment:UITextAlignmentCenter];
+        
+        CGImageRef titleImage = [UIGraphicsGetImageFromCurrentImageContext() CGImage];
+        UIGraphicsEndImageContext();
+        CCSprite* titleSprite = [CCSprite spriteWithCGImage:titleImage key:[NSString stringWithFormat:@"gms-%@-title", filenameMod]];
+        titleSprite.position = ccp(-10, (boxSize.height)/2+(combinedTitleSize.height)/2);
+        [self addChild:titleSprite];
+    }
+    
+    return self;
+}
+
+- (id)initWithName:(NSString *)m_name location:(NSString *)m_location filename:(NSString *)m_filename highscore:(int)m_highscore
+{
+    self = [self initWithName:m_name location:m_location filename:m_filename unlocked:YES];
+    
+    if (nil != self)
+    {
+        if (m_highscore != 0)
+        {
+            // Render the highscore label
+            NSString* highscoreString = [NSString stringWithFormat:@"Highscore: %d", m_highscore];
+            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", m_filename]];
+            highscoreSprite.position = ccp((128-highscoreSize.width)/2, 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)
+        {
+            [delegate didSelectGameMode:self];
+        } else {
+            NSLog(@"I don't have a GameModeSelectionDelegate to call for some reason...");
+        }
+    } else {
+        UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"To unlock this game mode:" message:unlockCondition delegate:nil cancelButtonTitle:@"Cancel" otherButtonTitles:nil];
+        [alertView show];
+        [alertView release];
+    }
+}
+
+@end
@@ -0,0 +1,17 @@
+//
+//  GameModeSelectionDelegate.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/23/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class GameModeSelection;
+
+@protocol GameModeSelectionDelegate <NSObject>
+
+- (void)didSelectGameMode:(GameModeSelection*)gameMode;
+
+@end
@@ -0,0 +1,25 @@
+//
+//  GameModeSelectionLayer.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/18/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "cocos2d.h"
+#import "TouchDelegatingView.h"
+#import "CocosOverlayScrollView.h"
+#import "GameModeSelectionDelegate.h"
+
+@interface GameModeSelectionLayer : CCLayer <GameModeSelectionDelegate> {
+    NSMutableArray* gameModes;
+    TouchDelegatingView* touchDelegatingView;
+    CocosOverlayScrollView* scrollView;
+    UIPageControl* pageControl;
+}
+
++ (CCScene*)scene;
+- (id)init;
+- (void)mainmenu;
+
+@end
@@ -0,0 +1,138 @@
+//
+//  GameModeSelectionLayer.m
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/18/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "GameModeSelectionLayer.h"
+#import "GameModeSelection.h"
+#import <sqlite3.h>
+#import "Cart_CollectAppDelegate.h"
+#import "MainMenuLayer.h"
+#import "TutorialMode.h"
+#import "ClassicGameMode.h"
+
+@implementation GameModeSelectionLayer
+
++ (CCScene*)scene
+{
+    CCScene* scene = [CCScene node];
+    
+    CCLayer* backgroundLayer = [[[CCLayer alloc] init] autorelease];
+    CCSprite* backgroundImage = [CCSprite spriteWithFile:@"paintdaubs.png"];
+    backgroundImage.position = ccp(240,160);
+    [backgroundLayer addChild:backgroundImage];
+    [scene addChild:backgroundLayer];
+        
+        GameModeSelectionLayer* layer = [GameModeSelectionLayer node];
+        [scene addChild:layer];
+        
+        return scene;
+}
+
+- (id)init
+{
+    self = [super init];
+    
+    if (nil != self)
+    {
+        gameModes = [[NSMutableArray alloc] init];
+        CCMenu* menu = [CCMenu menuWithItems:nil];
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        float onePanelWide = 128;
+        
+        GameModeSelection* tutorialSelection = [GameModeSelection selectionWithName:@"Tutorial" location:@"Florence" filename:@"florence" unlocked:YES];
+        [gameModes addObject:tutorialSelection];
+        
+        GameModeSelection* collectSelection;
+        
+        if ([defaults boolForKey:@"hasDoneTutorial"])
+        {
+            const char* sqlQuery = "SELECT * FROM highscores ORDER BY score DESC LIMIT 1";
+            sqlite3_stmt* compiled_statement;
+            int score = 0;
+            
+            if (sqlite3_prepare_v2([Cart_CollectAppDelegate database], sqlQuery, -1, &compiled_statement, NULL) == SQLITE_OK)
+            {
+                if (sqlite3_step(compiled_statement) == SQLITE_ROW)
+                {
+                    score = sqlite3_column_int(compiled_statement, 2);
+                }
+            }
+            
+            collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" highscore:score];
+        } else {
+            collectSelection = [GameModeSelection selectionWithName:@"Collect" location:@"Paris" filename:@"paris" unlockCondition:@"Beat the tutorial!"];
+        }
+        
+        [gameModes addObject:collectSelection];
+        
+        float padding = 15;
+        float totalPanelWidth = onePanelWide + padding*2;
+        float numberOfPanels = [gameModes count];
+        float totalWidth = numberOfPanels * totalPanelWidth;
+        int currentWorldOffset = [defaults integerForKey:@"lastSelectedMode"];
+        CCLayer* panels = [CCLayer node];
+        
+        for (GameModeSelection* gameMode in gameModes)
+        {
+            [gameMode setDelegate:self];
+            [menu addChild:gameMode];
+        }
+        
+        [menu alignItemsHorizontallyWithPadding:padding*2];
+        [panels addChild:menu];
+        [self addChild:panels];
+        
+        pageControl = [[UIPageControl alloc] init];
+        pageControl.numberOfPages = numberOfPanels;
+        pageControl.currentPage = currentWorldOffset;
+        pageControl.frame = CGRectMake(0, 250, 480, 20);
+        [[[CCDirector sharedDirector] openGLView] addSubview:pageControl];
+        
+        menu.position = ccpAdd(menu.position, ccp(totalWidth/2 - totalPanelWidth/2, 320));
+        touchDelegatingView = [[TouchDelegatingView alloc] initWithFrame:CGRectMake(0, 0, 480, 320)];
+        scrollView = [[CocosOverlayScrollView alloc] initWithFrame:CGRectMake(0, 0, totalPanelWidth, 320) numPages:numberOfPanels width:totalPanelWidth layer:panels pageControl:pageControl];
+        touchDelegatingView.scrollView = scrollView;
+        [scrollView setContentOffset:CGPointMake(currentWorldOffset*totalPanelWidth+1,0) animated:NO];
+        [[[CCDirector sharedDirector] openGLView] addSubview:touchDelegatingView];
+        [[[CCDirector sharedDirector] openGLView] addSubview:scrollView];
+        
+        CCMenuItemImage* newgameMenuItem = [CCMenuItemImage itemFromNormalImage:@"back.png" selectedImage:@"back2.png" target:self selector:@selector(mainmenu)];
+        CCMenu* myMenu = [CCMenu menuWithItems:newgameMenuItem, nil];
+        myMenu.position = ccp(240, 30);
+        [self addChild:myMenu];
+    }
+    
+    return self;
+}
+
+- (void)onExit
+{
+    [touchDelegatingView removeFromSuperview];
+    [scrollView removeFromSuperview];
+    [pageControl removeFromSuperview];
+}
+
+- (void)mainmenu
+{
+    [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
+}
+
+- (void)didSelectGameMode:(GameModeSelection *)gameMode
+{
+    NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setInteger:[gameModes indexOfObject:gameMode] forKey:@"lastSelectedMode"];
+    
+    if ([gameMode.name isEqual:@"Tutorial"])
+    {
+        [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
+    } else if ([gameMode.name isEqual:@"Collect"])
+    {
+        [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]];
+    }
+}
+
+@end
@@ -16,7 +16,6 @@
 + (CCScene*)scene;
 - (id)init;
 - (void)newgame;
-- (void)tutorial;
 - (void)highscores;
 - (void)feedback;
 
@@ -8,8 +8,7 @@
 
 #import "MainMenuLayer.h"
 #import "HighscoreListController.h"
-#import "ClassicGameMode.h"
-#import "TutorialMode.h"
+#import "GameModeSelectionLayer.h"
 #import "Cart_CollectAppDelegate.h"
 #import "TestFlight.h"
 
@@ -46,11 +45,10 @@
                 //CCMenuItemLabel* menuItem2 = [CCMenuItemLabel itemWithLabel:menuItemLabel2 target:self selector:@selector(highscores)];
                 
                 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* highscoresMenuItem = [CCMenuItemImage itemFromNormalImage:@"highscores.png" selectedImage:@"highscores2.png" target:self selector:@selector(highscores)];
-        CCMenuItemImage* feedbackMenuItem = [CCMenuItemImage itemFromNormalImage:@"feedback.png" selectedImage:@"feedback2.png" target:self selector:@selector(feedback)];
-        
-        CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, tutorialMenuItem, highscoresMenuItem, feedbackMenuItem, nil];             
+                CCMenuItemImage* feedbackMenuItem = [CCMenuItemImage itemFromNormalImage:@"feedback.png" selectedImage:@"feedback2.png" target:self selector:@selector(feedback)];
+
+                CCMenu* menu = [CCMenu menuWithItems:newgameMenuItem, highscoresMenuItem, feedbackMenuItem, nil];
                 [menu alignItemsVertically];
                 menu.position = ccp(240, 100);
                 [self addChild:menu];
@@ -61,12 +59,7 @@
 
 - (void)newgame
 {
-    [[CCDirector sharedDirector] replaceScene:[ClassicGameMode scene]];
-}
-
-- (void)tutorial
-{
-    [[CCDirector sharedDirector] replaceScene:[TutorialMode scene]];
+    [[CCDirector sharedDirector] replaceScene:[GameModeSelectionLayer scene]];
 }
 
 - (void)highscores
@@ -0,0 +1,14 @@
+/*
+ *  NMPanelMenu.h
+ *  shapes
+ *
+ *  Created by Nate Murray on 7/29/10.
+ *  Copyright 2010 YetiApps. All rights reserved.
+ *
+ */
+
+#import "cocos2d.h"
+@interface NMPanelMenu : CCMenu {
+}
+-(CCMenuItem *) itemForTouch: (UITouch *) touch;
+@end
@@ -0,0 +1,37 @@
+/*
+ *  NMPanelMenu.m
+ *  shapes
+ *
+ *  Created by Nate Murray on 7/29/10.
+ *  Copyright 2010 YetiApps. All rights reserved.
+ *
+ */
+
+#import "NMPanelMenu.h"
+
+@implementation NMPanelMenu
+
+-(CCMenuItem *) itemForTouch: (UITouch *) touch
+{
+    CGPoint touchLocation = [touch locationInView: [[touch view] superview]];
+    touchLocation = [[CCDirector sharedDirector] convertToGL: touchLocation];
+
+    CCMenuItem* item;
+    CCARRAY_FOREACH(children_, item){
+        // ignore invisible and disabled items: issue #779, #866
+        if ( [item visible] && [item isEnabled] ) {
+
+            CGPoint local = [item convertToNodeSpace:touchLocation];
+
+            CGRect r = [item rect];
+            r.origin = CGPointZero;
+
+            if( CGRectContainsPoint( r, local ) ) {
+                return item;
+            }
+        }
+    }
+    return nil;
+}
+
+@end
@@ -0,0 +1,18 @@
+//
+//  TouchDelegatingView.h
+//  shapes
+//
+//  Created by Nate Murray on 8/23/10.
+//  Copyright 2010 LittleHiccup. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CocosOverLayScrollView.h"
+
+@interface TouchDelegatingView : UIView {
+    // UIPageControl* pageControl;
+    CocosOverlayScrollView* scrollView;
+}
+@property(nonatomic, retain) CocosOverlayScrollView* scrollView;
+
+@end
@@ -0,0 +1,26 @@
+//
+//  TouchDelegatingView.m
+//  Jacob's Shapes
+//
+//  Created by Nate Murray on 8/23/10.
+//  Copyright 2010 LittleHiccup. All rights reserved.
+//
+
+#import "TouchDelegatingView.h"
+
+@implementation TouchDelegatingView
+@synthesize scrollView;
+
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
+    if ([self pointInside:point withEvent:event]) {
+        return self.scrollView;
+    }
+    return nil;
+}
+
+-(void) dealloc {
+    self.scrollView = nil;
+        [super dealloc];
+}
+
+@end
@@ -12,7 +12,7 @@
 #import "Bottle.h"
 #import "OneUp.h"
 #import "Rock.h"
-#import "MainMenuLayer.h"
+#import "GameModeSelectionLayer.h"
 
 // Item tags:
 //    2000 - first dropped item
@@ -227,7 +227,7 @@
         [self schedule:@selector(randomlyAddObject:) interval:1.0f];
     } else if ([currentTutorial.name isEqual:@"end"])
     {
-        [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[MainMenuLayer scene] withColor:ccc3(0,0,0)]];
+        [[CCDirector sharedDirector] replaceScene:[CCTransitionFade transitionWithDuration:3.0f scene:[GameModeSelectionLayer scene] withColor:ccc3(0,0,0)]];
     }
     
     self.currentTutorial = nil;
@@ -331,6 +331,9 @@
         
         [self unschedule:@selector(randomlyAddObject:)];
         
+        NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setBool:YES forKey:@"hasDoneTutorial"];
+        
         return;
     } else {
         NSLog(@"randomItemsDropped in TutorialMode is greater than 15--this should never happen.");
@@ -0,0 +1,15 @@
+//
+//  UIImage+ColorMasking.h
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/22/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImage (ColorMasking)
+
+- (UIImage *)opaqueMaskFromWhiteImage;
+
+@end
@@ -0,0 +1,77 @@
+//
+//  UIImage+ColorMasking.m
+//  Cartographic
+//
+//  Created by Starla Insigna on 8/22/11.
+//  Copyright 2011 Four Island. All rights reserved.
+//
+
+#import "UIImage+ColorMasking.h"
+
+@implementation UIImage (ColorMasking)
+
+typedef enum {
+    ALPHA = 0,
+    BLUE = 1,
+    GREEN = 2,
+    RED = 3
+} PIXELS;
+
+- (UIImage *)opaqueMaskFromWhiteImage
+{
+    CGSize size = [self size];
+    int width = size.width;
+    int height = size.height;
+    
+    // the pixels will be painted to this array
+    uint32_t *pixels = (uint32_t *) malloc(width * height * sizeof(uint32_t));
+    
+    // clear the pixels so any transparency is preserved
+    memset(pixels, 0, width * height * sizeof(uint32_t));
+    
+    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+    
+    // create a context with RGBA pixels
+    CGContextRef context = CGBitmapContextCreate(pixels, width, height, 8, width * sizeof(uint32_t), colorSpace, 
+                                                 kCGBitmapByteOrder32Little | kCGImageAlphaPremultipliedLast);
+    
+    // paint the bitmap to our context which will fill in the pixels array
+    CGContextDrawImage(context, CGRectMake(0, 0, width, height), [self CGImage]);
+    
+    for(int y = 0; y < height; y++) {
+        for(int x = 0; x < width; x++) {
+            uint8_t *rgbaPixel = (uint8_t *) &pixels[y * width + x];
+            
+            if ((rgbaPixel[RED] == 255) && (rgbaPixel[GREEN] == 255) && (rgbaPixel[BLUE] == 255) && (rgbaPixel[ALPHA] == 255))
+            {
+                rgbaPixel[RED] = 255;
+                rgbaPixel[GREEN] = 255;
+                rgbaPixel[BLUE] = 255;
+                rgbaPixel[ALPHA] = 255;
+            } else {
+                rgbaPixel[RED] = 0;
+                rgbaPixel[GREEN] = 0;
+                rgbaPixel[BLUE] = 0;        
+                rgbaPixel[ALPHA] = 0;
+            }
+        }
+    }
+    
+    // create a new CGImageRef from our context with the modified pixels
+    CGImageRef image = CGBitmapContextCreateImage(context);
+    
+    // we're done with the context, color space, and pixels
+    CGContextRelease(context);
+    CGColorSpaceRelease(colorSpace);
+    free(pixels);
+    
+    // make a new UIImage to return
+    UIImage *resultUIImage = [UIImage imageWithCGImage:image];
+    
+    // we're done with image now too
+    CGImageRelease(image);
+    
+    return resultUIImage;
+}
+
+@end