1 files changed, 25 insertions, 21 deletions

@@ -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