From ca921a68d0671840125bef2e31d19dcb6ca41454 Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Sun, 8 Jun 2014 10:23:40 +0900
Subject: [PATCH] =?utf8?q?=E6=8A=BD=E8=B1=A1=E7=9A=84=E3=82=A8=E3=83=B3?=
 =?utf8?q?=E3=83=86=E3=82=A3=E3=83=86=E3=82=A3KCDEntity=E3=82=92=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0=E3=81=97=E3=81=99=E3=81=B8=E3=82=99=E3=81=A6=E3=81=AE?=
 =?utf8?q?=E3=82=A8=E3=83=B3=E3=83=86=E3=82=A3=E3=83=86=E3=82=A3=E3=81=AE?=
 =?utf8?q?=E8=A6=AA=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents | 54 ++++++++++++++-------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
index 38749b7f..5c96ae44 100644
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="5064" systemVersion="13D65" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
-    <entity name="Basic" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="Basic" representedClassName="HMKCBasic" parentEntity="KCDEntity" syncable="YES">
         <attribute name="active_flag" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="comment" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="comment_id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -40,7 +40,7 @@
         <attribute name="tutorial" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="tutorial_progress" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="Deck" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="Deck" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="flagship" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="member_id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -57,7 +57,8 @@
         <attribute name="ship_4" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="ship_5" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="KenzoDock" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="KCDEntity" representedClassName="HMKCManagedObject" isAbstract="YES" syncable="YES"/>
+    <entity name="KenzoDock" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="complete_time" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
         <attribute name="complete_time_str" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="created_ship_id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -70,7 +71,7 @@
         <attribute name="member_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="MasterFurniture" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterFurniture" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="description_" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="no" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -80,12 +81,12 @@
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="type" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="MasterMapArea" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterMapArea" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="id" attributeType="Integer 32" syncable="YES"/>
         <attribute name="name" attributeType="String" syncable="YES"/>
         <attribute name="type" optional="YES" attributeType="Integer 32" syncable="YES"/>
     </entity>
-    <entity name="MasterMapCell" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterMapCell" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="color_no" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="map_no" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -93,7 +94,7 @@
         <attribute name="mapinfo_no" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="no" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="MasterMapInfo" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterMapInfo" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="exboss_flag" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="id" attributeType="Integer 32" syncable="YES"/>
         <attribute name="infotext" optional="YES" attributeType="String" syncable="YES"/>
@@ -109,7 +110,7 @@
         <attribute name="opetext" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="required_defeat_count" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="MasterMission" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterMission" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="active" optional="YES" attributeType="Boolean" defaultValueString="0" syncable="YES"/>
         <attribute name="details" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="difficulty" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -126,7 +127,7 @@
         <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="HMKCManagedObject" syncable="YES">
+    <entity name="MasterShip" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" 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"/>
@@ -226,7 +227,7 @@
         <relationship name="ships" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Ship" inverseName="master_ship" inverseEntity="Ship" syncable="YES"/>
         <relationship name="stype" maxCount="1" deletionRule="Nullify" destinationEntity="MasterSType" inverseName="ships" inverseEntity="MasterSType" syncable="YES"/>
     </entity>
-    <entity name="MasterSlotItem" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterSlotItem" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="atap" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="bakk" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="baku" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -261,12 +262,12 @@
         <attribute name="usebull" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <relationship name="slotItems" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SlotItem" inverseName="master_slotItem" inverseEntity="SlotItem" syncable="YES"/>
     </entity>
-    <entity name="MasterSlotItemEquipType" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterSlotItemEquipType" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="show_flg" optional="YES" attributeType="Boolean" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="MasterSType" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterSType" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="id" attributeType="Integer 32" indexed="YES" syncable="YES"/>
         <attribute name="kcnt" optional="YES" attributeType="Integer 32" syncable="YES"/>
         <attribute name="name" attributeType="String" indexed="YES" syncable="YES"/>
@@ -274,7 +275,7 @@
         <attribute name="sortno" attributeType="Integer 32" indexed="YES" syncable="YES"/>
         <relationship name="ships" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="MasterShip" inverseName="stype" inverseEntity="MasterShip" syncable="YES"/>
     </entity>
