OSDN Git Service

HMKCShipObject, HMKCMasterShipObjectクラスをSwiftで書き換え
authormasakih <masakih@users.sourceforge.jp>
Wed, 31 Dec 2014 16:16:58 +0000 (01:16 +0900)
committermasakih <masakih@users.sourceforge.jp>
Wed, 31 Dec 2014 16:16:58 +0000 (01:16 +0900)
15 files changed:
KCD.xcodeproj/project.pbxproj
KCD/HMApplySuppliesCommand.m
KCD/HMFleetInformation.m
KCD/HMKCMasterShipObject.h [deleted file]
KCD/HMKCMasterShipObject.m [deleted file]
KCD/HMKCMasterShipObject.swift [new file with mode: 0644]
KCD/HMKCShipObject+Extension.swift [new file with mode: 0644]
KCD/HMKCShipObject+Extensions.h [deleted file]
KCD/HMKCShipObject+Extensions.m [deleted file]
KCD/HMKCShipObject.h [deleted file]
KCD/HMKCShipObject.m [deleted file]
KCD/HMKCShipObject.swift [new file with mode: 0644]
KCD/HMShipMasterDetailWindowController.m
KCD/KCD-Bridging-Header.h
KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents

index 0343266..684b0e5 100644 (file)
@@ -13,7 +13,6 @@
                F4131EDE190FEBDB004F7F9A /* HMSlotItemWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4131EE0190FEBDB004F7F9A /* HMSlotItemWindowController.xib */; };
                F4131EE61910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */; };
                F4268009193AF4E000B2C27F /* HMUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268008193AF4E000B2C27F /* HMUserDefaults.m */; };
-               F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */; };
                F426802B194D0F4800B2C27F /* HMMemberShip2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F426802A194D0F4800B2C27F /* HMMemberShip2Command.m */; };
                F426802E194D0FFD00B2C27F /* HMMemberShip3Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F426802D194D0FFD00B2C27F /* HMMemberShip3Command.m */; };
                F4268031194D1B1A00B2C27F /* HMChangeHenseiCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268030194D1B1A00B2C27F /* HMChangeHenseiCommand.m */; };
@@ -24,8 +23,6 @@
                F43E67B718BE02A10087E5B6 /* STypeShortName.plist in Resources */ = {isa = PBXBuildFile; fileRef = F43E67B618BE02A10087E5B6 /* STypeShortName.plist */; };
                F43E67B918BE060E0087E5B6 /* LevelUpExp.plist in Resources */ = {isa = PBXBuildFile; fileRef = F43E67B818BE060E0087E5B6 /* LevelUpExp.plist */; };
                F43F3D461A33F7D400D6DAF7 /* HMResetSortieCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F43F3D451A33F7D400D6DAF7 /* HMResetSortieCommand.m */; };
-               F43F3D4C1A34AC8000D6DAF7 /* HMKCMasterShipObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F43F3D4B1A34AC8000D6DAF7 /* HMKCMasterShipObject.m */; };
-               F43F3D4F1A34ACCD00D6DAF7 /* HMKCShipObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F43F3D4E1A34ACCD00D6DAF7 /* HMKCShipObject.m */; };
                F44AB23519E805D100F217AF /* HMKaisouLockCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F44AB23419E805D100F217AF /* HMKaisouLockCommand.m */; };
                F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EDC18B619B600073552 /* HMCoreDataManager.m */; };
                F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EE718B77A5300073552 /* HMMemberKDockCommand.m */; };
@@ -57,6 +54,9 @@
                F477E2411A5362C900493198 /* HMKCSlotItemObject+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2401A5362C900493198 /* HMKCSlotItemObject+Extension.swift */; };
                F477E2431A53836200493198 /* HMKCSlotItemObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2421A53836200493198 /* HMKCSlotItemObject.swift */; };
                F477E2451A53C41600493198 /* HMKCMasterSlotItemObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2441A53C41600493198 /* HMKCMasterSlotItemObject.swift */; };
+               F477E2471A5426B600493198 /* HMKCShipObject+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2461A5426B600493198 /* HMKCShipObject+Extension.swift */; };
+               F477E24B1A544EA000493198 /* HMKCShipObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E24A1A544EA000493198 /* HMKCShipObject.swift */; };
+               F477E24D1A54570E00493198 /* HMKCMasterShipObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E24C1A54570E00493198 /* HMKCMasterShipObject.swift */; };
                F47B78B218A7B42B0011386E /* HMJSONViewWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F47B78B018A7B42B0011386E /* HMJSONViewWindowController.m */; };
                F48F7B021907D7B800E78AE1 /* HMPortCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B011907D7B800E78AE1 /* HMPortCommand.m */; };
                F494DC5F18C30AE100AE97E4 /* HMMissionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = F494DC5E18C30AE100AE97E4 /* HMMissionStatus.m */; };
                F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSlotItemEquipTypeCommand.m; sourceTree = "<group>"; };
                F4268007193AF4E000B2C27F /* HMUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMUserDefaults.h; sourceTree = "<group>"; };
                F4268008193AF4E000B2C27F /* HMUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMUserDefaults.m; sourceTree = "<group>"; };
-               F42680101943E92D00B2C27F /* HMKCShipObject+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCShipObject+Extensions.h"; sourceTree = "<group>"; };
-               F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCShipObject+Extensions.m"; sourceTree = "<group>"; };
                F4268029194D0F4800B2C27F /* HMMemberShip2Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberShip2Command.h; sourceTree = "<group>"; };
                F426802A194D0F4800B2C27F /* HMMemberShip2Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberShip2Command.m; sourceTree = "<group>"; };
                F426802C194D0FFD00B2C27F /* HMMemberShip3Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberShip3Command.h; sourceTree = "<group>"; };
                F43E67B818BE060E0087E5B6 /* LevelUpExp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = LevelUpExp.plist; sourceTree = "<group>"; };
                F43F3D441A33F7D400D6DAF7 /* HMResetSortieCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMResetSortieCommand.h; sourceTree = "<group>"; };
                F43F3D451A33F7D400D6DAF7 /* HMResetSortieCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMResetSortieCommand.m; sourceTree = "<group>"; };
-               F43F3D4A1A34AC8000D6DAF7 /* HMKCMasterShipObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCMasterShipObject.h; sourceTree = "<group>"; };
-               F43F3D4B1A34AC8000D6DAF7 /* HMKCMasterShipObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCMasterShipObject.m; sourceTree = "<group>"; };
-               F43F3D4D1A34ACCD00D6DAF7 /* HMKCShipObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCShipObject.h; sourceTree = "<group>"; };
-               F43F3D4E1A34ACCD00D6DAF7 /* HMKCShipObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCShipObject.m; sourceTree = "<group>"; };
                F44AB23319E805D100F217AF /* HMKaisouLockCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKaisouLockCommand.h; sourceTree = "<group>"; };
                F44AB23419E805D100F217AF /* HMKaisouLockCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKaisouLockCommand.m; sourceTree = "<group>"; };
                F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = "<group>"; };
                F477E2401A5362C900493198 /* HMKCSlotItemObject+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HMKCSlotItemObject+Extension.swift"; sourceTree = "<group>"; };
                F477E2421A53836200493198 /* HMKCSlotItemObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCSlotItemObject.swift; sourceTree = "<group>"; };
                F477E2441A53C41600493198 /* HMKCMasterSlotItemObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterSlotItemObject.swift; sourceTree = "<group>"; };
+               F477E2461A5426B600493198 /* HMKCShipObject+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HMKCShipObject+Extension.swift"; sourceTree = "<group>"; };
+               F477E24A1A544EA000493198 /* HMKCShipObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCShipObject.swift; sourceTree = "<group>"; };
+               F477E24C1A54570E00493198 /* HMKCMasterShipObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterShipObject.swift; sourceTree = "<group>"; };
                F47B78AF18A7B42B0011386E /* HMJSONViewWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMJSONViewWindowController.h; sourceTree = "<group>"; };
                F47B78B018A7B42B0011386E /* HMJSONViewWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMJSONViewWindowController.m; sourceTree = "<group>"; };
                F48F7B001907D7B800E78AE1 /* HMPortCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPortCommand.h; sourceTree = "<group>"; };
                                F4D2CBC618B0555A000EBC59 /* HMKCManagedObject.h */,
                                F4D2CBC718B0555A000EBC59 /* HMKCManagedObject.m */,
                                F46F104718ABAC910063E503 /* KCD.xcdatamodeld */,
