改修工廠メニューを更新

diff --git a/KCD/Base.lproj/StrengthenListViewController.xib b/KCD/Base.lproj/StrengthenListViewController.xib
index c4695e9..05866a6 100644 (file)
--- a/KCD/Base.lproj/StrengthenListViewController.xib
+++ b/KCD/Base.lproj/StrengthenListViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -85,7 +85,7 @@
                                                 <rect key="frame" x="1" y="0.0" width="306" height="103"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qWm-Q8-BsW">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="qWm-Q8-BsW">
                                                         <rect key="frame" x="8" y="61" width="297" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Printz Eugen改" id="sB3-RT-Khy">
@@ -101,7 +101,7 @@
                                                             </binding>
                                                         </connections>
                                                     </textField>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="dtt-Ip-R0L">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="dtt-Ip-R0L">
                                                         <rect key="frame" x="0.0" y="82" width="161" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="OTO 152mm三連装速射砲" id="wH1-vC-nSw">
@@ -113,7 +113,7 @@
                                                             <binding destination="gd9-yz-R2c" name="value" keyPath="targetEquipment" id="lQv-wP-uWW"/>
                                                         </connections>
                                                     </textField>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="BKP-sY-VKc">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="BKP-sY-VKc">
                                                         <rect key="frame" x="160" y="82" width="146" height="14"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Label" id="jwK-Iu-KBX">
@@ -140,7 +140,7 @@
                                                             <rect key="frame" x="1" y="1" width="226" height="51"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="4eG-2g-uyx">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="4eG-2g-uyx">
                                                                     <rect key="frame" x="0.0" y="35" width="27" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="0~5" id="W3y-Ux-ymV">
@@ -149,7 +149,7 @@
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qpe-7O-6pL">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="qpe-7O-6pL">
                                                                     <rect key="frame" x="0.0" y="18" width="27" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="6~9" id="q9l-VF-gYf">
@@ -158,7 +158,7 @@
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="gxv-Ui-kqD">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="gxv-Ui-kqD">
                                                                     <rect key="frame" x="0.0" y="1" width="27" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="max" id="uLJ-Lu-iyp">
@@ -167,8 +167,8 @@
                                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="8OI-al-eom">
-                                                                    <rect key="frame" x="64" y="35" width="140" height="14"/>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" id="8OI-al-eom">
+                                                                    <rect key="frame" x="67" y="35" width="140" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="12.7cm連装砲B型改二ほげ" id="R1K-yU-b18">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -183,7 +183,7 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="0Z2-0F-ZgF">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="0Z2-0F-ZgF">
                                                                     <rect key="frame" x="207" y="35" width="18" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="33" id="jjl-Pt-1HC">
@@ -200,7 +200,7 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="S0N-Pb-ncz">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="S0N-Pb-ncz">
                                                                     <rect key="frame" x="30" y="35" width="35" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="33/33" id="Pt7-9I-VIy">
@@ -217,8 +217,8 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cfa-SL-7c8">
-                                                                    <rect key="frame" x="64" y="18" width="140" height="14"/>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" id="cfa-SL-7c8">
+                                                                    <rect key="frame" x="67" y="18" width="140" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="61cm四連装(酸素)魚雷" id="tcc-Ep-Q8c">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -233,7 +233,7 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Jg8-Om-KU9">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="Jg8-Om-KU9">
                                                                     <rect key="frame" x="207" y="18" width="18" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="33" id="Ds0-Hd-uQs">
@@ -250,7 +250,7 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="dNP-JP-n54">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="dNP-JP-n54">
                                                                     <rect key="frame" x="30" y="18" width="35" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="33/33" id="ahe-w8-vIv">
@@ -267,8 +267,8 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="9hA-09-RKh">
-                                                                    <rect key="frame" x="64" y="1" width="140" height="14"/>
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" id="9hA-09-RKh">
+                                                                    <rect key="frame" x="67" y="1" width="140" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="61cm五連装(酸素)魚雷" id="lnY-dS-w00">
                                                                         <font key="font" metaFont="smallSystem"/>