-    <entity name="MasterUseItem" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="MasterUseItem" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="category" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="description_0" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="description_1" optional="YES" attributeType="String" syncable="YES"/>
@@ -283,7 +284,7 @@
         <attribute name="price" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="usetype" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="Material" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="Material" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="bauxite" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="bull" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="fuel" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -292,7 +293,7 @@
         <attribute name="kousokushuhuku" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="steel" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
     </entity>
-    <entity name="NyukyoDock" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="NyukyoDock" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="complete_time" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
         <attribute name="complete_time_str" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -304,7 +305,7 @@
         <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="HMKCShipObject" parentEntity="KCDEntity" 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"/>
@@ -354,7 +355,7 @@
         <relationship name="equippedItem" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="SlotItem" inverseName="equippedShip" inverseEntity="SlotItem" syncable="YES"/>
         <relationship name="master_ship" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterShip" inverseName="ships" inverseEntity="MasterShip" syncable="YES"/>
     </entity>
-    <entity name="SlotItem" representedClassName="HMKCManagedObject" syncable="YES">
+    <entity name="SlotItem" representedClassName="HMKCManagedObject" parentEntity="KCDEntity" syncable="YES">
         <attribute name="flag_0" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="flag_1" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="flag_2" optional="YES" attributeType="Boolean" syncable="YES"/>
@@ -370,22 +371,23 @@
         <relationship name="master_slotItem" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterSlotItem" inverseName="slotItems" inverseEntity="MasterSlotItem" syncable="YES"/>
     </entity>
     <elements>
-        <element name="Basic" positionX="0" positionY="0" width="128" height="615"/>
+        <element name="Basic" positionX="0" positionY="0" width="128" height="613"/>
         <element name="Deck" positionX="0" positionY="0" width="128" height="268"/>
         <element name="KenzoDock" positionX="0" positionY="0" width="128" height="210"/>
-        <element name="MasterFurniture" positionX="0" positionY="0" width="128" height="165"/>
+        <element name="MasterFurniture" positionX="0" positionY="0" width="128" height="163"/>
         <element name="MasterMapArea" positionX="0" positionY="0" width="128" height="90"/>
-        <element name="MasterMapCell" positionX="0" positionY="0" width="128" height="133"/>
-        <element name="MasterMapInfo" positionX="0" positionY="0" width="128" height="253"/>
-        <element name="MasterMission" positionX="0" positionY="0" width="128" height="270"/>
-        <element name="MasterShip" positionX="0" positionY="0" width="128" height="1515"/>
-        <element name="MasterSlotItem" positionX="0" positionY="0" width="128" height="538"/>
+        <element name="MasterMapCell" positionX="0" positionY="0" width="128" height="135"/>
+        <element name="MasterMapInfo" positionX="0" positionY="0" width="128" height="255"/>
+        <element name="MasterMission" positionX="0" positionY="0" width="128" height="268"/>
+        <element name="MasterShip" positionX="0" positionY="0" width="128" height="1513"/>
+        <element name="MasterSlotItem" positionX="0" positionY="0" width="128" height="540"/>
         <element name="MasterSlotItemEquipType" positionX="9" positionY="153" width="128" height="88"/>
         <element name="MasterSType" positionX="0" positionY="0" width="128" height="135"/>
         <element name="MasterUseItem" positionX="0" positionY="0" width="128" height="150"/>
         <element name="Material" positionX="0" positionY="0" width="128" height="150"/>
         <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="195"/>
-        <element name="Ship" positionX="0" positionY="0" width="128" height="763"/>
-        <element name="SlotItem" positionX="0" positionY="0" width="128" height="238"/>
+        <element name="Ship" positionX="0" positionY="0" width="128" height="765"/>
+        <element name="SlotItem" positionX="0" positionY="0" width="128" height="240"/>
+        <element name="KCDEntity" positionX="9" positionY="153" width="128" height="43"/>
     </elements>
 </model>
\ No newline at end of file
-- 
2.11.0