-                               F43F3D4A1A34AC8000D6DAF7 /* HMKCMasterShipObject.h */,
-                               F43F3D4B1A34AC8000D6DAF7 /* HMKCMasterShipObject.m */,
-                               F43F3D4D1A34ACCD00D6DAF7 /* HMKCShipObject.h */,
-                               F43F3D4E1A34ACCD00D6DAF7 /* HMKCShipObject.m */,
-                               F42680101943E92D00B2C27F /* HMKCShipObject+Extensions.h */,
-                               F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */,
+                               F477E24C1A54570E00493198 /* HMKCMasterShipObject.swift */,
+                               F477E24A1A544EA000493198 /* HMKCShipObject.swift */,
+                               F477E2461A5426B600493198 /* HMKCShipObject+Extension.swift */,
                                F477E2441A53C41600493198 /* HMKCMasterSlotItemObject.swift */,
                                F477E2421A53836200493198 /* HMKCSlotItemObject.swift */,
                                F477E2401A5362C900493198 /* HMKCSlotItemObject+Extension.swift */,
                                F4551BDE1A46C23100BB0235 /* HMTimerCountFormatter.swift in Sources */,
                                F4A3AD82199F529700FDBF80 /* HMCombinedBattleCommand.m in Sources */,
                                F4AA05FE192B932E00844688 /* HMTemporaryDataStore.m in Sources */,
+                               F477E24D1A54570E00493198 /* HMKCMasterShipObject.swift in Sources */,
                                F4B414F818B1D35800468DAF /* HMMasterMissionCommand.m in Sources */,
+                               F477E24B1A544EA000493198 /* HMKCShipObject.swift in Sources */,
                                F4E33B5818BF5F67005B8C07 /* HMMemberSlotItemCommand.m in Sources */,
                                F4E802071A50F8A100016781 /* HMSuppliesView.swift in Sources */,
                                F4C1190B18A74DF0005D5B25 /* HMJSONCommand.m in Sources */,
                                F4B1E30F19D1C9C400805879 /* HMApplySuppliesCommand.m in Sources */,
                                F48F7B021907D7B800E78AE1 /* HMPortCommand.m in Sources */,
                                F494DC5F18C30AE100AE97E4 /* HMMissionStatus.m in Sources */,
+                               F477E2471A5426B600493198 /* HMKCShipObject+Extension.swift in Sources */,
                                F4B30CFC1A4687E7008E3D79 /* HMIgnoreZeroTransformer.swift in Sources */,
-                               F43F3D4C1A34AC8000D6DAF7 /* HMKCMasterShipObject.m in Sources */,
                                F4268031194D1B1A00B2C27F /* HMChangeHenseiCommand.m in Sources */,
                                F4E802091A511F5900016781 /* HMSuppliesCell.swift in Sources */,
                                F477E2411A5362C900493198 /* HMKCSlotItemObject+Extension.swift in Sources */,
                                F477E2371A52D70F00493198 /* HMKenzoHistory.swift in Sources */,
                                F4513EFA18BB699700073552 /* HMShipWindowController.m in Sources */,
                                F477E2431A53836200493198 /* HMKCSlotItemObject.swift in Sources */,
-                               F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */,
                                F46F104118A9B85E0063E503 /* HMJSONNode.m in Sources */,
                                F454F7831A261844003042DD /* HMFleetInformation.m in Sources */,
                                F43F3D461A33F7D400D6DAF7 /* HMResetSortieCommand.m in Sources */,
                                F4B414EC18B0A7D600468DAF /* HMMasterUseItemCommand.m in Sources */,
                                F4513EF318B991F800073552 /* HMMemberBasicCommand.m in Sources */,
                                F4268009193AF4E000B2C27F /* HMUserDefaults.m in Sources */,
