5 files changed, 98 insertions, 23 deletions

@@ -16,6 +16,7 @@
     NSMutableSet* objects;
         int score;
         int lives;
+    int pointMultiplier;
     Cart* cart;
     
     CCLayerColor* shadedLayer;
@@ -32,6 +33,7 @@
 @property (readonly) Cart* cart;
 @property (nonatomic,assign) int score;
 @property (nonatomic,assign) int lives;
+@property (nonatomic,assign) int pointMultiplier;
 @property (readonly) BOOL isPaused;
 + (CCScene*)scene;
 - (void)tick:(ccTime)dt;
@@ -12,7 +12,7 @@
 
 @implementation GameMode
 
-@synthesize cart, score, lives, isPaused;
+@synthesize cart, score, lives, isPaused, pointMultiplier;
 
 + (CCScene*)scene
 {
@@ -53,6 +53,7 @@
                 
                 score = 0;
                 lives = 3;
+        pointMultiplier = 1;
                 
         if ([self canPause])
         {
@@ -159,7 +160,12 @@
 {
     score = m_score;
     
-    [scoreLabel setString:[NSString stringWithFormat:@"Score: %d", score]];
+    if (pointMultiplier > 1)
+    {
+        [scoreLabel setString:[NSString stringWithFormat:@"Score: %d x%d", score, pointMultiplier]];
+    } else {
+        [scoreLabel setString:[NSString stringWithFormat:@"Score: %d", score]];
+    }
 }
 
 - (void)setLives:(int)m_lives
@@ -169,6 +175,18 @@
     [livesLabel setString:[NSString stringWithFormat:@"Lives: %d", lives]];
 }
 
+- (void)setPointMultiplier:(int)m_pointMultiplier
+{
+    pointMultiplier = m_pointMultiplier;
+    
+    if (pointMultiplier > 1)
+    {
+        [scoreLabel setString:[NSString stringWithFormat:@"Score: %d x%d", score, pointMultiplier]];
+    } else {
+        [scoreLabel setString:[NSString stringWithFormat:@"Score: %d", score]];
+    }
+}
+
 - (void)scheduleDelayedAction:(void(^)(void))m_delayedAction delay:(float)delay
 {
     delayedAction = Block_copy([m_delayedAction retain]);
@@ -14,6 +14,7 @@
 #import "OneUp.h"
 #import "Rock.h"
 #import "GameOverScene.h"
+#import "PointMultiplier.h"
 
 #define kMinimumGestureLength  25
 
@@ -308,26 +309,17 @@
 {
         FallingObject* object;
     
-        if (score < 120)
-        {
-                int randomval = arc4random()%100;
-                
-                if (randomval < 80)
-                {
-                        object = [[Rock alloc] init];
-                } else {
-                        object = [[OneUp alloc] init];
-                }
-        } else {
-                int randomval = arc4random()%100;
-                
-                if (randomval < 70)
-                {
-                        object = [[Rock alloc] init];
-                } else {
-                        object = [[OneUp alloc] init];
-                }
-        }
+    int randomval = arc4random()%100;
+    
+    if (randomval < 50)
+    {
+        object = [[Rock alloc] init];
+    } else if (randomval < 75)
+    {
+        object = [[PointMultiplier alloc] init];
+    } else {
+        object = [[OneUp alloc] init];
+    }
         
         int objectX;
     
@@ -434,7 +426,19 @@
 
 - (void)incrementScore
 {
-    [self setScore:self.score+1];
+    [self setScore:self.score+pointMultiplier];
+}
+
+- (void)setLives:(int)m_lives
+{
+    int oldLives = lives;
+    
+    [super setLives:m_lives];
+    
+    if (oldLives > lives)
+    {
+        [self setPointMultiplier:1];
+    }
 }
 
 @end
@@ -0,0 +1,15 @@
+//
+//  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
@@ -0,0 +1,36 @@
+//
+//  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:@"Item1" ofType:@"wav"]];
+}
+
+@end