diff --git a/PowerUp Handout.pdf b/PowerUp Handout.pdf old mode 100644 new mode 100755 diff --git a/PowerUp.pdf b/PowerUp.pdf old mode 100644 new mode 100755 diff --git a/Powerup.xcodeproj/project.pbxproj b/Powerup.xcodeproj/project.pbxproj old mode 100644 new mode 100755 diff --git a/Powerup/Accessories.swift b/Powerup/Accessories.swift index e50f87ba..d5ea2935 100755 --- a/Powerup/Accessories.swift +++ b/Powerup/Accessories.swift @@ -8,6 +8,7 @@ import UIKit class Accessories: UIViewController { var points = 0 + var idno = 0 var databasePath = NSString() @IBOutlet weak var pointsLabel: UILabel! @@ -73,7 +74,6 @@ class Accessories: UIViewController { hatsview.image = UIImage(named: "\(hats[0]).png") necklaceview.image = UIImage(named: "\(necklace[0]).png") - /****** Take points value from updated database- Table Score*****/ //pointsLabel.text = "\(points)" let dirPaths = @@ -122,7 +122,7 @@ class Accessories: UIViewController { { necklaceLabel.text = nResults?.stringForColumn("Points") } - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) @@ -542,12 +542,12 @@ class Accessories: UIViewController { // opening the database and extracting content through suitable queries if mainDB.open(){ - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) if presults?.next() == true { - print("Selected Points entry from ID=1") + print("Selected Points entry") let x = presults?.stringForColumn("Points") let bagsRes = "SELECT Points FROM Accessories Where Name='\(handbags[handbagscount])'" let bresults:FMResultSet? = mainDB.executeQuery(bagsRes, @@ -563,7 +563,7 @@ class Accessories: UIViewController { if(a >= b ) { paidbagsLabel.hidden = false - let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID=1" + let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID='\(idno)'" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ print("Failed to add data to Avatar Table") @@ -661,13 +661,13 @@ class Accessories: UIViewController { // opening the database and extracting content through suitable queries if mainDB.open(){ - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) if presults?.next() == true { - print("Selected Points entry from ID=1") + print("Selected Points entry") let x = presults?.stringForColumn("Points") let bagsRes = "SELECT Points FROM Accessories Where Name='\(glasses[glassescount])'" let bresults:FMResultSet? = mainDB.executeQuery(bagsRes, @@ -683,7 +683,7 @@ class Accessories: UIViewController { if(a >= b ) { paidglassesLabel.hidden = false - let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID=1" + let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID='\(idno)'" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ print("Failed to add data to Avatar Table") @@ -778,13 +778,13 @@ class Accessories: UIViewController { // opening the database and extracting content through suitable queries if mainDB.open(){ - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) if presults?.next() == true { - print("Selected Points entry from ID=1") + print("Selected Points entry") let x = presults?.stringForColumn("Points") let bagsRes = "SELECT Points FROM Accessories Where Name='\(hats[hatscount])'" let bresults:FMResultSet? = mainDB.executeQuery(bagsRes, @@ -800,7 +800,7 @@ class Accessories: UIViewController { if(a >= b ) { paidhatsLabel.hidden = false - let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID=1" + let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID='\(idno)'" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ print("Failed to add data to Avatar Table") @@ -899,13 +899,13 @@ class Accessories: UIViewController { // opening the database and extracting content through suitable queries if mainDB.open(){ - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) if presults?.next() == true { - print("Selected Points entry from ID=1") + print("Selected Points entry") let x = presults?.stringForColumn("Points") let bagsRes = "SELECT Points FROM Accessories Where Name='\(necklace[necklacecount])'" let bresults:FMResultSet? = mainDB.executeQuery(bagsRes, @@ -921,7 +921,7 @@ class Accessories: UIViewController { if(a >= b ) { paidnecklaceLabel.hidden = false - let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID=1" + let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID='\(idno)'" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ print("Failed to add data to Avatar Table") @@ -972,4 +972,17 @@ class Accessories: UIViewController { } } + override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { + if segue.identifier == "fromAccess" + { + if let destinationVC = segue.destinationViewController as? DressingRoom2{ + destinationVC.idno = idno + destinationVC.eyeImage = eyesview.image + destinationVC.hairImage = hairview.image + destinationVC.clothesImage = clothesview.image + destinationVC.faceImage = faceview.image + + } + } + } } \ No newline at end of file diff --git a/Powerup/Base.lproj/Main.storyboard b/Powerup/Base.lproj/Main.storyboard index 5b28087c..d41f3721 100755 --- a/Powerup/Base.lproj/Main.storyboard +++ b/Powerup/Base.lproj/Main.storyboard @@ -1378,6 +1378,9 @@ + + + @@ -1463,6 +1466,15 @@ + @@ -1497,6 +1509,9 @@ + + + @@ -1582,6 +1597,15 @@ + @@ -1599,7 +1623,7 @@ - + @@ -1616,6 +1640,9 @@ + + + @@ -1827,6 +1854,15 @@ + @@ -1857,7 +1893,7 @@ - + @@ -2098,7 +2134,7 @@ - + @@ -2149,14 +2185,8 @@ - + - @@ -2178,6 +2208,12 @@ + @@ -2361,14 +2397,15 @@ - - - + + + + diff --git a/Powerup/Choices-EndScreen.swift b/Powerup/Choices-EndScreen.swift index acd011a1..a4383e7c 100755 --- a/Powerup/Choices-EndScreen.swift +++ b/Powerup/Choices-EndScreen.swift @@ -75,10 +75,18 @@ class Choices_EndScreen: UIViewController { if segue.identifier == "nextView" { if let destinationVC = segue.destinationViewController as? DressingRoom2{ - //counter += 1 + destinationVC.points = numberToDisplay - //destinationVC.numberToDisplay = counter + if(numberToDisplay == 0){ + destinationVC.idno = 1 + } + else if(numberToDisplay == 10){ + destinationVC.idno = 2 + } + else if(numberToDisplay == 20){ + destinationVC.idno = 3 + } destinationVC.eyeImage = eyesview.image destinationVC.hairImage = hairview.image destinationVC.clothesImage = clothesview.image diff --git a/Powerup/Clothes.swift b/Powerup/Clothes.swift old mode 100644 new mode 100755 index fdaeab7c..e92bc7c5 --- a/Powerup/Clothes.swift +++ b/Powerup/Clothes.swift @@ -13,16 +13,18 @@ class Clothes: UIViewController { @IBOutlet weak var clothesview: UIImageView! @IBOutlet weak var customclothes: UIImageView! - + @IBOutlet weak var eyesview: UIImageView! @IBOutlet weak var hairview: UIImageView! @IBOutlet weak var faceview: UIImageView! var points = 0 + var idno = 0 var eyeImage: UIImage! var faceImage: UIImage! var hairImage: UIImage! var clothesImage: UIImage! + var originalclothes: UIImage! var clothes = ["cloth1", "cloth2", "cloth3", "cloth4", "cloth5", "cloth6", "cloth7", "cloth8", "cloth9"] var clothescount = -1 @@ -37,10 +39,10 @@ class Clothes: UIViewController { hairview.image = hairImage faceview.image = faceImage customclothes.image = clothesImage + originalclothes = clothesImage clothesview.image = UIImage(named: "\(clothes[0]).png") - /***********Take points value from database- Table Score***********/ //pointsLabel.text = "\(points)" let dirPaths = @@ -65,7 +67,8 @@ class Clothes: UIViewController { { clothesLabel.text = cResults?.stringForColumn("Points") } - let p = "SELECT Points FROM Score Where ID=1" + + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) @@ -209,12 +212,12 @@ class Clothes: UIViewController { // opening the database and extracting content through suitable queries if mainDB.open(){ - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) if presults?.next() == true { - print("Selected Points entry from ID=1") + print("Selected Points entry") let x = presults?.stringForColumn("Points") let clothesRes = "SELECT Points FROM Clothes Where Name='\(clothes[clothescount])'" let cresults:FMResultSet? = mainDB.executeQuery(clothesRes, @@ -230,7 +233,7 @@ class Clothes: UIViewController { if(a >= b ) { paidLabel.hidden = false - let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID=1" + let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID='\(idno)'" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ print("Failed to add data to Avatar Table") @@ -281,5 +284,18 @@ class Clothes: UIViewController { } } + override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { + if segue.identifier == "fromCloth" + { + if let destinationVC = segue.destinationViewController as? DressingRoom2{ + destinationVC.idno = idno + destinationVC.eyeImage = eyesview.image + destinationVC.hairImage = hairview.image + destinationVC.clothesImage = originalclothes + destinationVC.faceImage = faceview.image + + } + } + } } diff --git a/Powerup/CustomizeAvatar.swift b/Powerup/CustomizeAvatar.swift index b00ec466..773fb678 100755 --- a/Powerup/CustomizeAvatar.swift +++ b/Powerup/CustomizeAvatar.swift @@ -42,7 +42,6 @@ class CustomizeAvatar: UIViewController { customface.image = UIImage(named: "\(face[facecount]).png") customhair.image = UIImage(named: "\(hair[haircount]).png") - } override func didReceiveMemoryWarning() { @@ -125,8 +124,6 @@ class CustomizeAvatar: UIViewController { destinationVC.clothesImage = clothesview.image destinationVC.faceImage = faceview.image } - - } print("This is printed when you reach Map from DR1!") @@ -173,8 +170,6 @@ class CustomizeAvatar: UIViewController { let mainDB = FMDatabase(path: databasePath as String) if mainDB.open(){ - //let query = "INSERT INTO Avatar (Face, Clothes, Hair, Eyes) VALUES ('brick_face', 'cloth1', 'hair10', 'grey_eyes')" - let query = "INSERT INTO Avatar (Face, Clothes, Hair, Eyes) VALUES ('\(face[facecount])', '\(clothes[clothescount])', '\(hair[haircount])', '\(eyes[eyescount])')" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ diff --git a/Powerup/DressingRoom2.swift b/Powerup/DressingRoom2.swift index 3a6322d3..a808ef44 100755 --- a/Powerup/DressingRoom2.swift +++ b/Powerup/DressingRoom2.swift @@ -9,6 +9,7 @@ class DressingRoom2: UIViewController { var databasePath = NSString() let defaults = NSUserDefaults.standardUserDefaults() var points = 0 + var idno = 0 var numberToDisplay = 0 @IBOutlet weak var pointsLabel: UILabel! @@ -80,7 +81,7 @@ class DressingRoom2: UIViewController { let mainDB = FMDatabase(path: databasePath as String) if mainDB.open(){ - + /* let query = "INSERT INTO Score (Points) VALUES ('\(points)')" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ @@ -109,7 +110,9 @@ class DressingRoom2: UIViewController { print("Failure 2") print(error?.localizedDescription) } - let p = "SELECT Points FROM Score Where ID=1" + */ + + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) @@ -142,6 +145,7 @@ class DressingRoom2: UIViewController { { if let destinationVC = segue.destinationViewController as? Accessories{ destinationVC.points = points + destinationVC.idno = idno destinationVC.eyeImage = eyesview.image destinationVC.hairImage = hairview.image @@ -153,6 +157,8 @@ class DressingRoom2: UIViewController { { if let destinationVC = segue.destinationViewController as? Clothes{ destinationVC.points = points + print("\(idno)") + destinationVC.idno = idno destinationVC.eyeImage = eyesview.image destinationVC.hairImage = hairview.image @@ -165,6 +171,7 @@ class DressingRoom2: UIViewController { { if let destinationVC = segue.destinationViewController as? Hair{ destinationVC.points = points + destinationVC.idno = idno destinationVC.eyeImage = eyesview.image destinationVC.hairImage = hairview.image diff --git a/Powerup/Hair.swift b/Powerup/Hair.swift old mode 100644 new mode 100755 index efa45909..6fa00cbd --- a/Powerup/Hair.swift +++ b/Powerup/Hair.swift @@ -7,6 +7,7 @@ import UIKit class Hair: UIViewController { var points = 0 + var idno = 0 var databasePath = NSString() @IBOutlet weak var hairLabel: UILabel! @IBOutlet weak var paidLabel: UILabel! @@ -22,6 +23,7 @@ class Hair: UIViewController { var eyeImage: UIImage! var faceImage: UIImage! var hairImage: UIImage! + var originalhair: UIImage! var clothesImage: UIImage! var hair = ["hair2", "hair3", "hair4", "hair5", "hair6", "hair7", "hair8", "hair9", "hair10", "hair11"] @@ -37,10 +39,9 @@ class Hair: UIViewController { clothesview.image = clothesImage faceview.image = faceImage customhair.image = hairImage - + originalhair = hairImage hairview.image = UIImage(named: "\(hair[0]).png") - /***********Take points value from database- Table Score***********/ //pointsLabel.text = "\(points)" let dirPaths = @@ -64,7 +65,7 @@ class Hair: UIViewController { { hairLabel.text = hResults?.stringForColumn("Points") } - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) @@ -210,12 +211,12 @@ class Hair: UIViewController { // opening the database and extracting content through suitable queries if mainDB.open(){ - let p = "SELECT Points FROM Score Where ID=1" + let p = "SELECT Points FROM Score Where ID='\(idno)'" let presults:FMResultSet? = mainDB.executeQuery(p, withArgumentsInArray: nil) if presults?.next() == true { - print("Selected Points entry from ID=1") + print("Selected Points entry") let x = presults?.stringForColumn("Points") let hairRes = "SELECT Points FROM Hair Where Name='\(hair[haircount])'" let hresults:FMResultSet? = mainDB.executeQuery(hairRes, @@ -231,7 +232,7 @@ class Hair: UIViewController { if(a >= b ) { paidLabel.hidden = false - let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID=1" + let query = "UPDATE Score SET Points='\(a!-b!)' WHERE ID='\(idno)'" let addSuccess = mainDB.executeUpdate(query, withArgumentsInArray: nil) if(!addSuccess){ print("Failed to add data to Avatar Table") @@ -283,7 +284,19 @@ class Hair: UIViewController { } } - + override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) { + if segue.identifier == "fromHair" + { + if let destinationVC = segue.destinationViewController as? DressingRoom2{ + destinationVC.idno = idno + destinationVC.eyeImage = eyesview.image + destinationVC.hairImage = originalhair + destinationVC.clothesImage = clothesview.image + destinationVC.faceImage = faceview.image + + } + } + } } diff --git a/Powerup/Images.xcassets/cloth1.imageset/Contents.json b/Powerup/Images.xcassets/cloth1.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth1.imageset/cloth1.png b/Powerup/Images.xcassets/cloth1.imageset/cloth1.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth2.imageset/Contents.json b/Powerup/Images.xcassets/cloth2.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth2.imageset/cloth2.png b/Powerup/Images.xcassets/cloth2.imageset/cloth2.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth3.imageset/Contents.json b/Powerup/Images.xcassets/cloth3.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth3.imageset/cloth3.png b/Powerup/Images.xcassets/cloth3.imageset/cloth3.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth4.imageset/Contents.json b/Powerup/Images.xcassets/cloth4.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth4.imageset/cloth4.png b/Powerup/Images.xcassets/cloth4.imageset/cloth4.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth5.imageset/Contents.json b/Powerup/Images.xcassets/cloth5.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth5.imageset/cloth5.png b/Powerup/Images.xcassets/cloth5.imageset/cloth5.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth6.imageset/Contents.json b/Powerup/Images.xcassets/cloth6.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth6.imageset/cloth6.png b/Powerup/Images.xcassets/cloth6.imageset/cloth6.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth7.imageset/Contents.json b/Powerup/Images.xcassets/cloth7.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth7.imageset/cloth7.png b/Powerup/Images.xcassets/cloth7.imageset/cloth7.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth8.imageset/Contents.json b/Powerup/Images.xcassets/cloth8.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth8.imageset/cloth8.png b/Powerup/Images.xcassets/cloth8.imageset/cloth8.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth9.imageset/Contents.json b/Powerup/Images.xcassets/cloth9.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/cloth9.imageset/cloth9.png b/Powerup/Images.xcassets/cloth9.imageset/cloth9.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/glasses1.imageset/Contents.json b/Powerup/Images.xcassets/glasses1.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/glasses1.imageset/glasses1.png b/Powerup/Images.xcassets/glasses1.imageset/glasses1.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/glasses2.imageset/Contents.json b/Powerup/Images.xcassets/glasses2.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/glasses2.imageset/glasses2.png b/Powerup/Images.xcassets/glasses2.imageset/glasses2.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/glasses3.imageset/Contents.json b/Powerup/Images.xcassets/glasses3.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/glasses3.imageset/glasses3.png b/Powerup/Images.xcassets/glasses3.imageset/glasses3.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair10.imageset/Contents.json b/Powerup/Images.xcassets/hair10.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair10.imageset/hair10.png b/Powerup/Images.xcassets/hair10.imageset/hair10.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair11.imageset/Contents.json b/Powerup/Images.xcassets/hair11.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair11.imageset/hair11.png b/Powerup/Images.xcassets/hair11.imageset/hair11.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair2.imageset/Contents.json b/Powerup/Images.xcassets/hair2.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair2.imageset/hair2.png b/Powerup/Images.xcassets/hair2.imageset/hair2.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair3.imageset/Contents.json b/Powerup/Images.xcassets/hair3.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair3.imageset/hair3.png b/Powerup/Images.xcassets/hair3.imageset/hair3.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair4.imageset/Contents.json b/Powerup/Images.xcassets/hair4.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair4.imageset/hair4.png b/Powerup/Images.xcassets/hair4.imageset/hair4.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair5.imageset/Contents.json b/Powerup/Images.xcassets/hair5.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair5.imageset/hair5.png b/Powerup/Images.xcassets/hair5.imageset/hair5.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair6.imageset/Contents.json b/Powerup/Images.xcassets/hair6.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair6.imageset/hair6.png b/Powerup/Images.xcassets/hair6.imageset/hair6.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair7.imageset/Contents.json b/Powerup/Images.xcassets/hair7.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair7.imageset/hair7.png b/Powerup/Images.xcassets/hair7.imageset/hair7.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair8.imageset/Contents.json b/Powerup/Images.xcassets/hair8.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair8.imageset/hair8.png b/Powerup/Images.xcassets/hair8.imageset/hair8.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair9.imageset/Contents.json b/Powerup/Images.xcassets/hair9.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hair9.imageset/hair9.png b/Powerup/Images.xcassets/hair9.imageset/hair9.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat1.imageset/Contents.json b/Powerup/Images.xcassets/hat1.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat1.imageset/Contents.json~41306442248cf97e4b1f51f88e5a539344a0ee6c b/Powerup/Images.xcassets/hat1.imageset/Contents.json~41306442248cf97e4b1f51f88e5a539344a0ee6c old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat1.imageset/Contents.json~HEAD b/Powerup/Images.xcassets/hat1.imageset/Contents.json~HEAD old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat1.imageset/hat1.png b/Powerup/Images.xcassets/hat1.imageset/hat1.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat2.imageset/Contents.json b/Powerup/Images.xcassets/hat2.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat2.imageset/hat2.png b/Powerup/Images.xcassets/hat2.imageset/hat2.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat4.imageset/Contents.json b/Powerup/Images.xcassets/hat4.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat4.imageset/Contents.json~41306442248cf97e4b1f51f88e5a539344a0ee6c b/Powerup/Images.xcassets/hat4.imageset/Contents.json~41306442248cf97e4b1f51f88e5a539344a0ee6c old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat4.imageset/Contents.json~HEAD b/Powerup/Images.xcassets/hat4.imageset/Contents.json~HEAD old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat4.imageset/hat4.png b/Powerup/Images.xcassets/hat4.imageset/hat4.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat5.imageset/Contents.json b/Powerup/Images.xcassets/hat5.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat5.imageset/Contents.json~41306442248cf97e4b1f51f88e5a539344a0ee6c b/Powerup/Images.xcassets/hat5.imageset/Contents.json~41306442248cf97e4b1f51f88e5a539344a0ee6c old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat5.imageset/Contents.json~HEAD b/Powerup/Images.xcassets/hat5.imageset/Contents.json~HEAD old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/hat5.imageset/hat5.png b/Powerup/Images.xcassets/hat5.imageset/hat5.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace1.imageset/Contents.json b/Powerup/Images.xcassets/necklace1.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace1.imageset/necklace1.png b/Powerup/Images.xcassets/necklace1.imageset/necklace1.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace2.imageset/Contents.json b/Powerup/Images.xcassets/necklace2.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace2.imageset/necklace2.png b/Powerup/Images.xcassets/necklace2.imageset/necklace2.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace3.imageset/Contents.json b/Powerup/Images.xcassets/necklace3.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace3.imageset/necklace3.png b/Powerup/Images.xcassets/necklace3.imageset/necklace3.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace4.imageset/Contents.json b/Powerup/Images.xcassets/necklace4.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/necklace4.imageset/necklace4.png b/Powerup/Images.xcassets/necklace4.imageset/necklace4.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse1.imageset/Contents.json b/Powerup/Images.xcassets/purse1.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse1.imageset/purse1.png b/Powerup/Images.xcassets/purse1.imageset/purse1.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse2.imageset/Contents.json b/Powerup/Images.xcassets/purse2.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse2.imageset/purse2.png b/Powerup/Images.xcassets/purse2.imageset/purse2.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse3.imageset/Contents.json b/Powerup/Images.xcassets/purse3.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse3.imageset/purse3.png b/Powerup/Images.xcassets/purse3.imageset/purse3.png old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse4.imageset/Contents.json b/Powerup/Images.xcassets/purse4.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Powerup/Images.xcassets/purse4.imageset/purse4.png b/Powerup/Images.xcassets/purse4.imageset/purse4.png old mode 100644 new mode 100755 diff --git a/Powerup/StartScreen.swift b/Powerup/StartScreen.swift index 69e2e695..4481855f 100755 --- a/Powerup/StartScreen.swift +++ b/Powerup/StartScreen.swift @@ -2,7 +2,6 @@ // StartScreen.swift // - import UIKit class StartScreen: UIViewController { diff --git a/Scenarios/mainDatabase.sqlite b/Scenarios/mainDatabase.sqlite index 0cca5a29..52300e1c 100755 Binary files a/Scenarios/mainDatabase.sqlite and b/Scenarios/mainDatabase.sqlite differ