Merge pull request #6 from JarWarren/develop

prevent flapping when offscreen
JarWarren · Oct 2, 2020 · 7882608 · 7882608
2 parents 3babf96 + 5c05e39
commit 7882608
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 12 deletions.
diff --git a/FlappyBird.xcodeproj/project.pbxproj b/FlappyBird.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		7E04B6832526FF2900EA1A47 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E04B6822526FF2900EA1A47 /* Constants.swift */; };
 		7EBCD035251ADA7800EAE987 /* SKScene+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EBCD034251ADA7800EAE987 /* SKScene+Extension.swift */; };
 		7EBCD04D251B173100EAE987 /* point.wav in Resources */ = {isa = PBXBuildFile; fileRef = 7EBCD048251B173000EAE987 /* point.wav */; };
 		7EBCD04E251B173100EAE987 /* hit.wav in Resources */ = {isa = PBXBuildFile; fileRef = 7EBCD049251B173100EAE987 /* hit.wav */; };
@@ -28,6 +29,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		7E04B6822526FF2900EA1A47 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 		7EBCD034251ADA7800EAE987 /* SKScene+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SKScene+Extension.swift"; sourceTree = "<group>"; };
 		7EBCD048251B173000EAE987 /* point.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = point.wav; sourceTree = "<group>"; };
 		7EBCD049251B173100EAE987 /* hit.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = hit.wav; sourceTree = "<group>"; };
@@ -106,6 +108,7 @@
 				7EBCD047251B171700EAE987 /* Audio */,
 				7EC572FA2518689000BE760C /* AppDelegate.swift */,
 				7EC573072518689100BE760C /* Assets.xcassets */,
+				7E04B6822526FF2900EA1A47 /* Constants.swift */,
 				7EC573092518689100BE760C /* Info.plist */,
 				7EBCD053251B177500EAE987 /* Launch.storyboard */,
 			);
@@ -246,6 +249,7 @@
 				7EC573012518689000BE760C /* GameScene.swift in Sources */,
 				7EC573032518689000BE760C /* GameViewController.swift in Sources */,
 				7EBCD035251ADA7800EAE987 /* SKScene+Extension.swift in Sources */,
+				7E04B6832526FF2900EA1A47 /* Constants.swift in Sources */,
 				7EC572FB2518689000BE760C /* AppDelegate.swift in Sources */,
 				7EC5733925188B3700BE760C /* Bird.swift in Sources */,
 				7EC5737525196A4F00BE760C /* Score.swift in Sources */,

diff --git a/FlappyBird/Classes/Bird.swift b/FlappyBird/Classes/Bird.swift
@@ -9,8 +9,8 @@ import SpriteKit
 
 class Bird: SKSpriteNode {
 
-    private var flapSound: SKAction { .playSoundFileNamed("wing.wav", waitForCompletion: false) }
-    private var deathSound: SKAction { .playSoundFileNamed("die.wav", waitForCompletion: false) }
+    private var flapSound: SKAction { .playSoundFileNamed(Constants.sounds.flap, waitForCompletion: false) }
+    private var deathSound: SKAction { .playSoundFileNamed(Constants.sounds.death, waitForCompletion: false) }
     private var maximumUpwardVelocity: CGFloat = 18
     private var upwardVelocity: CGFloat = 0
     private var maximumAngularVelocity: CGFloat = 1
@@ -20,7 +20,7 @@ class Bird: SKSpriteNode {
     private var state: GameState = .ready
 
     func flap() {
-        guard isAlive else { return }
+        guard isAlive, position.y < Constants.gameplay.birdUpperLimit else { return }
         removeAllActions()
         upwardVelocity = maximumUpwardVelocity
         zRotation = 0.7

diff --git a/FlappyBird/Classes/Ground.swift b/FlappyBird/Classes/Ground.swift
@@ -30,7 +30,7 @@ extension Ground: GameObject {
 
     func update() {
         guard shouldUpdate else { return }
-        segments.forEach { $0.position.x -= 4 }
+        segments.forEach { $0.position.x -= Constants.gameplay.gameSpeed }
         if segments[leadSegment].position.x <= -820 {
             segments[leadSegment].position.x += segments[leadSegment].size.width * 3
             updateLeadSegment()

diff --git a/FlappyBird/Classes/Pipe.swift b/FlappyBird/Classes/Pipe.swift
@@ -17,8 +17,10 @@ class Pipe: SKNode {
     weak var delegate: PipeDelegate?
 
     private func reset() {
-        position.x += 1080
-        position.y = CGFloat.random(in: -80...240)
+        if position.x < Constants.gameplay.pipeLimitRight {
+            position.x += 1080
+        }
+        position.y = CGFloat.random(in: Constants.gameplay.pipeSafeRange)
         hasScored = false
     }
 }
@@ -30,14 +32,14 @@ extension Pipe: GameObject {
 
     func update() {
         guard shouldUpdate else { return }
-        position.x -= 4
+        position.x -= Constants.gameplay.gameSpeed
 
-        if !hasScored && position.x <= -160 {
+        if !hasScored && position.x <= Constants.gameplay.birdPosition {
             hasScored = true
             delegate?.pipeDidScore()
         }
 
-        if position.x <= -640 {
+        if position.x <= Constants.gameplay.pipeLimitLeft {
             reset()
         }
     }

diff --git a/FlappyBird/GameScene/GameScene.sks b/FlappyBird/GameScene/GameScene.sks
diff --git a/FlappyBird/GameScene/GameScene.swift b/FlappyBird/GameScene/GameScene.swift
@@ -23,9 +23,9 @@ protocol GameObject: AnyObject {
 class GameScene: SKScene {
 
     private var onCooldown = false
-    private var collisionSound: SKAction { .playSoundFileNamed("hit.wav", waitForCompletion: false) }
-    private var scoreSound: SKAction { .playSoundFileNamed("point.wav", waitForCompletion: false) }
-    private var swooshSound: SKAction { .playSoundFileNamed("swoosh.wav", waitForCompletion: false) }
+    private var collisionSound: SKAction { .playSoundFileNamed(Constants.sounds.collision, waitForCompletion: false) }
+    private var scoreSound: SKAction { .playSoundFileNamed(Constants.sounds.score, waitForCompletion: false) }
+    private var swooshSound: SKAction { .playSoundFileNamed(Constants.sounds.swoosh, waitForCompletion: false) }
     private lazy var background = childNode(withName: "Background") as! Background
     private lazy var readyMessage = childNode(withName: "Message") as! SKSpriteNode
     private lazy var gameOverMessage = childNode(withName: "GameOver") as! SKSpriteNode

diff --git a/FlappyBird/Resources/Constants.swift b/FlappyBird/Resources/Constants.swift
@@ -0,0 +1,32 @@
+//
+//  Constants.swift
+//  FlappyBird
+//
+//  Created by Jared Warren on 10/2/20.
+//
+
+import CoreGraphics
+
+enum Constants {
+
+    static let sounds = SoundConstants()
+    static let gameplay = GameplayConstants()
+
+}
+
+struct SoundConstants {
+    let collision = "hit.wav"
+    let death = "die.wav"
+    let flap = "wing.wav"
+    let score = "point.wav"
+    let swoosh = "swoosh.wav"
+}
+
+struct GameplayConstants {
+    let birdPosition: CGFloat = -160
+    let birdUpperLimit: CGFloat = 600
+    let gameSpeed: CGFloat = 4
+    let pipeLimitLeft: CGFloat = -640
+    let pipeLimitRight: CGFloat = 2000
+    let pipeSafeRange: ClosedRange<CGFloat> = -80...240
+}