1 files changed, 39 insertions, 19 deletions

@@ -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
@@ -20,6 +20,7 @@
 //    2002 - items that are dropped after you miss first dropped item to demonstrate what happens when you catch
 //    2003 - 1-Up
 //    2009 - rock
+//    2010 - random item dropped after death from first rock
 
 @implementation TutorialMode
 
@@ -47,7 +48,7 @@
     [super onEnterTransitionDidFinish];
     
     [self scheduleDelayedAction:^{
-        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"Welcome to Cart Collect. This is a tutorial designed to help you get started playing the game. Below this bubble is a cart. Tilt your device to move it." name:@"cart" spriteReference:cart.sprite];
+        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"Welcome to Cartographic. This is a tutorial designed to help you get started playing the game. Below this bubble is a cart. Tilt your device to move it." name:@"cart" spriteReference:cart.sprite];
         self.currentTutorial = bubble;
         [bubble release];
     } delay:2.0f];
@@ -122,7 +123,30 @@
         [self schedule:@selector(randomlyAddObject:) interval:2.5f];
     } else if (item.sprite.tag == 2009)
     {
-        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cart Collect gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
+        if ((lives < 1) && (!showedDeathBubble))
+        {
+            showedDeathBubble = YES;
+            
+            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"You lost all your lives! Normally, you'd be taken to a game over screen where you could submit your score to the highscore list, but we're a bit more forgiving in tutorial mode." name:@"gameover-rock"];
+            self.currentTutorial = bubble;
+            [bubble release];
+        } else {
+            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cartographic gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
+            self.currentTutorial = bubble;
+            [bubble release];
+        }
+    } else if (item.sprite.tag == 2010)
+    {
+        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"As you play, Cartographic gets progressively more intense. Watch what happens when rocks are added to the mix and the speed is turned up." name:@"intense"];
+        self.currentTutorial = bubble;
+        [bubble release];
+    }
+    
+    if ((lives < 1) && (!showedDeathBubble))
+    {
+        showedDeathBubble = YES;
+        
+        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"You lost all your lives! Normally, you'd be taken to a game over screen where you could submit your score to the highscore list, but we're a bit more forgiving in tutorial mode." name:@"gameover"];
         self.currentTutorial = bubble;
         [bubble release];
     }
@@ -191,12 +215,19 @@
             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"])
     {
         [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;
@@ -252,20 +283,6 @@
     return [self dropSpecificItem:object];
 }
 
-- (void)setLives:(int)m_lives
-{
-    [super setLives:m_lives];
-    
-    if ((lives < 1) && (!showedDeathBubble))
-    {
-        showedDeathBubble = YES;
-        
-        TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"You lost all your lives! Normally, you'd be taken to a game over screen where you could submit your score to the highscore list, but we're a bit more forgiving in tutorial mode." name:@"gameover"];
-        self.currentTutorial = bubble;
-        [bubble release];
-    }
-}
-
 - (void)randomlyAddObject:(ccTime)dt
 {
         FallingObject* object;
@@ -307,13 +324,16 @@
         } else if (randomItemsDropped == 15)
     {
         [self scheduleDelayedAction:^{
-            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"That's pretty much it! You've completed the tutorial, so now it's time to play an actual game of Cart Collect!" name:@"end"];
+            TutorialBubble* bubble = [[TutorialBubble alloc] initWithText:@"That's pretty much it! You've completed the tutorial, so now it's time to play an actual game of Cartographic!" name:@"end"];
             self.currentTutorial = bubble;
             [bubble release];
         } delay:2.0f];
         
         [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.");