@@ -283,7 +283,7 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="USu-Qu-CAe">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="USu-Qu-CAe">
                                                                     <rect key="frame" x="207" y="1" width="18" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="33" id="atp-g5-f7u">
@@ -300,7 +300,7 @@
                                                                         </binding>
                                                                     </connections>
                                                                 </textField>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="4bb-Df-7fv">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="4bb-Df-7fv">
                                                                     <rect key="frame" x="30" y="1" width="35" height="14"/>
                                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="33/33" id="DcD-sC-tmd">
@@ -331,7 +331,7 @@
                                                 <rect key="frame" x="1" y="104" width="306" height="23"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="LI2-ug-alk">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="LI2-ug-alk">
                                                         <rect key="frame" x="6" y="3" width="161" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="OTO 152mm三連装速射砲" id="V3C-ZH-zks">

diff --git a/KCD/EnhancementListItem.txt b/KCD/EnhancementListItem.txt
index 123c946..1c3081e 100644 (file)
--- a/KCD/EnhancementListItem.txt
+++ b/KCD/EnhancementListItem.txt
@@ -113,6 +113,9 @@
 105A   5       3       試製41cm三連装砲          長門改
 105A   6       3       試製41cm三連装砲          陸奥改
 105A   7       3       試製41cm三連装砲          陸奥改
+236A   2       3       41cm三連装砲改             長門改二
+236A   2       4       41cm三連装砲改             長門改二
+236A   2       5       41cm三連装砲改             長門改二
 117A   1       3       試製46cm連装砲     46cm三連装砲★+5   大和
 117A   2       3       試製46cm連装砲     46cm三連装砲★+5   大和
 117A   3       3       試製46cm連装砲     46cm三連装砲★+5   武蔵
@@ -160,13 +163,14 @@
 10A    7       4       12.7cm連装高角砲   8cm高角砲    摩耶改二,鈴谷,熊野
 66A    1       4       8cm高角砲    8cm高角砲改＋増設機銃  阿賀野,能代,矢矧
 66A    2       4       8cm高角砲    8cm高角砲改＋増設機銃  阿賀野,能代,矢矧
-66A    3       4       8cm高角砲    8cm高角砲改＋増設機銃  矢矧,鈴谷改二
-66A    4       4       8cm高角砲    8cm高角砲改＋増設機銃  鈴谷改二
+66A    3       4       8cm高角砲    8cm高角砲改＋増設機銃  矢矧,鈴谷改二,熊野改二
+66A    4       4       8cm高角砲    8cm高角砲改＋増設機銃  鈴谷改二,熊野改二
 66A    5       4       8cm高角砲    8cm高角砲改＋増設機銃  阿賀野,鈴谷改二
 66A    6       4       8cm高角砲    8cm高角砲改＋増設機銃  阿賀野,能代
 66A    7       4       8cm高角砲    8cm高角砲改＋増設機銃  阿賀野,能代
-220A   3       4       8cm高角砲改＋増設機銃          鈴谷改二,矢矧改,酒匂改
-220A   4       4       8cm高角砲改＋増設機銃          鈴谷改二,矢矧改,酒匂改
+220A   2       4       8cm高角砲改＋増設機銃          熊野改二
+220A   3       4       8cm高角砲改＋増設機銃          鈴谷改二,熊野改二,矢矧改,酒匂改
+220A   4       4       8cm高角砲改＋増設機銃          鈴谷改二,熊野改二,矢矧改,酒匂改
 220A   5       4       8cm高角砲改＋増設機銃          鈴谷改二,矢矧改,酒匂改
 13A    1       5       61cm三連装魚雷     61cm三連装(酸素)魚雷     叢雲
 13A    2       5       61cm三連装魚雷     61cm三連装(酸素)魚雷     叢雲
