複数組の護衛退避に対応

diff --git a/KCD/HMGuardShelterCommand.m b/KCD/HMGuardShelterCommand.m
index 7b42bd1..1320b86 100644 (file)
--- a/KCD/HMGuardShelterCommand.m
+++ b/KCD/HMGuardShelterCommand.m
@@ -44,6 +44,9 @@ NSString *HMGuardShelterCommandDidUpdateGuardExcapeNotification = @"HMGuardShelt
                [self ensureGuardShelter];
                return;
        }
+       if([self.api isEqualToString:@"/kcsapi/api_req_map/next"]) {
+               [self removeInvalidEntry];
+       }
 }
 
 
@@ -116,7 +119,29 @@ NSString *HMGuardShelterCommandDidUpdateGuardExcapeNotification = @"HMGuardShelt
        [object setValue:@NO forKey:@"ensured"];
        
 }
-
+- (void)removeInvalidEntry
+{
+       HMTemporaryDataStore *store = [HMTemporaryDataStore oneTimeEditor];
+       NSError *error = nil;
+       NSArray *array = [store objectsWithEntityName:@"GuardEscaped"
+                                                                                       error:&error
+                                                                 predicateFormat:@"ensured = FALSE"];
+       if(error) {
+               NSLog(@"GuardEscaped is invalid. -> %@", error);
+               return;
+       }
+       if(!array) {
+               NSLog(@"GuardEscaped is invalid. -> %@", error);
+               return;
+       }
+       for(NSManagedObject *object in array) {
+               [store.managedObjectContext deleteObject:object];
+       }
+       [store saveAction:nil];
+       [NSThread sleepForTimeInterval:0.1];
+       
+       [self notify];
+}
 - (void)removeAllEntry
 {
        HMTemporaryDataStore *store = [HMTemporaryDataStore oneTimeEditor];

diff --git a/KCD/HMMapStartCommand.m b/KCD/HMMapStartCommand.m
index 12bbb91..15411ee 100644 (file)
--- a/KCD/HMMapStartCommand.m
+++ b/KCD/HMMapStartCommand.m
@@ -9,6 +9,7 @@
 #import "HMMapStartCommand.h"
 
 #import "HMCalculateDamageCommand.h"
+#import "HMGuardShelterCommand.h"
 
 @implementation HMMapStartCommand
 + (void)load
@@ -31,6 +32,7 @@
 {
        self = [super initWithCommands:
                        [HMCalculateDamageCommand new],
+                       [HMGuardShelterCommand new],
                        nil];
        return self;
 }