装備したドラム缶の個数を返すメソッドを追加

diff --git a/KCD/HMKCShipObject+Extensions.h b/KCD/HMKCShipObject+Extensions.h
index 95d2c4a..2ea2b97 100644 (file)
--- a/KCD/HMKCShipObject+Extensions.h
+++ b/KCD/HMKCShipObject+Extensions.h
@@ -32,5 +32,7 @@
 @property (readonly) NSNumber *seiku;
 @property (readonly) NSNumber *extraSeiku;
 
+@property (readonly) NSNumber *totalDrums;
+
 @property (readonly) NSNumber *guardEscaped; // NSNumber of BOLL
 @end

diff --git a/KCD/HMKCShipObject+Extensions.m b/KCD/HMKCShipObject+Extensions.m
index b7a1325..e71b735 100644 (file)
--- a/KCD/HMKCShipObject+Extensions.m
+++ b/KCD/HMKCShipObject+Extensions.m
@@ -346,7 +346,7 @@ static NSArray *levelUpExps = nil;
        NSArray *bomberTypes = @[@7];
        NSArray *attackerTypes = @[@8];
        NSArray *floatplaneBomberTypes = @[@11];
-       __block NSInteger extraSeiku = 0;
+       NSInteger extraSeiku = 0;
        for(NSInteger i = 0; i < 5; i++) {
                HMKCSlotItemObject *slotItem = [self slotItemAtIndex:i];
                NSNumber *airLevel = slotItem.alv;
@@ -376,6 +376,27 @@ static NSArray *levelUpExps = nil;
        return @(extraSeiku);
 }
 
++ (NSSet *)keyPathsForValuesAffectingTotalDrums
+{
+       return [NSSet setWithObjects:
+                       @"slot_0", @"slot_1", @"slot_2", @"slot_3", @"slot_4",
+                       nil];
+}
+
+- (NSNumber *)totalDrums
+{
+       NSInteger totalBuckets = 0;
+       for(NSInteger i = 0; i < 5; i++) {
+               HMKCSlotItemObject *slotItem = [self slotItemAtIndex:i];
+               NSNumber *masterID = slotItem.slotitem_id;
+               if([masterID isEqualToNumber:@(75)]) {
+                       totalBuckets++;
+               }
+       }
+       
+       return @(totalBuckets);
+}
+
 - (NSNumber *)guardEscaped
 {
        HMTemporaryDataStore *store = [HMTemporaryDataStore defaultManager];