Merge remote-tracking branch 'origin/master'

# Conflicts: # FingersRevenge/FingersRevenge/GameScene.swift
AustinWilloughby · Dec 7, 2016 · 9feb7d5 · 9feb7d5
2 parents 7a53f2c + 641994c
commit 9feb7d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/...odeproj/project.xcworkspace/xcuserdata/student.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/student.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FingersRevenge/FingersRevenge/GameScene.swift b/FingersRevenge/FingersRevenge/GameScene.swift
@@ -50,6 +50,8 @@ class GameScene: SKScene, UIGestureRecognizerDelegate, SKPhysicsContactDelegate
     private var shaderTitles = [String]()
     var shaderIndex:Int = 0
 
+    var chunkCount:Int = 0
+    var maxChunks:Int = 20
 
     var healthBar:SKSpriteNode = SKSpriteNode(texture: SKTexture(image: #imageLiteral(resourceName: "ThreeHealth")))
 
@@ -151,7 +153,6 @@ class GameScene: SKScene, UIGestureRecognizerDelegate, SKPhysicsContactDelegate
                 s.run(SKAction.sequence([actionMove, actionMoveDone]))
                 self.levelScore -= 1
 
-                run(SKAction.playSoundFileNamed("nailClip.mp3", waitForCompletion: true))
                 playNailClip()
             }
         }
@@ -296,9 +297,10 @@ class GameScene: SKScene, UIGestureRecognizerDelegate, SKPhysicsContactDelegate
         addChild(scoreLabel)
 
         //If the game is stil progressing, load the right level. Otherwise start the first chunk of endless
-        if(GameData.level >= 4){
+        if(GameData.level >= 0){
             //Endless start
-            var level:[RectangleSprite] = levelManager.randomChunk()
+            chunkCount += 1
+            var level:[RectangleSprite] = levelManager.randomChunk(currentChunk: chunkCount, endChunk: maxChunks)
             for i in 0 ..< level.count{
                 addChild(level[i])
             }
@@ -347,7 +349,8 @@ class GameScene: SKScene, UIGestureRecognizerDelegate, SKPhysicsContactDelegate
             })
 
             if offTopCount <= 0 && !finishHasSpawned{
-                var level:[RectangleSprite] = self.levelManager.randomChunk()
+                chunkCount += 1
+                var level:[RectangleSprite] = levelManager.randomChunk(currentChunk: chunkCount, endChunk: maxChunks)
                 for i in 0 ..< level.count{
                     addChild(level[i])
                 }

diff --git a/FingersRevenge/FingersRevenge/LevelManager.swift b/FingersRevenge/FingersRevenge/LevelManager.swift
@@ -47,7 +47,7 @@ class LevelManager{
 
 
     //Load a chunk from a map string[], give starting height to know where it is in the world
-    private func loadChunk(map:[String], startingHeight: Int)->(newChunk: [RectangleSprite], height: Int){
+    func loadChunk(map:[String], startingHeight: Int)->(newChunk: [RectangleSprite], height: Int){
         var currentLine = map[0]
         let xSize: Int = tilesAcross
         let ySize: Int = map.count
@@ -186,8 +186,11 @@ class LevelManager{
     }
 
     //Get a random chunk back
-    func randomChunk() -> [RectangleSprite]{
-        return loadChunk(map: getChunkAtIndex(chunk: String(randRange(lower: 1, upper: 20))),startingHeight: 1920).0
+    func randomChunk(currentChunk: Int, endChunk: Int) -> [RectangleSprite]{
+        if(currentChunk > endChunk){
+            return loadChunk(map: LevelChunks.end, startingHeight: 1920).0
+        }
+        return loadChunk(map: getChunkAtIndex(chunk: String(randRange(lower: 1, upper: 17))),startingHeight: 1920).0
     }
 
     //Get the chunk at a given index