-                               F43F3D4F1A34ACCD00D6DAF7 /* HMKCShipObject.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index d4a4c9d..926ad7a 100644 (file)
@@ -8,9 +8,10 @@
 
 #import "HMApplySuppliesCommand.h"
 
-#import "HMKCShipObject+Extensions.h"
 #import "HMServerDataStore.h"
 
+#import "KCD-Swift.h"
+
 
 @implementation HMApplySuppliesCommand
 - (void)execute
index 69d6717..e3007ee 100644 (file)
@@ -9,7 +9,6 @@
 #import "HMFleetInformation.h"
 
 #import "HMServerDataStore.h"
-#import "HMKCShipObject+Extensions.h"
 
 #import "KCD-Swift.h"
 
diff --git a/KCD/HMKCMasterShipObject.h b/KCD/HMKCMasterShipObject.h
deleted file mode 100644 (file)
index 2f90c07..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-//
-//  HMKCMasterShipObject.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/12/08.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCManagedObject.h"
-
-@class HMKCShipObject;
-
-@interface HMKCMasterShipObject : HMKCManagedObject
-
-@property (nonatomic, retain) NSNumber * afterbull;
-@property (nonatomic, retain) NSNumber * afterfuel;
-@property (nonatomic, retain) NSNumber * afterlv;
-@property (nonatomic, retain) NSNumber * aftershipid;
-@property (nonatomic, retain) NSNumber * backs;
-@property (nonatomic, retain) NSNumber * broken_0;
-@property (nonatomic, retain) NSNumber * broken_1;
-@property (nonatomic, retain) NSNumber * broken_2;
-@property (nonatomic, retain) NSNumber * broken_3;
-@property (nonatomic, retain) NSNumber * buildtime;
-@property (nonatomic, retain) NSNumber * bull_max;
-@property (nonatomic, retain) NSNumber * fuel_max;
-@property (nonatomic, retain) NSString * getmes;
-@property (nonatomic, retain) NSNumber * houg_0;
-@property (nonatomic, retain) NSNumber * houg_1;
-@property (nonatomic, retain) NSNumber * id;
-@property (nonatomic, retain) NSNumber * leng;
-@property (nonatomic, retain) NSNumber * luck_0;
-@property (nonatomic, retain) NSNumber * luck_1;
-@property (nonatomic, retain) NSNumber * maxeq_0;
-@property (nonatomic, retain) NSNumber * maxeq_1;
-@property (nonatomic, retain) NSNumber * maxeq_2;
-@property (nonatomic, retain) NSNumber * maxeq_3;
-@property (nonatomic, retain) NSNumber * maxeq_4;
-@property (nonatomic, retain) NSString * name;
-@property (nonatomic, retain) NSNumber * powup_0;
-@property (nonatomic, retain) NSNumber * powup_1;
-@property (nonatomic, retain) NSNumber * powup_2;
-@property (nonatomic, retain) NSNumber * powup_3;
-@property (nonatomic, retain) NSNumber * raig_0;
-@property (nonatomic, retain) NSNumber * raig_1;
-@property (nonatomic, retain) NSString * sinfo;
-@property (nonatomic, retain) NSNumber * slot_num;
-@property (nonatomic, retain) NSNumber * soku;
-@property (nonatomic, retain) NSNumber * sortno;
-@property (nonatomic, retain) NSNumber * souk_0;
-@property (nonatomic, retain) NSNumber * souk_1;
-@property (nonatomic, retain) NSNumber * taik_0;
-@property (nonatomic, retain) NSNumber * taik_1;
-@property (nonatomic, retain) NSNumber * tais_0;
-@property (nonatomic, retain) NSNumber * tyku_0;
-@property (nonatomic, retain) NSNumber * tyku_1;
-@property (nonatomic, retain) NSNumber * voicef;
-@property (nonatomic, retain) NSString * yomi;
-@property (nonatomic, retain) NSSet *ships;
-@property (nonatomic, retain) HMKCManagedObject *stype;
-@end
-
-@interface HMKCMasterShipObject (CoreDataGeneratedAccessors)
-
-- (void)addShipsObject:(HMKCShipObject *)value;
-- (void)removeShipsObject:(HMKCShipObject *)value;
-- (void)addShips:(NSSet *)values;
-- (void)removeShips:(NSSet *)values;
-
-@end
diff --git a/KCD/HMKCMasterShipObject.m b/KCD/HMKCMasterShipObject.m
deleted file mode 100644 (file)
index c4d341a..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-//  HMKCMasterShipObject.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/12/08.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCMasterShipObject.h"
-#import "HMKCManagedObject.h"
-#import "HMKCShipObject.h"
-
-
-@implementation HMKCMasterShipObject
-
-@dynamic afterbull;
-@dynamic afterfuel;
-@dynamic afterlv;
-@dynamic aftershipid;
-@dynamic backs;
-@dynamic broken_0;
-@dynamic broken_1;
-@dynamic broken_2;
-@dynamic broken_3;
-@dynamic buildtime;
-@dynamic bull_max;
-@dynamic fuel_max;
-@dynamic getmes;
-@dynamic houg_0;
-@dynamic houg_1;
-@dynamic id;
-@dynamic leng;
-@dynamic luck_0;
-@dynamic luck_1;
-@dynamic maxeq_0;
-@dynamic maxeq_1;
-@dynamic maxeq_2;
-@dynamic maxeq_3;
-@dynamic maxeq_4;
-@dynamic name;
-@dynamic powup_0;
-@dynamic powup_1;
-@dynamic powup_2;
-@dynamic powup_3;
-@dynamic raig_0;
-@dynamic raig_1;
-@dynamic sinfo;
-@dynamic slot_num;
-@dynamic soku;
-@dynamic sortno;
-@dynamic souk_0;
-@dynamic souk_1;
-@dynamic taik_0;
-@dynamic taik_1;
-@dynamic tais_0;
-@dynamic tyku_0;
-@dynamic tyku_1;
-@dynamic voicef;
-@dynamic yomi;
-@dynamic ships;
-@dynamic stype;
-
-@end
diff --git a/KCD/HMKCMasterShipObject.swift b/KCD/HMKCMasterShipObject.swift
new file mode 100644 (file)
index 0000000..6f728d5
--- /dev/null
@@ -0,0 +1,61 @@
+//
+//  HMKCMasterShipObject.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/01/01.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class HMKCMasterShipObject: HMKCManagedObject {
+
+    @NSManaged var afterbull: NSNumber
+    @NSManaged var afterfuel: NSNumber
+    @NSManaged var afterlv: NSNumber
+    @NSManaged var aftershipid: NSNumber
+    @NSManaged var backs: NSNumber
+    @NSManaged var broken_0: NSNumber
+    @NSManaged var broken_1: NSNumber
+    @NSManaged var broken_2: NSNumber
+    @NSManaged var broken_3: NSNumber
+    @NSManaged var buildtime: NSNumber
+    @NSManaged var bull_max: NSNumber
+    @NSManaged var fuel_max: NSNumber
+    @NSManaged var getmes: String
+    @NSManaged var houg_0: NSNumber?
+    @NSManaged var houg_1: NSNumber?
+    @NSManaged var id: NSNumber
+    @NSManaged var leng: NSNumber
+    @NSManaged var luck_0: NSNumber?
+    @NSManaged var luck_1: NSNumber?
+    @NSManaged var maxeq_0: NSNumber
+    @NSManaged var maxeq_1: NSNumber
+    @NSManaged var maxeq_2: NSNumber
+    @NSManaged var maxeq_3: NSNumber
+    @NSManaged var maxeq_4: NSNumber
+    @NSManaged var name: String
+    @NSManaged var powup_0: NSNumber
+    @NSManaged var powup_1: NSNumber
+    @NSManaged var powup_2: NSNumber
+    @NSManaged var powup_3: NSNumber
+    @NSManaged var raig_0: NSNumber?
+    @NSManaged var raig_1: NSNumber?
+    @NSManaged var sinfo: String
+    @NSManaged var slot_num: NSNumber
+    @NSManaged var soku: NSNumber
+    @NSManaged var sortno: NSNumber
+    @NSManaged var souk_0: NSNumber?
+    @NSManaged var souk_1: NSNumber?
+    @NSManaged var taik_0: NSNumber
+    @NSManaged var taik_1: NSNumber
+    @NSManaged var tais_0: NSNumber
+    @NSManaged var tyku_0: NSNumber?
+    @NSManaged var tyku_1: NSNumber?
+    @NSManaged var voicef: NSNumber
+    @NSManaged var yomi: String
+    @NSManaged var ships: NSSet
+    @NSManaged var stype: HMKCManagedObject
+
+}
diff --git a/KCD/HMKCShipObject+Extension.swift b/KCD/HMKCShipObject+Extension.swift
new file mode 100644 (file)
index 0000000..a7301ed
--- /dev/null
@@ -0,0 +1,230 @@
+//
+//  HMKCShipObject.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2014/12/31.
+//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+var sShortSTypeNames: [String]?
+var sLevelUpExps: [NSNumber]?
+
+extension HMKCShipObject
+{
+       override class func keyPathsForValuesAffectingValueForKey(key: String) -> NSSet {
+               switch key {
+               case "statusColor":
+                       return NSSet(array: ["nowhp", "maxph"])
+               case "conditionColor":
+                       return NSSet(array: ["cond"])
+               case "name":
+                       return NSSet(array: ["ship_id"])
+               case "shortTypeName":
+                       return NSSet(array: ["ship_id"])
+               default:
+                       return NSSet()
+               }
+       }
+       
+       var shortSTypeNames: [String] {
+               if sShortSTypeNames != nil { return sShortSTypeNames! }
+               if let url = NSBundle.mainBundle().URLForResource("STypeShortName", withExtension: "plist") {
+                       if let array = NSArray(contentsOfURL: url) as? [String] {
+                               sShortSTypeNames = array
+                       } else {
+                               println("Can not load STypeShortName.plist.")
+                       }
+               }
+               return sShortSTypeNames!
+       }
+       var levelUpExps: [NSNumber] {
+               if sLevelUpExps != nil { return sLevelUpExps! }
+               if let url = NSBundle.mainBundle().URLForResource("LevelUpExp", withExtension: "plist") {
+                       if let array = NSArray(contentsOfURL: url) as? [Int] {
+                               sLevelUpExps = array
+                       } else {
+                               println("Can not load LevelUpExp.plist.")
+                       }
+               }
+               return sLevelUpExps!
+       }
+       
+       
+       var name: String? {
+               willAccessValueForKey("master_ship")
+               let name = master_ship.name
+               didAccessValueForKey("master_ship")
+               return name
+       }
+       var shortTypeName: String? {
+               willAccessValueForKey("master_ship")
+               let idValue = master_ship.stype.valueForKey("id") as? NSNumber
+               didAccessValueForKey("master_ship")
+               if idValue == nil { return nil }
+               let id = idValue!.integerValue
+               if shortSTypeNames.count < id { return nil }
+               return shortSTypeNames[id - 1]
+       }
+       var next: NSNumber? {
+               willAccessValueForKey("lv")
+               let lv = self.lv
+               didAccessValueForKey("lv")
+               willAccessValueForKey("exp")
+               let exp = self.exp
+               didAccessValueForKey("exp")
+               
+               let currentLevel = lv.integerValue
+               if currentLevel >= levelUpExps.count { return nil }
+               if currentLevel == 99 { return nil }
+               
+               var nextExp = levelUpExps[currentLevel].integerValue
+               if currentLevel > 99 {
+                       nextExp += 1_000_000
+               }
+               return nextExp - exp.integerValue
+       }
+       
+       var statusColor: NSColor {
+               willAccessValueForKey("maxhp")
+               let maxhp = self.maxhp.doubleValue
+               didAccessValueForKey("maxhp")
+               willAccessValueForKey("nowhp")
+               let nowhp = self.nowhp.doubleValue
+               didAccessValueForKey("nowhp")
+               
+               let status = nowhp / maxhp
+               if status <= 0.25 {
+                       return NSColor.redColor()
+               }
+               if status <= 0.5 {
+                       return NSColor.orangeColor()
+               }
+               if status <= 0.75 {
+                       return NSColor.yellowColor()
+               }
+               return NSColor.controlTextColor()
+       }
+       var conditionColor: NSColor {
+               return NSColor.controlTextColor()
+       }
+       var planColor: NSColor {
+               if !HMUserDefaults.hmStandardDefauls().showsPlanColor {
+                       return NSColor.controlTextColor()
+               }
+               willAccessValueForKey("sally_area")
+               let planType = sally_area?.integerValue
+               didAccessValueForKey("sally_area")
+               if planType == nil { return NSColor.controlTextColor() }
+               switch planType! {
+               case 1:
+                       return HMUserDefaults.hmStandardDefauls().plan01Color
+               case 2:
+                       return HMUserDefaults.hmStandardDefauls().plan02Color
+               case 2:
+                       return HMUserDefaults.hmStandardDefauls().plan03Color
+               default:
+                       return NSColor.controlTextColor()
+               }
+       }
+       var maxFuel: NSNumber? {
+               willAccessValueForKey("master_ship")
+               let number = master_ship.fuel_max
+               didAccessValueForKey("master_ship")
+               return number
+       }
+       var maxBull: NSNumber? {
+               willAccessValueForKey("master_ship")
+               let number = master_ship.bull_max
+               didAccessValueForKey("master_ship")
+               return number
+       }
+       var upgradeLevel: NSNumber? {
+               willAccessValueForKey("master_ship")
+               let number = master_ship.afterlv
+               didAccessValueForKey("master_ship")
+               return number
+       }
+       var upgradeExp: NSNumber? {
+               let upgradeLevel = self.upgradeLevel?.integerValue
+               if upgradeLevel == nil || upgradeLevel! <= 0 { return nil }
+               
+               var upgradeExp = levelUpExps[upgradeLevel! - 1].integerValue
+               upgradeExp = upgradeExp - exp.integerValue
+               if upgradeExp < 0 { upgradeExp = 0 }
+               return upgradeExp
+       }
+       
+       var isMaxKaryoku: NSNumber {
+               willAccessValueForKey("master_ship")
+               let defaultValue = master_ship.houg_0?.integerValue
+               didAccessValueForKey("master_ship")
+               willAccessValueForKey("karyoku_1")
+               let maxValue = karyoku_1?.integerValue
+               didAccessValueForKey("karyoku_1")
+               willAccessValueForKey("kyouka_0")
+               let growth = kyouka_0?.integerValue
+               didAccessValueForKey("kyouka_0")
+               if defaultValue == nil || maxValue == nil || growth == nil { return 0 }
+               
+               return defaultValue! + growth! >= maxValue!
+       }
+       var isMaxRaisou: NSNumber {
+               willAccessValueForKey("master_ship")
+               let defaultValue = master_ship.raig_0?.integerValue
+               didAccessValueForKey("master_ship")
+               willAccessValueForKey("raisou_1")
+               let maxValue = raisou_1?.integerValue
+               didAccessValueForKey("raisou_1")
+               willAccessValueForKey("kyouka_1")
+               let growth = kyouka_1?.integerValue
+               didAccessValueForKey("kyouka_1")
+               if defaultValue == nil || maxValue == nil || growth == nil { return 0 }
+               
+               return defaultValue! + growth! >= maxValue!
+       }
+       var isMaxTaiku: NSNumber {
+               willAccessValueForKey("master_ship")
+               let defaultValue = master_ship.tyku_0?.integerValue
+               didAccessValueForKey("master_ship")
+               willAccessValueForKey("taiku_1")
+               let maxValue = taiku_1?.integerValue
+               didAccessValueForKey("taiku_1")
+               willAccessValueForKey("kyouka_2")
+               let growth = kyouka_2?.integerValue
+               didAccessValueForKey("kyouka_2")
+               if defaultValue == nil || maxValue == nil || growth == nil { return 0 }
+               
+               return defaultValue! + growth! >= maxValue!
+       }
+       var isMaxSoukou: NSNumber {
+               willAccessValueForKey("master_ship")
+               let defaultValue = master_ship.souk_0?.integerValue
+               didAccessValueForKey("master_ship")
+               willAccessValueForKey("soukou_1")
+               let maxValue = soukou_1?.integerValue
+               didAccessValueForKey("soukou_1")
+               willAccessValueForKey("kyouka_3")
+               let growth = kyouka_3?.integerValue
+               didAccessValueForKey("kyouka_3")
+               if defaultValue == nil || maxValue == nil || growth == nil { return 0 }
+               
+               return defaultValue! + growth! >= maxValue!
+       }
+       var isMaxLucky: NSNumber {
+               willAccessValueForKey("master_ship")
+               let defaultValue = master_ship.luck_0?.integerValue
+               didAccessValueForKey("master_ship")
+               willAccessValueForKey("lucky_1")
+               let maxValue = lucky_1?.integerValue
+               didAccessValueForKey("lucky_1")
+               willAccessValueForKey("kyouka_4")
+               let growth = kyouka_4?.integerValue
+               didAccessValueForKey("kyouka_4")
+               if defaultValue == nil || maxValue == nil || growth == nil { return 0 }
+               
+               return defaultValue! + growth! >= maxValue!
+       }
+}
diff --git a/KCD/HMKCShipObject+Extensions.h b/KCD/HMKCShipObject+Extensions.h
deleted file mode 100644 (file)
index cef5fec..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  HMKCShipObject+Extensions.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/06/08.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCShipObject.h"
-
-@interface HMKCShipObject (Extensions)
-
-@property (readonly) NSString *name;
-@property (readonly) NSString *shortTypeName;
-
-
-@property (readonly) NSColor *statusColor;
-@property (readonly) NSColor *conditionColor;
-
-@property (readonly) NSNumber *maxBull;
-@property (readonly) NSNumber *maxFuel;
-
-@property (readonly) IBOutlet NSColor *planColor;
-
-
-@property (readonly) NSNumber *upgradeLevel;
-@property (readonly) NSNumber *upgradeExp;
-
-
-@end
diff --git a/KCD/HMKCShipObject+Extensions.m b/KCD/HMKCShipObject+Extensions.m
deleted file mode 100644 (file)
index 2ca4afe..0000000
+++ /dev/null
@@ -1,245 +0,0 @@
-//
-//  HMKCShipObject+Extensions.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/06/08.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCShipObject+Extensions.h"
-#import "HMKCMasterShipObject.h"
-
-#import "HMServerDataStore.h"
-#import "HMUserDefaults.h"
-
-
-static NSArray *shortSTypeNames = nil;
-static NSArray *levelUpExps = nil;
-
-@implementation HMKCShipObject (Extensions)
-
-+ (void)load
-{
-       static dispatch_once_t onceToken;
-       dispatch_once(&onceToken, ^{
-               NSBundle *mainBundle = [NSBundle mainBundle];
-               NSURL *url = [mainBundle URLForResource:@"STypeShortName" withExtension:@"plist"];
-               NSArray *array = [[NSArray alloc] initWithContentsOfURL:url];
-               if(!array) {
-                       NSLog(@"Can not load STypeShortName.plist.");
-               }
-               shortSTypeNames = [array copy];
-               
-               url = [mainBundle URLForResource:@"LevelUpExp" withExtension:@"plist"];
-               array = [[NSArray alloc] initWithContentsOfURL:url];
-               if(!array) {
-                       NSLog(@"Can not load LevelUpExp.plist.");
-               }
-               levelUpExps = [array copy];
-       });
-}
-
-+ (NSSet *)keyPathsForValuesAffectingStatusColor
-{
-       return [NSSet setWithObjects:@"nowhp", @"maxph", nil];
-}
-+ (NSSet *)keyPathsForValuesAffectingConditionColor
-{
-       return [NSSet setWithObjects:@"cond", nil];
-}
-+ (NSSet *)keyPathsForValuesAffectingName
-{
-       return [NSSet setWithObjects:@"ship_id", nil];
-}
-+ (NSSet *)keyPathsForValuesAffectingShortTypeName
-{
-       return [NSSet setWithObjects:@"ship_id", nil];
-}
-
-- (NSNumber *)isMaxKaryoku
-{
-       [self willAccessValueForKey:@"master_ship"];
-       [self willAccessValueForKey:@"karyoku_1"];
-       [self willAccessValueForKey:@"kyouka_0"];
-       NSInteger defaultValue = [self.master_ship.houg_0 integerValue];
-       NSInteger maxValue = [self.karyoku_1 integerValue];
-       NSInteger growth = [self.kyouka_0 integerValue];
-       [self didAccessValueForKey:@"kyouka_0"];
-       [self didAccessValueForKey:@"karyoku_1"];
-       [self didAccessValueForKey:@"master_ship"];
-       
-       return @(defaultValue + growth >= maxValue);
-}
-- (NSNumber *)isMaxRaisou
-{
-       [self willAccessValueForKey:@"master_ship"];
-       [self willAccessValueForKey:@"raisou_1"];
-       [self willAccessValueForKey:@"kyouka_1"];
-       NSInteger defaultValue = [self.master_ship.raig_0 integerValue];
-       NSInteger maxValue = [self.raisou_1 integerValue];
-       NSInteger growth = [self.kyouka_1 integerValue];
-       [self didAccessValueForKey:@"kyouka_1"];
-       [self didAccessValueForKey:@"raisou_1"];
-       [self didAccessValueForKey:@"master_ship"];
-       
-       return @(defaultValue + growth >= maxValue);
-}
-- (NSNumber *)isMaxTaiku
-{
-       [self willAccessValueForKey:@"master_ship"];
-       [self willAccessValueForKey:@"taiku_1"];
-       [self willAccessValueForKey:@"kyouka_2"];
-       NSInteger defaultValue = [self.master_ship.tyku_0 integerValue];
-       NSInteger maxValue = [self.taiku_1 integerValue];
-       NSInteger growth = [self.kyouka_2 integerValue];
-       [self didAccessValueForKey:@"kyouka_2"];
-       [self didAccessValueForKey:@"taiku_1"];
-       [self didAccessValueForKey:@"master_ship"];
-       
-       return @(defaultValue + growth >= maxValue);
-}
-- (NSNumber *)isMaxSoukou
-{
-       [self willAccessValueForKey:@"master_ship"];
-       [self willAccessValueForKey:@"soukou_1"];
-       [self willAccessValueForKey:@"kyouka_3"];
-       NSInteger defaultValue = [self.master_ship.souk_0 integerValue];
-       NSInteger maxValue = [self.soukou_1 integerValue];
-       NSInteger growth = [self.kyouka_3 integerValue];
-       [self didAccessValueForKey:@"kyouka_3"];
-       [self didAccessValueForKey:@"soukou_1"];
-       [self didAccessValueForKey:@"master_ship"];
-       
-       return @(defaultValue + growth >= maxValue);
-}
-- (NSNumber *)isMaxLucky
-{
-       [self willAccessValueForKey:@"master_ship"];
-       [self willAccessValueForKey:@"lucky_1"];
-       [self willAccessValueForKey:@"kyouka_4"];
-       NSInteger defaultValue = [self.master_ship.luck_0 integerValue];
-       NSInteger maxValue = [self.lucky_1 integerValue];
-       NSInteger growth = [self.kyouka_4 integerValue];
-       [self didAccessValueForKey:@"kyouka_4"];
-       [self didAccessValueForKey:@"lucky_1"];
-       [self didAccessValueForKey:@"master_ship"];
-       
-       return @(defaultValue + growth >= maxValue);
-}
-
-- (NSString *)name
-{
-       return [self.master_ship valueForKey:@"name"];
-}
-- (NSString *)shortTypeName
-{
-       [self willAccessValueForKey:@"master_ship"];
-       NSNumber *idValue = [self.master_ship.stype valueForKey:@"id"];
-       [self didAccessValueForKey:@"master_ship"];
-       if(!idValue || [idValue isKindOfClass:[NSNull class]]) return nil;
-       
-       if([shortSTypeNames count] < [idValue integerValue]) return nil;
-       
-       return shortSTypeNames[[idValue integerValue] - 1];
-}
-
-- (NSNumber *)next
-{
-       [self willAccessValueForKey:@"lv"];
-       id lvValue = self.lv;
-       [self didAccessValueForKey:@"lv"];
-       [self willAccessValueForKey:@"exp"];
-       id expValue = self.exp;
-       [self didAccessValueForKey:@"exp"];
-       
-       NSUInteger currentLevel = [lvValue integerValue];
-       if(currentLevel >= [levelUpExps count]) {
-               return nil;
-       }
-       if(currentLevel == 99) return nil;
-       
-       NSUInteger nextExp = [[levelUpExps objectAtIndex:currentLevel] integerValue];
-       if(currentLevel > 99) {
-               nextExp += 1000000;
-       }
-       return @(nextExp - [expValue integerValue]);
-}
-
-- (NSColor *)statusColor
-{
-       [self willAccessValueForKey:@"maxhp"];
-       [self willAccessValueForKey:@"nowhp"];
-       NSInteger maxhp = [self.maxhp integerValue];
-       CGFloat nowhp = [self.nowhp integerValue];
-       [self didAccessValueForKey:@"nowhp"];
-       [self didAccessValueForKey:@"maxhp"];
-       
-       CGFloat status = nowhp / maxhp;
-       if(status <= 0.25) {
-               return [NSColor redColor];
-       }
-       if(status <= 0.5) {
-               return [NSColor orangeColor];
-       }
-       if(status <= 0.75) {
-               return [NSColor yellowColor];
-               
-       }
-       return [NSColor controlTextColor];
-}
-- (NSColor *)conditionColor
-{
-       return [NSColor controlTextColor];
-}
-
-- (NSColor *)planColor
-{
-       if(!HMStandardDefaults.showsPlanColor) return [NSColor controlTextColor];
-       
-       [self willAccessValueForKey:@"sally_area"];
-       NSInteger planType = [self.sally_area integerValue];
-       [self didAccessValueForKey:@"sally_area"];
-       if(planType == 1) return HMStandardDefaults.plan01Color;
-       if(planType == 2) return HMStandardDefaults.plan02Color;
-       if(planType == 3) return HMStandardDefaults.plan03Color;
-       return [NSColor controlTextColor];
-}
-
-
-- (NSNumber *)maxFuel
-{
-       [self willAccessValueForKey:@"master_ship"];
-       NSNumber *number = self.master_ship.fuel_max;
-       [self didAccessValueForKey:@"master_ship"];
-       return number;
-}
-- (NSNumber *)maxBull
-{
-       [self willAccessValueForKey:@"master_ship"];
-       NSNumber *number = self.master_ship.bull_max;
-       [self didAccessValueForKey:@"master_ship"];
-       return number;
-}
-
-- (NSNumber *)upgradeLevel
-{
-       [self willAccessValueForKey:@"master_ship"];
-       NSNumber *number = self.master_ship.afterlv;
-       [self didAccessValueForKey:@"master_ship"];
-       return number;
-}
-- (NSNumber *)upgradeExp
-{
-       NSInteger upgradeLevtl = [self.upgradeLevel integerValue];
-       if(upgradeLevtl <= 0) return nil;
-       
-       NSInteger upgradeExp = [[levelUpExps objectAtIndex:upgradeLevtl - 1] integerValue];
-       NSInteger exp = [self.exp integerValue];
-       upgradeExp -= exp;
-       if(upgradeExp < 0) {
-               upgradeExp = 0;
-       }
-       return @(upgradeExp);
-}
-
-@end
diff --git a/KCD/HMKCShipObject.h b/KCD/HMKCShipObject.h
deleted file mode 100644 (file)
index b414d56..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-//  HMKCShipObject.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/12/08.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCManagedObject.h"
-
-@class HMKCMasterShipObject, HMKCSlotItemObject;
-
-@interface HMKCShipObject : HMKCManagedObject
-
-@property (nonatomic, retain) NSNumber * bull;
-@property (nonatomic, retain) NSNumber * cond;
-@property (nonatomic, retain) NSNumber * exp;
-@property (nonatomic, retain) NSNumber * fuel;
-@property (nonatomic, retain) NSNumber * id;
-@property (nonatomic, retain) NSNumber * kaihi_0;
-@property (nonatomic, retain) NSNumber * kaihi_1;
-@property (nonatomic, retain) NSNumber * karyoku_0;
-@property (nonatomic, retain) NSNumber * karyoku_1;
-@property (nonatomic, retain) NSNumber * kyouka_0;
-@property (nonatomic, retain) NSNumber * kyouka_1;
-@property (nonatomic, retain) NSNumber * kyouka_2;
-@property (nonatomic, retain) NSNumber * kyouka_3;
-@property (nonatomic, retain) NSNumber * kyouka_4;
-@property (nonatomic, retain) NSNumber * locked;
-@property (nonatomic, retain) NSNumber * locked_equip;
-@property (nonatomic, retain) NSNumber * lucky_0;
-@property (nonatomic, retain) NSNumber * lucky_1;
-@property (nonatomic, retain) NSNumber * lv;
-@property (nonatomic, retain) NSNumber * maxhp;
-@property (nonatomic, retain) NSNumber * ndock_time;
-@property (nonatomic, retain) NSNumber * nowhp;
-@property (nonatomic, retain) NSNumber * onslot_0;
-@property (nonatomic, retain) NSNumber * onslot_1;
-@property (nonatomic, retain) NSNumber * onslot_2;
-@property (nonatomic, retain) NSNumber * onslot_3;
-@property (nonatomic, retain) NSNumber * onslot_4;
-@property (nonatomic, retain) NSNumber * raisou_0;
-@property (nonatomic, retain) NSNumber * raisou_1;
-@property (nonatomic, retain) NSNumber * sakuteki_0;
-@property (nonatomic, retain) NSNumber * sakuteki_1;
-@property (nonatomic, retain) NSNumber * sally_area;
-@property (nonatomic, retain) NSNumber * ship_id;
-@property (nonatomic, retain) NSNumber * slot_0;
-@property (nonatomic, retain) NSNumber * slot_1;
-@property (nonatomic, retain) NSNumber * slot_2;
-@property (nonatomic, retain) NSNumber * slot_3;
-@property (nonatomic, retain) NSNumber * slot_4;
-@property (nonatomic, retain) NSNumber * sortno;
-@property (nonatomic, retain) NSNumber * soukou_0;
-@property (nonatomic, retain) NSNumber * soukou_1;
-@property (nonatomic, retain) NSNumber * srate;
-@property (nonatomic, retain) NSNumber * taiku_0;
-@property (nonatomic, retain) NSNumber * taiku_1;
-@property (nonatomic, retain) NSNumber * taisen_0;
-@property (nonatomic, retain) NSNumber * taisen_1;
-@property (nonatomic, retain) NSOrderedSet *equippedItem;
-@property (nonatomic, retain) HMKCMasterShipObject *master_ship;
-@end
-
-@interface HMKCShipObject (CoreDataGeneratedAccessors)
-
-- (void)insertObject:(HMKCSlotItemObject *)value inEquippedItemAtIndex:(NSUInteger)idx;
-- (void)removeObjectFromEquippedItemAtIndex:(NSUInteger)idx;
-- (void)insertEquippedItem:(NSArray *)value atIndexes:(NSIndexSet *)indexes;
-- (void)removeEquippedItemAtIndexes:(NSIndexSet *)indexes;
-- (void)replaceObjectInEquippedItemAtIndex:(NSUInteger)idx withObject:(HMKCSlotItemObject *)value;
-- (void)replaceEquippedItemAtIndexes:(NSIndexSet *)indexes withEquippedItem:(NSArray *)values;
-- (void)addEquippedItemObject:(HMKCSlotItemObject *)value;
-- (void)removeEquippedItemObject:(HMKCSlotItemObject *)value;
-- (void)addEquippedItem:(NSOrderedSet *)values;
-- (void)removeEquippedItem:(NSOrderedSet *)values;
-@end
diff --git a/KCD/HMKCShipObject.m b/KCD/HMKCShipObject.m
deleted file mode 100644 (file)
index 31ba236..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-//  HMKCShipObject.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/12/08.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCShipObject.h"
-#import "HMKCMasterShipObject.h"
-
-
-@implementation HMKCShipObject
-
-@dynamic bull;
-@dynamic cond;
-@dynamic exp;
-@dynamic fuel;
-@dynamic id;
-@dynamic kaihi_0;
-@dynamic kaihi_1;
-@dynamic karyoku_0;
-@dynamic karyoku_1;
-@dynamic kyouka_0;
-@dynamic kyouka_1;
-@dynamic kyouka_2;
-@dynamic kyouka_3;
-@dynamic kyouka_4;
-@dynamic locked;
-@dynamic locked_equip;
-@dynamic lucky_0;
-@dynamic lucky_1;
-@dynamic lv;
-@dynamic maxhp;
-@dynamic ndock_time;
-@dynamic nowhp;
-@dynamic onslot_0;
-@dynamic onslot_1;
-@dynamic onslot_2;
-@dynamic onslot_3;
-@dynamic onslot_4;
-@dynamic raisou_0;
-@dynamic raisou_1;
-@dynamic sakuteki_0;
-@dynamic sakuteki_1;
-@dynamic sally_area;
-@dynamic ship_id;
-@dynamic slot_0;
-@dynamic slot_1;
-@dynamic slot_2;
-@dynamic slot_3;
-@dynamic slot_4;
-@dynamic sortno;
-@dynamic soukou_0;
-@dynamic soukou_1;
-@dynamic srate;
-@dynamic taiku_0;
-@dynamic taiku_1;
-@dynamic taisen_0;
-@dynamic taisen_1;
-@dynamic equippedItem;
-@dynamic master_ship;
-
-@end
diff --git a/KCD/HMKCShipObject.swift b/KCD/HMKCShipObject.swift
new file mode 100644 (file)
index 0000000..f80df9f
--- /dev/null
@@ -0,0 +1,63 @@
+//
+//  HMKCShipObject.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/01/01.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class HMKCShipObject: HMKCManagedObject {
+
+    @NSManaged var bull: NSNumber
+    @NSManaged var cond: NSNumber
+    @NSManaged var exp: NSNumber
+    @NSManaged var fuel: NSNumber
+    @NSManaged var id: NSNumber
+    @NSManaged var kaihi_0: NSNumber
+    @NSManaged var kaihi_1: NSNumber
+    @NSManaged var karyoku_0: NSNumber?
+    @NSManaged var karyoku_1: NSNumber?
+    @NSManaged var kyouka_0: NSNumber?
+    @NSManaged var kyouka_1: NSNumber?
+    @NSManaged var kyouka_2: NSNumber?
+    @NSManaged var kyouka_3: NSNumber?
+    @NSManaged var kyouka_4: NSNumber?
+    @NSManaged var locked: NSNumber
+    @NSManaged var locked_equip: NSNumber
+    @NSManaged var lucky_0: NSNumber?
+    @NSManaged var lucky_1: NSNumber?
+    @NSManaged var lv: NSNumber
+    @NSManaged var maxhp: NSNumber
+    @NSManaged var ndock_time: NSNumber
+    @NSManaged var nowhp: NSNumber
+    @NSManaged var onslot_0: NSNumber
+    @NSManaged var onslot_1: NSNumber
+    @NSManaged var onslot_2: NSNumber
+    @NSManaged var onslot_3: NSNumber
+    @NSManaged var onslot_4: NSNumber
+    @NSManaged var raisou_0: NSNumber?
+    @NSManaged var raisou_1: NSNumber?
+    @NSManaged var sakuteki_0: NSNumber
+    @NSManaged var sakuteki_1: NSNumber
+    @NSManaged var sally_area: NSNumber?
+    @NSManaged var ship_id: NSNumber
+    @NSManaged var slot_0: NSNumber
+    @NSManaged var slot_1: NSNumber
+    @NSManaged var slot_2: NSNumber
+    @NSManaged var slot_3: NSNumber
+    @NSManaged var slot_4: NSNumber
+    @NSManaged var sortno: NSNumber
+    @NSManaged var soukou_0: NSNumber?
+    @NSManaged var soukou_1: NSNumber?
+    @NSManaged var srate: NSNumber
+    @NSManaged var taiku_0: NSNumber?
+    @NSManaged var taiku_1: NSNumber?
+    @NSManaged var taisen_0: NSNumber
+    @NSManaged var taisen_1: NSNumber
+    @NSManaged var equippedItem: NSOrderedSet
+    @NSManaged var master_ship: HMKCMasterShipObject
+
+}
index deb4c16..61778fc 100644 (file)
@@ -11,7 +11,8 @@
 #import "HMAppDelegate.h"
 #import "HMServerDataStore.h"
 #import "HMFleetInformation.h"
-#import "HMKCShipObject+Extensions.h"
+
+#import "KCD-Swift.h"
 
 
 @interface HMShipMasterDetailWindowController ()
index d4c13b0..81ef902 100644 (file)
@@ -10,7 +10,6 @@
 #import "HMTemporaryDataStore.h"
 
 #import "HMKCManagedObject.h"
-#import "HMKCShipObject+Extensions.h"
 
 #import "HMMissionStatus.h"
 #import "HMNyukyoDockStatus.h"
index 3adb272..6759f0b 100644 (file)
         <attribute name="win_item2_0" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="win_item2_1" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="MasterShip" representedClassName="HMKCMasterShipObject" syncable="YES">
+    <entity name="MasterShip" representedClassName="KCD.HMKCMasterShipObject" syncable="YES">
         <attribute name="afterbull" attributeType="Integer 32" syncable="YES"/>
         <attribute name="afterfuel" attributeType="Integer 32" syncable="YES"/>
         <attribute name="afterlv" attributeType="Integer 32" syncable="YES"/>
         <attribute name="ship_id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="state" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="Ship" representedClassName="HMKCShipObject" syncable="YES">
+    <entity name="Ship" representedClassName="KCD.HMKCShipObject" syncable="YES">
         <attribute name="bull" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="cond" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="exp" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <element name="MasterUseItem" positionX="0" positionY="0" width="128" height="150"/>
         <element name="Material" positionX="0" positionY="0" width="128" height="165"/>
         <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="195"/>
-        <element name="Ship" positionX="0" positionY="0" width="128" height="763"/>
+        <element name="Ship" positionX="0" positionY="0" width="128" height="765"/>
         <element name="SlotItem" positionX="0" positionY="0" width="128" height="135"/>
     </elements>
 </model>
\ No newline at end of file