1 files changed, 63 insertions, 21 deletions

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