Added tutorial mode

GameLayer was also renamed to ClassicGameMode and its pause functionality and score/lives counters were moved out to GameMode. FallingObjectDelegate was created to allow for custom code to be run when items were caught/missed, something that is used extensively by tutorial mode.

Important: Cart Collect's bundle identifier was changed in this revision from com.fourisland.Cart-Collect to com.apatheticink.Cart-Collect, so ensure that before attempting to compile/run this build, you clear your build directory and remove the old version of Cart Collect from your device.

Closes #193

1 files changed, 28 insertions, 12 deletions

@@ -43,7 +43,7 @@
                 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F83955213D739B10059AEE8 /* MainMenuLayer.m */; };
                 3F8395B813D744420059AEE8 /* cartdata.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */; };
                 3F8395D113D746200059AEE8 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */; };
-                3FE79CD413D4DE37001A6B93 /* GameLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FE79CD313D4DE37001A6B93 /* GameLayer.m */; };
+                3FE79CD413D4DE37001A6B93 /* ClassicGameMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FE79CD313D4DE37001A6B93 /* ClassicGameMode.m */; };
                 504DFC4810AF1557006D82FE /* CLScoreServerPost.h in Headers */ = {isa = PBXBuildFile; fileRef = 504DFC4210AF1557006D82FE /* CLScoreServerPost.h */; };
                 504DFC4910AF1557006D82FE /* CLScoreServerPost.m in Sources */ = {isa = PBXBuildFile; fileRef = 504DFC4310AF1557006D82FE /* CLScoreServerPost.m */; };
                 504DFC4A10AF1557006D82FE /* CLScoreServerRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 504DFC4410AF1557006D82FE /* CLScoreServerRequest.h */; };
@@ -91,6 +91,9 @@
                 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C29041113EAEC8A0032DA0F /* framestuff.png */; };
                 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C5179C513DF3839006F1F38 /* Morning1.png */; };
                 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */; };
+                6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CC89DDE13F31413003704F7 /* TutorialMode.m */; };
+                6CF29FF013F5580400C83428 /* skiptutorial.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CF29FEE13F5580400C83428 /* skiptutorial.png */; };
+                6CF29FF113F5580400C83428 /* skiptutorial2.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CF29FEF13F5580400C83428 /* skiptutorial2.png */; };
                 DC6640030F83B3EA000B3E49 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */; };
                 DC6640050F83B3EA000B3E49 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC6640040F83B3EA000B3E49 /* OpenAL.framework */; };
                 DCCBF1B70F6022AE0040855A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCCBF1B60F6022AE0040855A /* CoreGraphics.framework */; };
