Calculate sword x every time

WestlakeAPC · Jun 16, 2016 · 2999d6f · 2999d6f
1 parent 8072666
commit 2999d6f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 71 deletions.
diff --git a/DeathDodgerTests/DeathDodgerTests.m b/DeathDodgerTests/DeathDodgerTests.m
diff --git a/DeathDodgerTests/Info.plist b/DeathDodgerTests/Info.plist
diff --git a/...proj/project.xcworkspace/xcuserdata/ethertyper.xcuserdatad/UserInterfaceState.xcuserstate b/...proj/project.xcworkspace/xcuserdata/ethertyper.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...h_Dodger.xcodeproj/xcuserdata/ethertyper.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...h_Dodger.xcodeproj/xcuserdata/ethertyper.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,11 +10,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ViewController.m"
-            timestampString = "487728051.594636"
+            timestampString = "487728936.946215"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "84"
-            endingLineNumber = "84"
+            startingLineNumber = "90"
+            endingLineNumber = "90"
             landmarkName = "-leftButton:"
             landmarkType = "7">
          </BreakpointContent>

diff --git a/ViewController.m b/ViewController.m
@@ -67,14 +67,20 @@ - (void)didReceiveMemoryWarning {
 - (void)reDraw{
     finnCharc.center = CGPointMake(finnCoordX, finnCoordY);
 
-    if (aSword1.center.y<=[[UIScreen mainScreen] bounds].size.height+[aSword1 frame].size.height/2)
+    if (aSword1.center.y<=[[UIScreen mainScreen] bounds].size.height+[aSword1 frame].size.height/2) {
         sword1yCoords = sword1yCoords + 20;
-    else
+    } else {
         sword1yCoords = -[aSword1 frame].size.height/2 - 200;
-    if (aSword2.center.y<=[[UIScreen mainScreen] bounds].size.height+[aSword2 frame].size.height/2)
+        sword1xCoords = [aSword1 frame].size.width/2 + rand() % (int)([[UIScreen mainScreen] bounds].size.width-[aSword1 frame].size.width/2);
+    }
+
+    if (aSword2.center.y<=[[UIScreen mainScreen] bounds].size.height+[aSword2 frame].size.height/2) {
         sword2yCoords = sword2yCoords + 20;
-    else
+    } else {
         sword2yCoords = -[aSword2 frame].size.height/2 - 200;
+        sword2xCoords = [aSword2 frame].size.width/2 + rand() % (int)([[UIScreen mainScreen] bounds].size.width-[aSword2 frame].size.width/2);
+    }
+
     aSword1.center = CGPointMake(sword1xCoords, sword1yCoords);
     aSword2.center = CGPointMake(sword2xCoords, sword2yCoords);
 }