Added images for Flank, Rotate, and Stop maneuvers

Added Support for DS9 complete movement grid
Added more "key maneuvers": spin, all stop, rotate, and fast (white speed 5+)
New iOS Build

ios/DockMoveGridView.m

@@ -23,6 +23,11 @@ -(void)drawRect:(CGRect)rect
 
     NSArray* moveValues = @[@5, @4, @3, @2, @1, @-1, @-2];
     NSSet* speeds = _ship.shipClassDetails.speeds;
+    if ([speeds containsObject:@0] && [speeds containsObject:@5]) {
+        moveValues = @[@5, @4, @3, @2, @1, @0, @-1, @-2];
+    } else if ([speeds containsObject:@0] && ![speeds containsObject:@5]) {
+        moveValues = @[@4, @3, @2, @1, @0, @-1, @-2];
+    }
     if ([speeds containsObject:@-3]) {
         if (![speeds containsObject:@5]) {
             moveValues = [moveValues subarrayWithRange: NSMakeRange(1, moveValues.count - 1)];
@@ -85,6 +90,8 @@ -(void)drawRect:(CGRect)rect
     DockShipClassDetails* details = _ship.shipClassDetails;
     if (details.hasSpins) {
         kinds = @[@"", @"left-spin", @"straight", @"right-spin", @"", @""];
+    } else if (details.hasFlanks) {
+        kinds = @[@"left-90-degree-rotate", @"left-flank", @"straight", @"right-flank", @"right-90-degree-rotate", @""];
     }
 
     for (int i = 0; i < moveValues.count; ++i) {
@@ -117,6 +124,15 @@ -(void)drawRect:(CGRect)rect
                 }
             } else if (details != nil) {
                 NSString* kind = kinds[j - 1];
+                if (speed == 0) {
+                    if ([kind isEqualToString:@"left-flank"]) {
+                        kind = @"left-45-degree-rotate";
+                    } else if ([kind isEqualToString:@"right-flank"]) {
+                        kind = @"right-45-degree-rotate";
+                    } else if ([kind isEqualToString:@"straight"]) {
+                        kind = @"stop";
+                    }
+                }
                 DockManeuver* maneuver = [details getDockManeuver: speed kind: kind];
 
                 if (maneuver != nil) {
@@ -126,6 +142,14 @@ -(void)drawRect:(CGRect)rect
 
                     if (speed < 0) {
                         directionName = @"backup";
+                    } else if (speed == 0) {
+                        if ([directionName isEqualToString:@"left-flank"]) {
+                            directionName = @"left-45-degree-rotate";
+                        } else if ([directionName isEqualToString:@"right-flank"]) {
+                            directionName = @"right-45-degree-rotate";
+                        } else if ([directionName isEqualToString:@"straight"]) {
+                            directionName = @"stop";
+                        }
                     }
 
                     NSString* fileName = [NSString stringWithFormat: @"%@-%@", color, directionName];

ios/DockTopMenuViewController.m

@@ -35,7 +35,7 @@ - (void)viewDidAppear:(BOOL)animated
     if (_managedObjectContext == nil) {
         _loadingAlert = [[UIAlertView alloc] initWithTitle:@"Loading Data" message:nil delegate:self cancelButtonTitle:nil otherButtonTitles: nil];
         [_loadingAlert show];
-        UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
+        UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
         indicator.center = CGPointMake(_loadingAlert.bounds.size.width / 2, _loadingAlert.bounds.size.height - 50);
         [indicator startAnimating];
         [_loadingAlert addSubview:indicator];
@@ -96,6 +96,12 @@ -(void)prepareForSegue:(UIStoryboardSegue*)segue sender:(id)sender
         controller.managedObjectContext = self.managedObjectContext;
         controller.upType = @"Borg";
         controller.upgradeTypeName = @"Borg Upgrades";
+    } else if ([[segue identifier] isEqualToString: @"GoToSquadron"]) {
+        id destination = [segue destinationViewController];
+        DockUpgradesViewController* controller = (DockUpgradesViewController*)destination;
+        controller.managedObjectContext = self.managedObjectContext;
+        controller.upType = @"Squadron";
+        controller.upgradeTypeName = @"Squadron Upgrades";
     } else if ([[segue identifier] isEqualToString: @"GoToTech"]) {
         id destination = [segue destinationViewController];
         DockUpgradesViewController* controller = (DockUpgradesViewController*)destination;
@@ -153,7 +159,6 @@ -(void)showSquad:(DockSquad*)squad
 }
 -(void)refresh:(UIRefreshControl *)refresh
 {
-    NSLog(@"Refreshing");
     DockDataUpdater* updater = [[DockDataUpdater alloc] init];
     [updater checkForNewData:^(NSString *remoteVersion, NSData *downloadData, NSError *error) {
         /*

ios/Space Dock iOS-Info.plist

@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>93</string>
+	<string>94</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

ios/SpaceDock.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B17" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" initialViewController="CGb-hD-QBi">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" initialViewController="CGb-hD-QBi">
     <dependencies>
         <deployment version="1536" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
@@ -565,6 +565,27 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="50" id="VMT-Gh-Y0h">
+                                        <rect key="frame" x="0.0" y="700" width="320" height="50"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VMT-Gh-Y0h" id="0gw-1c-Q2Y">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="fy7-4P-D48">
+                                                    <rect key="frame" x="20" y="3" width="280" height="44"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                                    <state key="normal" title="Squadrons">
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <connections>
+                                                        <segue destination="ItA-jp-4hr" kind="push" identifier="GoToSquadron" id="dvW-QN-6FE"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="50" id="T8Z-7A-8NK">
                                         <rect key="frame" x="0.0" y="400" width="320" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
@@ -1670,8 +1691,8 @@
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="ba4-FO-r4X"/>
         <segue reference="me1-T8-16w"/>
+        <segue reference="xuh-dp-0tA"/>
         <segue reference="TwX-09-xdF"/>
         <segue reference="YvD-5N-V1B"/>
     </inferredMetricsTieBreakers>

mac/DockMoveGrid.m

@@ -35,6 +35,11 @@ -(void)drawRect:(NSRect)dirtyRect
 
     NSArray* moveValues = @[@5, @4, @3, @2, @1, @-1, @-2];
     NSSet* speeds = _ship.shipClassDetails.speeds;
+    if ([speeds containsObject:@0] && [speeds containsObject:@5]) {
+        moveValues = @[@5, @4, @3, @2, @1, @0, @-1, @-2];
+    } else if ([speeds containsObject:@0] && ![speeds containsObject:@5]) {
+        moveValues = @[@4, @3, @2, @1, @0, @-1, @-2];
+    }
     if ([speeds containsObject: @-3]) {
         if (![speeds containsObject:@5]) {
             moveValues = [moveValues subarrayWithRange: NSMakeRange(1, moveValues.count - 1)];
@@ -103,6 +108,8 @@ -(void)drawRect:(NSRect)dirtyRect
     DockShipClassDetails* details = _ship.shipClassDetails;
     if (details.hasSpins) {
         kinds = @[@"", @"left-spin", @"straight", @"right-spin", @"", @""];
+    } else if (details.hasFlanks) {
+        kinds = @[@"left-90-degree-rotate", @"left-flank", @"straight", @"right-flank", @"right-90-degree-rotate", @""];
     }
 
     for (int i = (int)moveValues.count - 1; i >= 0; --i) {
@@ -124,6 +131,15 @@ -(void)drawRect:(NSRect)dirtyRect
                 [move drawInRect: moveRect withAttributes: attr];
             } else if (details != nil) {
                 NSString* kind = kinds[j - 1];
+                if (speed == 0) {
+                    if ([kind isEqualToString:@"left-flank"]) {
+                        kind = @"left-45-degree-rotate";
+                    } else if ([kind isEqualToString:@"right-flank"]) {
+                        kind = @"right-45-degree-rotate";
+                    } else if ([kind isEqualToString:@"straight"]) {
+                        kind = @"stop";
+                    }
+                }
                 DockManeuver* maneuver = [details getDockManeuver: speed kind: kind];
 
                 if (maneuver != nil) {
@@ -133,6 +149,14 @@ -(void)drawRect:(NSRect)dirtyRect
 
                     if (speed < 0) {
                         directionName = @"backup";
+                    } else if (speed == 0) {
+                        if ([directionName isEqualToString:@"left-flank"]) {
+                            directionName = @"left-45-degree-rotate";
+                        } else if ([directionName isEqualToString:@"right-flank"]) {
+                            directionName = @"right-45-degree-rotate";
+                        } else if ([directionName isEqualToString:@"straight"]) {
+                            directionName = @"stop";
+                        }
                     }
 
                     NSString* fileName = [NSString stringWithFormat: @"%@-%@", color, directionName];

src/Data.xml

@@ -1,4 +1,4 @@
-<Data version="2014-11-21@23-29">
+<Data version="2014-11-23@20-26">
   <ShipClassDetails>
     <ShipClassDetail>
       <Name>Galaxy Class</Name>
@@ -395,13 +395,17 @@
       <Name>Nor Class Orbital Space Station</Name>
       <Id>5017</Id>
       <Maneuvers>
+          <Maneuver speed="2" kind="left-flank" color="red" />
           <Maneuver speed="2" kind="straight" color="red" />
-          <Maneuver speed="2" kind="flank" color="red" />
+          <Maneuver speed="2" kind="right-flank" color="red" />
+          <Maneuver speed="1" kind="left-flank" color="white" />
           <Maneuver speed="1" kind="straight" color="white" />
-          <Maneuver speed="1" kind="flank" color="white" />
-          <Maneuver speed="0" kind="90-degree-rotate" color="white" />
+          <Maneuver speed="1" kind="right-flank" color="white" />
+          <Maneuver speed="0" kind="left-45-degree-rotate" color="green" />
+          <Maneuver speed="0" kind="left-90-degree-rotate" color="white" />
           <Maneuver speed="0" kind="stop" color="green" />
-          <Maneuver speed="0" kind="45-degree-rotate" color="green" />
+          <Maneuver speed="0" kind="right-45-degree-rotate" color="green" />
+          <Maneuver speed="0" kind="right-90-degree-rotate" color="white" />
       </Maneuvers>
       <FrontArc>90</FrontArc>
       <RearArc></RearArc>

src/DockManeuver+Addons.h

@@ -4,4 +4,5 @@
 -(NSString*)asString;
 -(NSComparisonResult)compareTo:(DockManeuver*)other;
 -(BOOL)isSpin;
+-(BOOL)isFlank;
 @end

src/DockManeuver+Addons.m

@@ -17,4 +17,10 @@ -(BOOL)isSpin
     return [self.kind hasSuffix: @"spin"];
 }
 
+-(BOOL)isFlank
+{
+    return [self.kind hasSuffix: @"flank"];
+}
+
+
 @end

src/DockShipClassDetails+Addons.h

@@ -8,4 +8,5 @@
 -(NSString*)movesSummary;
 -(NSSet*)speeds;
 -(BOOL)hasSpins;
+-(BOOL)hasFlanks;
 @end

src/DockShipClassDetails+Addons.m

@@ -122,11 +122,20 @@ -(NSString*)movesSummary
     NSMutableSet* specials = [NSMutableSet setWithCapacity: 0];
 
     for (DockManeuver* m in self.maneuvers) {
-        if ([m.kind isEqualToString: @"about"]) {
+        if ([m.kind hasSuffix: @"spin"]) {
+            [specials addObject: @"spin"];
+        } else if ([m.kind isEqualToString: @"about"]) {
             [specials addObject: @"come about"];
         } else if ([m.speed intValue] < 0 && [m.kind isEqualToString: @"straight"]) {
             [specials addObject: @"backup"];
+        } else if ([m.kind isEqualToString: @"stop"]) {
+            [specials addObject: @"all stop"];
+        } else if ([m.kind hasSuffix: @"rotate"]) {
+            [specials addObject: @"rotate"];
+        } else if ([m.speed intValue] >= 5 && ![m.color isEqualToString:@"red"]) {
+            [specials addObject: @"fast"];
         }
+
     }
     return [[specials allObjects] componentsJoinedByString: @","];
 }
@@ -151,4 +160,14 @@ -(BOOL)hasSpins
     return index != NSNotFound;
 }
 
+-(BOOL)hasFlanks
+{
+    id finder = ^(id obj, NSUInteger idx, BOOL *stop) {
+        DockManeuver* m = obj;
+        return m.isFlank;
+    };
+    NSInteger index =  [self.maneuvers.allObjects indexOfObjectPassingTest: finder];
+    return index != NSNotFound;
+}
+
 @end