@@ -266,9 +270,10 @@
 154A   3       7       零戦62型(爆戦/岩井隊)           瑞鶴
 154A   5       7       零戦62型(爆戦/岩井隊)           瑞鶴
 219A   2       7       零式艦戦63型(爆戦)               鈴谷航改二
-219A   3       7       零式艦戦63型(爆戦)               鈴谷航改二
-219A   4       7       零式艦戦63型(爆戦)               鈴谷航改二
-219A   5       7       零式艦戦63型(爆戦)               鈴谷航改二
+219A   3       7       零式艦戦63型(爆戦)               鈴谷航改二,熊野航改二
+219A   4       7       零式艦戦63型(爆戦)               鈴谷航改二,熊野航改二
+219A   5       7       零式艦戦63型(爆戦)               鈴谷航改二,熊野航改二
+219A   6       7       零式艦戦63型(爆戦)               熊野航改二
 151A   1       9       試製景雲(艦偵型) 噴式景雲改 翔鶴改二甲,瑞鶴改二甲
 151A   2       9       試製景雲(艦偵型) 噴式景雲改 瑞鶴改二甲
 151A   3       9       試製景雲(艦偵型) 噴式景雲改 瑞鶴改二甲

diff --git a/KCD/EnhancementListItem2.plist b/KCD/EnhancementListItem2.plist
index 4f0104d..98417d2 100644 (file)
Binary files a/KCD/EnhancementListItem2.plist and b/KCD/EnhancementListItem2.plist differ

diff --git a/KCD/HMEnhancementListItem.plist b/KCD/HMEnhancementListItem.plist
index b1ac832..0634515 100644 (file)
Binary files a/KCD/HMEnhancementListItem.plist and b/KCD/HMEnhancementListItem.plist differ

diff --git a/KCD/RequiredEquipmentSet.txt b/KCD/RequiredEquipmentSet.txt
index 400ffdb..ee5be6d 100644 (file)
--- a/KCD/RequiredEquipmentSet.txt
+++ b/KCD/RequiredEquipmentSet.txt
@@ -107,12 +107,17 @@
 // 8   41cm連装砲
 8A     0-5     41cm連装砲   1       2       3
 8A     6-9     41cm連装砲   2       3       6
-8A     max             0       0       0
+8A     max     新型資材x2　46cm三連装砲       2       10      15
 
 // 試製41cm三連装砲
 105A   0-5     41cm連装砲   2       4       6
 105A   6-9     41cm連装砲   3       5       8
-105A   max             0       0       0
+105A   max     新型資材x2　46cm三連装砲       2       12      16
+
+// 41cm三連装砲改
+236A   0-5     41cm連装砲   2       6       7
+236A   6-9     46cm三連装砲        2       7       10
+236A   max             0       0       0
 
 // 117 試製46cm連装砲
 117A   0-5     41cm連装砲   2       3       5

diff --git a/KCD/StrengthenListItemView.swift b/KCD/StrengthenListItemView.swift
index 50b6d40..aab215a 100644 (file)
--- a/KCD/StrengthenListItemView.swift
+++ b/KCD/StrengthenListItemView.swift
@@ -22,7 +22,7 @@ class StrengthenListItemView: NSBox {
             [(NSPoint, NSPoint)]()
                 .appended { (NSPoint(x: 29.5, y: 0), NSPoint(x: 29.5, y: height)) }
                 .appended { (NSPoint(x: 67.5, y: 0), NSPoint(x: 67.5, y: height)) }
-                .appended { (NSPoint(x: 206.5, y: 0), NSPoint(x: 206.5, y: height)) }
+                .appended { (NSPoint(x: 209.5, y: 0), NSPoint(x: 209.5, y: height)) }
                 .appended { (NSPoint(x: 0, y: 17.5), NSPoint(x: width, y: 17.5)) }
                 .appended { (NSPoint(x: 0, y: 34.5), NSPoint(x: width, y: 34.5)) }
             }