改修工廠メニューを更新

2月29日更新分　土曜日曜分

diff --git a/EquipmentEnhancementListBuilder/main.m b/EquipmentEnhancementListBuilder/main.m
index 015f6a3..b192822 100644 (file)
--- a/EquipmentEnhancementListBuilder/main.m
+++ b/EquipmentEnhancementListBuilder/main.m
@@ -50,29 +50,31 @@ int main(int argc, const char * argv[]) {
                }
                NSArray *requiredEquipmentSetLines = [requiredEquipmentSet componentsSeparatedByString:@"\n"];
                NSMutableArray *sets = [NSMutableArray array];
-               for(int i = 0; i < requiredEquipmentSetLines.count; i++) {
-                       NSMutableArray<HMRequiredEquipment *> *requiredEquipments = [NSMutableArray array];
+               NSMutableArray<HMRequiredEquipment *> *requiredEquipments = [NSMutableArray array];
+               NSString *currentIdentifire = nil;
+               for(NSString *line in requiredEquipmentSetLines) {
+                       NSArray<NSString *> *cols = [line componentsSeparatedByString:@"\t"];
+                       if(cols.count != 6) {
+                               if(currentIdentifire) {
+                                       fprintf(stderr, "Error %s proccess is not complete\n", currentIdentifire.UTF8String);
+                               }
+                               currentIdentifire = nil;
+                               continue;
+                       }
                        
-                       NSString *line = requiredEquipmentSetLines[i];
-                       NSArray *cols = [line componentsSeparatedByString:@"\t"];
-                       if(cols.count != 6) continue;
+                       HMRequiredEquipment *requiredEquipment = [HMRequiredEquipment new];
+                       
+                       requiredEquipment.identifire = cols[0];
+                       requiredEquipment.currentLevelString = cols[1];
+                       requiredEquipment.name = cols[2];
+                       requiredEquipment.number = numberOrNil(cols[3]);
+                       requiredEquipment.screw = numberOrNil(cols[4]);
+                       requiredEquipment.ensureScrew = numberOrNil(cols[5]);
+                       
+                       [requiredEquipments addObject:requiredEquipment];
+                       
+                       currentIdentifire = cols[0];
                        
-                       for(int j = 0; j < 3; j++) {
-                               NSString *line = requiredEquipmentSetLines[i + j];
-                               NSArray *cols = [line componentsSeparatedByString:@"\t"];
-                               if(cols.count != 6) continue;
-                               
-                               HMRequiredEquipment *requiredEquipment = [HMRequiredEquipment new];
-                               
-                               requiredEquipment.identifire = cols[0];
-                               requiredEquipment.currentLevelString = cols[1];
-                               requiredEquipment.name = cols[2];
-                               requiredEquipment.number = numberOrNil(cols[3]);
-                               requiredEquipment.screw = numberOrNil(cols[4]);
-                               requiredEquipment.ensureScrew = numberOrNil(cols[5]);
-                               
-                               [requiredEquipments addObject:requiredEquipment];
-                       }
                        if(requiredEquipments.count != 3) continue;
                        
                        HMRequiredEquipmentSet *set = [HMRequiredEquipmentSet new];
@@ -80,6 +82,10 @@ int main(int argc, const char * argv[]) {
                        set.requiredEquipments = requiredEquipments;
                        
                        [sets addObject:set];
+                       [requiredEquipments removeAllObjects];
+                       
+                       fprintf(stdout, "Create item of %s\n", currentIdentifire.UTF8String);
+                       currentIdentifire = nil;
                }
                
                //
@@ -121,7 +127,9 @@ int main(int argc, const char * argv[]) {
                        }
                        requiredEquipment.requiredEquipments = sets[index];
                        
-                       NSLog(@"add item %@", requiredEquipment.targetEquipment);
+                       fprintf(stdout, "Add item %s for weekday %ld\n",
+                                       requiredEquipment.targetEquipment.UTF8String,
+                                       requiredEquipment.weekday.integerValue);
                        
                        [enhancementLists addObject:requiredEquipment];
                }

diff --git a/KCD/HMEnhancementListItem.h b/KCD/HMEnhancementListItem.h
index ca19220..4963e16 100644 (file)
--- a/KCD/HMEnhancementListItem.h
+++ b/KCD/HMEnhancementListItem.h
@@ -42,7 +42,7 @@ typedef NS_ENUM(NSUInteger, EquipmentType) {
 
 @property (copy, nonatomic) NSString *identifire;
 
-@property (strong, nonatomic) NSArray<HMRequiredEquipment *> *requiredEquipments;
+@property (copy, nonatomic) NSArray<HMRequiredEquipment *> *requiredEquipments;
 
 
 // for Cocoa Bindings

diff --git a/KCD/HMEnhancementListItem.plist b/KCD/HMEnhancementListItem.plist
index c8641aa..2f68d26 100644 (file)
Binary files a/KCD/HMEnhancementListItem.plist and b/KCD/HMEnhancementListItem.plist differ

diff --git a/KCD/HMEnhancementListItem.txt b/KCD/HMEnhancementListItem.txt
index 3900344..4bc144a 100644 (file)
--- a/KCD/HMEnhancementListItem.txt
+++ b/KCD/HMEnhancementListItem.txt
@@ -58,12 +58,16 @@
 7A     1       3       35.6cm連装砲 試製35.6cm三連装砲        扶桑
 7A     6       3       35.6cm連装砲 試製35.6cm三連装砲        扶桑
 7A     7       3       35.6cm連装砲 試製35.6cm三連装砲        扶桑
+103A   1       3       試製35.6cm三連装砲                山城改二
 103A   4       3       試製35.6cm三連装砲                金剛改二,扶桑改二
 103A   5       3       試製35.6cm三連装砲                金剛改二,榛名改二,扶桑改二,山城改二
 103A   6       3       試製35.6cm三連装砲                榛名改二,扶桑改二,山城改二
+103A   7       3       試製35.6cm三連装砲                扶桑改二,山城改二
+104A   1       3       35.6cm連装砲(ダズル迷彩)                榛名改二
 104A   2       3       35.6cm連装砲(ダズル迷彩)                榛名改二
 104A   3       3       35.6cm連装砲(ダズル迷彩)                榛名改二
 104A   4       3       35.6cm連装砲(ダズル迷彩)                榛名改二
+104A   7       3       35.6cm連装砲(ダズル迷彩)                榛名改二
 76A    5       3       38cm連装砲   38cm連装砲改★+3   Bismarck
 76A    6       3       38cm連装砲   38cm連装砲改★+3   Bismarck
 76A    7       3       38cm連装砲   38cm連装砲改★+3   Bismarck
@@ -90,11 +94,13 @@
 8A     1       3       41cm連装砲           陸奥
 8A     2       3       41cm連装砲           陸奥
 8A     5       3       41cm連装砲           陸奥
+105A   1       3       試製41cm三連装砲          長門改
 105A   2       3       試製41cm三連装砲          長門改
 105A   3       3       試製41cm三連装砲          陸奥改
 105A   4       3       試製41cm三連装砲          長門改,陸奥改
 105A   5       3       試製41cm三連装砲          長門改
 105A   6       3       試製41cm三連装砲          陸奥改
+105A   7       3       試製41cm三連装砲          陸奥改
 117A   1       3       試製46cm連装砲     46cm三連装砲★+5   大和
 117A   2       3       試製46cm連装砲     46cm三連装砲★+5   大和
 117A   3       3       試製46cm連装砲     46cm三連装砲★+5   武蔵
@@ -148,16 +154,20 @@
 15A    7       8       61cm四連装(酸素)魚雷     61cm五連装(酸素)魚雷     大井,北上
 58A    4       8       61cm五連装(酸素)魚雷             島風
 58A    5       8       61cm五連装(酸素)魚雷             島風
+59A    1       10      零式水上観測機           瑞穂
 59A    2       10      零式水上観測機           瑞穂
 59A    3       10      零式水上観測機           瑞穂
 59A    4       10      零式水上観測機           瑞穂
 59A    5       10      零式水上観測機           武蔵
 59A    6       10      零式水上観測機           武蔵
+59A    7       10      零式水上観測機           瑞穂,武蔵
+163A   1       10      Ro.43水偵     Ro.44水上戦闘機    Italia
 163A   2       10      Ro.43水偵     Ro.44水上戦闘機    Zara改
 163A   3       10      Ro.43水偵     Ro.44水上戦闘機    Zara改,Roma改
 163A   4       10      Ro.43水偵     Ro.44水上戦闘機    Zara改,Roma改
 163A   5       10      Ro.43水偵     Ro.44水上戦闘機    Zara改
 163A   6       10      Ro.43水偵     Ro.44水上戦闘機    Zara改
+163A   7       10      Ro.43水偵     Ro.44水上戦闘機    Italia
 27A    1       16      13号対空電探       13号対空電探改    時雨改二,五十鈴改二
 27A    2       16      13号対空電探       13号対空電探改    五十鈴改二,照月
 27A    3       16      13号対空電探       13号対空電探改    秋月,照月