Merge branch 'RefactorPegs'

Author: s7u4rt99

ps4/peggleclone.xcodeproj/project.pbxproj

@@ -21,6 +21,9 @@
 		6834AD1E27C684E100F5A4E3 /* SLPhysicsBucket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6834AD1D27C684E100F5A4E3 /* SLPhysicsBucket.swift */; };
 		6834AD2527C762BD00F5A4E3 /* SpookyPeg.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6834AD2427C762BD00F5A4E3 /* SpookyPeg.swift */; };
 		6834AD2727C762CA00F5A4E3 /* KaboomPeg.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6834AD2627C762CA00F5A4E3 /* KaboomPeg.swift */; };
+		6834AD2927C76DB300F5A4E3 /* SpookyPegPersistance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6834AD2827C76DB300F5A4E3 /* SpookyPegPersistance.swift */; };
+		6834AD2B27C76DC600F5A4E3 /* KaboomPegPersistance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6834AD2A27C76DC600F5A4E3 /* KaboomPegPersistance.swift */; };
+		6834AD2D27C7D0A000F5A4E3 /* PowerUpHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6834AD2C27C7D09F00F5A4E3 /* PowerUpHandler.swift */; };
 		684FFA3C27C4C4EA000CD3D5 /* Point.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684FFA3B27C4C4E9000CD3D5 /* Point.swift */; };
 		684FFA3E27C4D547000CD3D5 /* Vector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 684FFA3D27C4D547000CD3D5 /* Vector.swift */; };
 		68686A9327B2E0D800B97394 /* GameCanvasView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68686A9227B2E0D800B97394 /* GameCanvasView.swift */; };
@@ -67,6 +70,9 @@
 		6834AD1D27C684E100F5A4E3 /* SLPhysicsBucket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SLPhysicsBucket.swift; sourceTree = "<group>"; };
 		6834AD2427C762BD00F5A4E3 /* SpookyPeg.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpookyPeg.swift; sourceTree = "<group>"; };
 		6834AD2627C762CA00F5A4E3 /* KaboomPeg.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaboomPeg.swift; sourceTree = "<group>"; };
+		6834AD2827C76DB300F5A4E3 /* SpookyPegPersistance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpookyPegPersistance.swift; sourceTree = "<group>"; };
+		6834AD2A27C76DC600F5A4E3 /* KaboomPegPersistance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaboomPegPersistance.swift; sourceTree = "<group>"; };
+		6834AD2C27C7D09F00F5A4E3 /* PowerUpHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PowerUpHandler.swift; sourceTree = "<group>"; };
 		684FFA3B27C4C4E9000CD3D5 /* Point.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Point.swift; sourceTree = "<group>"; };
 		684FFA3D27C4D547000CD3D5 /* Vector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Vector.swift; sourceTree = "<group>"; };
 		68686A9227B2E0D800B97394 /* GameCanvasView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameCanvasView.swift; sourceTree = "<group>"; };
@@ -155,6 +161,7 @@
 			isa = PBXGroup;
 			children = (
 				6831831427B4FEC900732E00 /* SLGameEngine.swift */,
+				6834AD2C27C7D09F00F5A4E3 /* PowerUpHandler.swift */,
 			);
 			path = SLGameEngine;
 			sourceTree = "<group>";
@@ -218,6 +225,8 @@
 				68B6B8D227C54117004CE9E2 /* PegPersistance.swift */,
 				68B6B8D427C54138004CE9E2 /* PeggleObjectPersistance.swift */,
 				68B6B8D627C558FE004CE9E2 /* PointPersistance.swift */,
+				6834AD2827C76DB300F5A4E3 /* SpookyPegPersistance.swift */,
+				6834AD2A27C76DC600F5A4E3 /* KaboomPegPersistance.swift */,
 			);
 			path = Persistance;
 			sourceTree = "<group>";
@@ -361,6 +370,8 @@
 				687C2B4127B61CF500D1BB1E /* PegColor.swift in Sources */,
 				68143567279EE7D700A16058 /* PegsRowView.swift in Sources */,
 				68B6B8D527C54138004CE9E2 /* PeggleObjectPersistance.swift in Sources */,
+				6834AD2D27C7D0A000F5A4E3 /* PowerUpHandler.swift in Sources */,
+				6834AD2B27C76DC600F5A4E3 /* KaboomPegPersistance.swift in Sources */,
 				684FFA3C27C4C4EA000CD3D5 /* Point.swift in Sources */,
 				68143578279FF0FB00A16058 /* LevelDesignerCanvasView.swift in Sources */,
 				689A4A0227A2CD7C00A2E4E6 /* AllLevelsManager.swift in Sources */,
@@ -384,6 +395,7 @@
 				68B6B8CE27C4F33D004CE9E2 /* PeggleObject.swift in Sources */,
 				6831831927B53F6500732E00 /* CannonView.swift in Sources */,
 				68143565279EE77400A16058 /* ButtonsRowView.swift in Sources */,
+				6834AD2927C76DB300F5A4E3 /* SpookyPegPersistance.swift in Sources */,
 				68B6B8D727C558FE004CE9E2 /* PointPersistance.swift in Sources */,
 				6834AD2527C762BD00F5A4E3 /* SpookyPeg.swift in Sources */,
 				68143574279FEE2100A16058 /* Peg.swift in Sources */,

ps4/peggleclone/Assets.xcassets/explosion-1.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "explosion-1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ps4/peggleclone/Assets.xcassets/explosion-1.imageset/explosion-1.png

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "explosion-10.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ps4/peggleclone/Assets.xcassets/explosion-10.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "explosion-11.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ps4/peggleclone/Assets.xcassets/explosion-10.imageset/explosion-10.png

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "explosion-12.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ps4/peggleclone/Assets.xcassets/explosion-11.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "explosion-13.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}