From: masakih <masakih@users.sourceforge.jp>
Date: Wed, 11 Jan 2017 11:49:42 +0000 (+0900)
Subject: 新しい速力の表示ができるように修正
X-Git-Tag: 1.8b8~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6e36b3d1e638ed5e27bfa2b7cebb64721ac2d144;p=kcd%2FKCD.git

新しい速力の表示ができるように修正
---

diff --git a/KCD/Base.lproj/HMShipDetailViewController.xib b/KCD/Base.lproj/HMShipDetailViewController.xib
index 7923c2db..10b3e2ea 100644
--- a/KCD/Base.lproj/HMShipDetailViewController.xib
+++ b/KCD/Base.lproj/HMShipDetailViewController.xib
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -339,15 +338,15 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="e8z-uk-5Kj">
-                        <rect key="frame" x="160" y="92" width="30" height="14"/>
+                        <rect key="frame" x="160" y="92" width="35" height="14"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="高速" id="Olc-Xu-clL">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="高速＋" id="Olc-Xu-clL">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
-                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.master_ship.soku" id="M9h-T3-rlj">
+                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.soku" id="Bba-EJ-qC6">
                                 <dictionary key="options">
                                     <string key="NSNoSelectionPlaceholder">-</string>
                                     <string key="NSValueTransformerName">HMSokuTransformer</string>
diff --git a/KCD/HMMemberShipCommand.m b/KCD/HMMemberShipCommand.m
index a9df4651..b1ad762b 100644
--- a/KCD/HMMemberShipCommand.m
+++ b/KCD/HMMemberShipCommand.m
@@ -43,8 +43,8 @@
 				   @"api_voicef", @"api_afterlv", @"api_aftershipid", @"api_backs",
 				   @"api_slotnum", @"api_stype", @"api_name", @"api_yomi",
 				   @"api_raig", @"api_luck", @"api_saku", @"api_raim", @"api_baku",
-				   @"api_taik", @"api_houg", @"api_souk", @"api_houm", @"api_tyku",
-				   @"api_ndock_item", @"api_soku", @"api_star",
+				   @"api_taik", @"api_houg", @"api_houm", @"api_tyku",
+				   @"api_ndock_item", @"api_star",
 				   @"api_ndock_time_str", @"api_member_id", @"api_fuel_max", @"api_bull_max"];
 	return ignoreKeys;
 }
diff --git a/KCD/HMSokuTransformer.m b/KCD/HMSokuTransformer.m
index 709c807c..be9431ea 100644
--- a/KCD/HMSokuTransformer.m
+++ b/KCD/HMSokuTransformer.m
@@ -11,6 +11,8 @@
 typedef NS_ENUM(NSInteger, SokuType) {
 	kSlow = 5,
 	kFast = 10,
+    kFaster = 15,
+    kFastest = 20,
 };
 
 @implementation HMSokuTransformer
@@ -43,6 +45,12 @@ typedef NS_ENUM(NSInteger, SokuType) {
 		case kFast:
 			result = NSLocalizedString(@"Fast", @"Speed, fast");
 			break;
+        case kFaster:
+            result = NSLocalizedString(@"Faster", @"Speed, faster");
+            break;
+        case kFastest:
+            result = NSLocalizedString(@"Fastest", @"Speed, fastest");
+            break;
 	}
 	
 	return result;
diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
index c890dbc8..55fcc21e 100644
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11232" systemVersion="15G1108" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16C67" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
     <entity name="AirBase" representedClassName="HMKCAirBase" syncable="YES">
         <attribute name="action_kind" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="area_id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -330,6 +330,7 @@
         <attribute name="slot_3" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="slot_4" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="slot_ex" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="soku" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="sortno" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="soukou_0" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="soukou_1" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
@@ -353,6 +354,8 @@
         <relationship name="master_slotItem" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterSlotItem" inverseName="slotItems" inverseEntity="MasterSlotItem" syncable="YES"/>
     </entity>
     <elements>
+        <element name="AirBase" positionX="9" positionY="153" width="128" height="135"/>
+        <element name="AirBasePlaneInfo" positionX="18" positionY="162" width="128" height="150"/>
         <element name="Basic" positionX="0" positionY="0" width="128" height="645"/>
         <element name="Deck" positionX="0" positionY="0" width="128" height="270"/>
         <element name="KenzoDock" positionX="0" positionY="0" width="128" height="210"/>
@@ -369,9 +372,7 @@
         <element name="Material" positionX="0" positionY="0" width="128" height="165"/>
         <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="30"/>
         <element name="Quest" positionX="0" positionY="0" width="128" height="240"/>
-        <element name="Ship" positionX="0" positionY="0" width="128" height="825"/>
+        <element name="Ship" positionX="0" positionY="0" width="128" height="840"/>
         <element name="SlotItem" positionX="0" positionY="0" width="128" height="165"/>
-        <element name="AirBase" positionX="9" positionY="153" width="128" height="135"/>
-        <element name="AirBasePlaneInfo" positionX="18" positionY="162" width="128" height="150"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/KCD/ja.lproj/Localizable.strings b/KCD/ja.lproj/Localizable.strings
index 4bb893da..571040e5 100644
Binary files a/KCD/ja.lproj/Localizable.strings and b/KCD/ja.lproj/Localizable.strings differ
diff --git a/KCD/ja.lproj/Localizable.strings.sed b/KCD/ja.lproj/Localizable.strings.sed
index de38fe61..d411583f 100644
--- a/KCD/ja.lproj/Localizable.strings.sed
+++ b/KCD/ja.lproj/Localizable.strings.sed
@@ -30,7 +30,9 @@ s/Long/長/2
 s/Middle/中/2
 s/Short/短/2
 s/Slow/低速/2
-s/Fast/高速/2
+s/Fast"/高速"/2
+s/Faster"/高速＋"/2
+s/Fastest"/最速"/2
 s/Deleting caches.../キャッシュを削除中.../2
 s/Hide Combined View/連合艦隊ビューを隠す/2
 s/Show Combined View/連合艦隊ビューを表示/2
diff --git a/KCD/ja.lproj/SlotItemShortName.plist b/KCD/ja.lproj/SlotItemShortName.plist
index 45ea2a0c..dc1c8776 100644
--- a/KCD/ja.lproj/SlotItemShortName.plist
+++ b/KCD/ja.lproj/SlotItemShortName.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>33</key>
+	<string>ター</string>
 	<key>37</key>
 	<string>7.7</string>
 	<key>38</key>
diff --git a/KCD/zh-Hant-TW.lproj/Localizable.strings b/KCD/zh-Hant-TW.lproj/Localizable.strings
index c7588724..eb78d150 100644
Binary files a/KCD/zh-Hant-TW.lproj/Localizable.strings and b/KCD/zh-Hant-TW.lproj/Localizable.strings differ
diff --git a/KCD/zh-Hant-TW.lproj/Localizable.strings.sed b/KCD/zh-Hant-TW.lproj/Localizable.strings.sed
index b4b71ca3..34e9c39d 100644
--- a/KCD/zh-Hant-TW.lproj/Localizable.strings.sed
+++ b/KCD/zh-Hant-TW.lproj/Localizable.strings.sed
@@ -30,7 +30,9 @@ s/Long/長/2
 s/Middle/中/2
 s/Short/短/2
 s/Slow/低速/2
-s/Fast/高速/2
+s/Fast"/高速"/2
+s/Faster"/高速＋"/2
+s/Fastest"/最速"/2
 s/Deleting caches.../刪除緩存.../2
 s/Hide Combined View/隱藏聯合艦隊視窗/2
 s/Show Combined View/顯示聯合艦隊視窗/2