@@ -338,8 +341,8 @@
                 3F83955213D739B10059AEE8 /* MainMenuLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainMenuLayer.m; sourceTree = "<group>"; };
                 3F8395B713D744420059AEE8 /* cartdata.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = cartdata.sqlite3; sourceTree = "<group>"; };
                 3F8395D013D746200059AEE8 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
-                3FE79CD213D4DE37001A6B93 /* GameLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameLayer.h; sourceTree = "<group>"; };
-                3FE79CD313D4DE37001A6B93 /* GameLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameLayer.m; sourceTree = "<group>"; };
+                3FE79CD213D4DE37001A6B93 /* ClassicGameMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClassicGameMode.h; sourceTree = "<group>"; };
+                3FE79CD313D4DE37001A6B93 /* ClassicGameMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ClassicGameMode.m; sourceTree = "<group>"; };
                 504DFC4210AF1557006D82FE /* CLScoreServerPost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLScoreServerPost.h; sourceTree = "<group>"; };
                 504DFC4310AF1557006D82FE /* CLScoreServerPost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CLScoreServerPost.m; sourceTree = "<group>"; };
                 504DFC4410AF1557006D82FE /* CLScoreServerRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLScoreServerRequest.h; sourceTree = "<group>"; };
@@ -387,6 +390,11 @@
                 6C29041113EAEC8A0032DA0F /* framestuff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = framestuff.png; sourceTree = "<group>"; };
                 6C5179C513DF3839006F1F38 /* Morning1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Morning1.png; sourceTree = "<group>"; };
                 6CC89DD813F2F4E6003704F7 /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
+                6CC89DDD13F31413003704F7 /* TutorialMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TutorialMode.h; sourceTree = "<group>"; };
+                6CC89DDE13F31413003704F7 /* TutorialMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TutorialMode.m; sourceTree = "<group>"; };
+                6CC89DE013F3197F003704F7 /* FallingObjectDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FallingObjectDelegate.h; sourceTree = "<group>"; };
+                6CF29FEE13F5580400C83428 /* skiptutorial.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = skiptutorial.png; sourceTree = "<group>"; };
+                6CF29FEF13F5580400C83428 /* skiptutorial2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = skiptutorial2.png; sourceTree = "<group>"; };
                 DC6640020F83B3EA000B3E49 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
                 DC6640040F83B3EA000B3E49 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
                 DCCBF1B60F6022AE0040855A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -736,6 +744,8 @@
                 3F7D0EC713D8E6B000B6CE14 /* Buttons */ = {
                         isa = PBXGroup;
                         children = (
+                                6CF29FEE13F5580400C83428 /* skiptutorial.png */,
+                                6CF29FEF13F5580400C83428 /* skiptutorial2.png */,
                                 3F7D0F4813D8F17C00B6CE14 /* highscores.png */,
                                 3F7D0F4913D8F17C00B6CE14 /* highscores2.png */,
                                 3F7D0F4A13D8F17C00B6CE14 /* newgame.png */,
@@ -836,8 +846,10 @@
                         children = (
                                 6C0C141213F20E98003A31B2 /* GameMode.h */,
                                 6C0C141313F20E98003A31B2 /* GameMode.m */,
-                                3FE79CD213D4DE37001A6B93 /* GameLayer.h */,
-                                3FE79CD313D4DE37001A6B93 /* GameLayer.m */,
+                                3FE79CD213D4DE37001A6B93 /* ClassicGameMode.h */,
+                                3FE79CD313D4DE37001A6B93 /* ClassicGameMode.m */,
+                                6CC89DDD13F31413003704F7 /* TutorialMode.h */,
+                                6CC89DDE13F31413003704F7 /* TutorialMode.m */,
                         );
                         name = "Game Modes";
                         sourceTree = "<group>";
@@ -859,6 +871,7 @@
                                 6C0C140D13F1C3EC003A31B2 /* ValuableObject.m */,
                                 6C0C140F13F2099B003A31B2 /* Cart.h */,
                                 6C0C141013F2099B003A31B2 /* Cart.m */,
+                                6CC89DE013F3197F003704F7 /* FallingObjectDelegate.h */,
                         );
                         name = Items;
                         sourceTree = "<group>";
@@ -1325,6 +1338,8 @@
                                 6C5179C613DF3839006F1F38 /* Morning1.png in Resources */,
                                 6C29041213EAEC8A0032DA0F /* framestuff.png in Resources */,
                                 6CC89DD913F2F4E6003704F7 /* Entitlements.plist in Resources */,
+                                6CF29FF013F5580400C83428 /* skiptutorial.png in Resources */,
+                                6CF29FF113F5580400C83428 /* skiptutorial2.png in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -1338,7 +1353,7 @@
                                 1D60589B0D05DD56006BFB54 /* main.m in Sources */,
                                 507022A4107672FA00393637 /* Cart_CollectAppDelegate.m in Sources */,
                                 E0F81038120A173C005866B8 /* RootViewController.m in Sources */,
-                                3FE79CD413D4DE37001A6B93 /* GameLayer.m in Sources */,
+                                3FE79CD413D4DE37001A6B93 /* ClassicGameMode.m in Sources */,
                                 3F6C7C4F13D5E1B600C038FE /* FallingObject.m in Sources */,
                                 3F6C7C6D13D5E51800C038FE /* Cherry.m in Sources */,
                                 3F6C7C7013D5E54E00C038FE /* Bottle.m in Sources */,
@@ -1352,6 +1367,7 @@
                                 6C0C140E13F1C3EC003A31B2 /* ValuableObject.m in Sources */,
                                 6C0C141113F2099B003A31B2 /* Cart.m in Sources */,
                                 6C0C141413F20E98003A31B2 /* GameMode.m in Sources */,
+                                6CC89DDF13F31413003704F7 /* TutorialMode.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                 };
@@ -1487,8 +1503,8 @@
                                         "-ObjC",
                                 );
                                 PRODUCT_NAME = "Cart Collect";
-                                PROVISIONING_PROFILE = "D4BA5E2C-C75B-4F36-A5F6-AF4A3C6072A5";
-                                "PROVISIONING_PROFILE[sdk=iphoneos*]" = "D4BA5E2C-C75B-4F36-A5F6-AF4A3C6072A5";
+                                PROVISIONING_PROFILE = "42DE7CBA-2166-4560-9EE8-5D227F4278B1";
+                                "PROVISIONING_PROFILE[sdk=iphoneos*]" = "42DE7CBA-2166-4560-9EE8-5D227F4278B1";
                                 TARGETED_DEVICE_FAMILY = 1;
                                 WARNING_CFLAGS = "-Wall";
                         };
@@ -1513,8 +1529,8 @@
                                         "-ObjC",
                                 );
                                 PRODUCT_NAME = "Cart Collect";
-                                PROVISIONING_PROFILE = "D4BA5E2C-C75B-4F36-A5F6-AF4A3C6072A5";
-                                "PROVISIONING_PROFILE[sdk=iphoneos*]" = "D4BA5E2C-C75B-4F36-A5F6-AF4A3C6072A5";
+                                PROVISIONING_PROFILE = "42DE7CBA-2166-4560-9EE8-5D227F4278B1";
+                                "PROVISIONING_PROFILE[sdk=iphoneos*]" = "42DE7CBA-2166-4560-9EE8-5D227F4278B1";
                                 TARGETED_DEVICE_FAMILY = 1;
                                 WARNING_CFLAGS = "-Wall";
                         };
@@ -1597,8 +1613,8 @@
                                         "-ObjC",
                                 );
                                 PRODUCT_NAME = "Cart Collect";
-                                PROVISIONING_PROFILE = "D4BA5E2C-C75B-4F36-A5F6-AF4A3C6072A5";
-                                "PROVISIONING_PROFILE[sdk=iphoneos*]" = "D4BA5E2C-C75B-4F36-A5F6-AF4A3C6072A5";
+                                PROVISIONING_PROFILE = "42DE7CBA-2166-4560-9EE8-5D227F4278B1";
+                                "PROVISIONING_PROFILE[sdk=iphoneos*]" = "42DE7CBA-2166-4560-9EE8-5D227F4278B1";
                                 TARGETED_DEVICE_FAMILY = 1;
                                 WARNING_CFLAGS = "-Wall";
                         };