ユニットが範囲攻撃を持っていた時、

範囲攻撃以外が、ダイアログを表示しないのを改善

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index be3c7aa..8591e96 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -1589,6 +1589,8 @@
                 
                 if(UA->extent > 0){
                     cpuAtkExtendFlag = true;
+                }else{
+                    cpuAtkExtendFlag = false;
                 }
                 
                 while (unitBreak->C.A && UA != unitBreak->C.A) {
@@ -3579,6 +3581,8 @@
                 
                 if(UA->extent > 0){
                     cpuAtkExtendFlag = true;
+                }else{
+                    cpuAtkExtendFlag = false;
                 }
                 
                 mostDmg = 0;
@@ -3726,6 +3730,8 @@
                 
                 if(UA->extent > 0){
                     cpuAtkExtendFlag = true;
+                }else{
+                    cpuAtkExtendFlag = false;
                 }
                 
                 while (unitBreak->C.A && UA != unitBreak->C.A) {

diff --git a/Awars III/MapEditor.h b/Awars III/MapEditor.h
index eed5b92..778a9ea 100644 (file)
--- a/Awars III/MapEditor.h
+++ b/Awars III/MapEditor.h
@@ -939,6 +939,7 @@ NSTimer *timeMapEditor;
     
     IBOutlet NSWindow *EDhpFixWindow;
     
+    IBOutlet NSPopUpButton *EDhpFixPUB;
     IBOutlet NSButtonCell *EDhpFixBC1;
     IBOutlet NSButtonCell *EDhpFixBC2;
     IBOutlet NSButtonCell *EDhpFixBC3;

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index 030b35c..0c892f6 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -364,7 +364,7 @@
                 </menuItem>
             </items>
         </menu>
-        <window title="Awars III" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="371" userLabel="メインウィンドウ">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="371" userLabel="メインウィンドウ">
             <windowStyleMask key="styleMask" titled="YES"/>
             <rect key="contentRect" x="335" y="390" width="640" height="480"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
@@ -710,10 +710,6 @@
                 <outlet property="EDeventTimeTF1" destination="LCC-mq-PsF" id="xQj-nk-1nQ"/>
                 <outlet property="EDeventTimeTF2" destination="89j-NJ-SNG" id="3eZ-Wq-5AU"/>
                 <outlet property="EDeventTrigger" destination="rAO-0J-ajM" id="wf8-1O-86w"/>
-                <outlet property="EDhp1AC" destination="fEW-Dh-30u" id="yTW-ra-ZxX"/>
-                <outlet property="EDhp1TV" destination="Xwe-1P-CYg" id="Erx-4l-IiR"/>
-                <outlet property="EDhp2AC" destination="3IQ-ze-3zY" id="lwS-FX-wEM"/>
-                <outlet property="EDhp2TV" destination="ItL-HP-xDF" id="krQ-VI-rlH"/>
                 <outlet property="EDhpButton1" destination="E5V-YB-cKS" id="aTu-U0-qrp"/>
                 <outlet property="EDhpButton2" destination="IpT-zY-MX0" id="rCQ-45-Xmp"/>
                 <outlet property="EDhpButtonA" destination="rjz-AR-FVH" id="cuc-lK-45X"/>
@@ -727,8 +723,9 @@
                 <outlet property="EDhpFixListAC2" destination="qqa-eS-eeY" id="RE8-EM-wKa"/>
                 <outlet property="EDhpFixListAC3" destination="lrw-EV-jZ9" id="p0Y-dB-hyT"/>
                 <outlet property="EDhpFixListTV1" destination="Xwe-1P-CYg" id="VaR-Sy-Axh"/>
-                <outlet property="EDhpFixListTV2" destination="ItL-HP-xDF" id="2tn-WN-SmB"/>
+                <outlet property="EDhpFixListTV2" destination="ItL-HP-xDF" id="Krm-PR-3KF"/>
                 <outlet property="EDhpFixListTV3" destination="VcZ-Do-tDa" id="cCw-7A-vC7"/>
+                <outlet property="EDhpFixPUB" destination="NsW-go-z0a" id="4Ec-VW-Onj"/>
                 <outlet property="EDhpFixTF1" destination="Y5V-Km-m9A" id="IRV-d0-HZh"/>
                 <outlet property="EDhpFixTF2" destination="JQU-Mq-kI8" id="Cha-Je-eBb"/>
                 <outlet property="EDhpFixWindow" destination="Gbh-BZ-Ivd" id="6l0-ki-02T"/>
@@ -2443,7 +2440,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="32" headerView="1837" id="911">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="342"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="34"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -4911,7 +4908,7 @@
                 </subviews>
             </view>
         </window>
-        <window title="Awars III" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="3481" userLabel="ギャラリー">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="3481" userLabel="ギャラリー">
             <windowStyleMask key="styleMask" titled="YES"/>
             <rect key="contentRect" x="335" y="390" width="640" height="480"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
@@ -8230,7 +8227,7 @@
                 </subviews>
             </view>
         </window>
-        <window title="Awars III" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="9420" userLabel="シナリオエディタ">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="9420" userLabel="シナリオエディタ">
             <windowStyleMask key="styleMask" titled="YES"/>
             <rect key="contentRect" x="335" y="390" width="640" height="480"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
@@ -8810,7 +8807,7 @@
                 </subviews>
             </view>
         </window>
-        <window title="Awars III" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="10241" userLabel="シナリオウィンドウ">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="10241" userLabel="シナリオウィンドウ">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="640" height="480"/>
@@ -11808,7 +11805,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" headerView="14194" id="14196">
-                                    <rect key="frame" x="0.0" y="0.0" width="199" height="82"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="199" height="19"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <size key="intercellSpacing" width="3" height="2"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -17586,7 +17583,7 @@
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                             <connections>
-                                                <binding destination="qqa-eS-eeY" name="value" keyPath="arrangedObjects" id="alH-sa-hGT">
+                                                <binding destination="4OI-TZ-1oL" name="value" keyPath="arrangedObjects.name" id="4al-mS-9Wl">
                                                     <dictionary key="options">
                                                         <bool key="NSCreatesSortDescriptor" value="NO"/>
                                                     </dictionary>
@@ -17608,9 +17605,9 @@
                         </scroller>
                     </scrollView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="zNh-0G-Bwt">
-                        <rect key="frame" x="21" y="453" width="62" height="17"/>
+                        <rect key="frame" x="21" y="453" width="108" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="HPの増減" id="ggJ-Ml-H3s">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="ステータスの増減" id="ggJ-Ml-H3s">
                             <font key="font" size="13" name="AquaKana"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -17649,7 +17646,7 @@
                         </cells>
                     </matrix>
                     <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="fXr-VM-nY4">
-                        <rect key="frame" x="20" y="427" width="202" height="18"/>
+                        <rect key="frame" x="20" y="388" width="202" height="18"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         <size key="cellSize" width="61" height="18"/>
@@ -17809,6 +17806,46 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
+                    <popUpButton verticalHuggingPriority="750" id="NsW-go-z0a">
+                        <rect key="frame" x="21" y="421" width="109" height="26"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <popUpButtonCell key="cell" type="push" title="HP" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="lad-ok-lWQ" id="5fK-nt-OiY">
+                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="menu"/>
+                            <menu key="menu" id="lLt-3U-byl">
+                                <items>
+                                    <menuItem title="HP" state="on" id="lad-ok-lWQ"/>
+                                    <menuItem title="MP" id="bnf-5w-qIy"/>
+                                    <menuItem title="HPmax" id="iuN-Qd-C1K"/>
+                                    <menuItem title="MPmax" id="Ocf-R7-rp2"/>
+                                    <menuItem title="WT" id="69I-nL-8fI"/>
+                                    <menuItem title="STR" id="u5h-t6-PG4"/>
+                                    <menuItem title="VIT" id="tJB-my-jbc"/>
+                                    <menuItem title="AGI" id="Nun-EC-uow"/>
+                                    <menuItem title="DEX" id="fEy-Qr-PZa"/>
+                                    <menuItem title="MEN" id="pmb-1c-HDQ"/>
+                                    <menuItem title="INT" id="ozO-UY-Zrv"/>
+                                    <menuItem title="LUK" id="x91-d1-o9X"/>
+                                    <menuItem title="MOV" id="1BJ-Wa-s5N"/>
+                                    <menuItem title="格闘" id="ZkR-cd-7TL"/>
+                                    <menuItem title="射撃" id="iZ1-Uv-f17"/>
+                                    <menuItem title="命中" id="N7X-tf-uLJ"/>
+                                    <menuItem title="回避" id="dUM-Zi-4Kh"/>
+                                    <menuItem title="反応" id="DAi-mb-2Lq"/>
+                                    <menuItem title="技量" id="OQ6-Y5-IOc"/>
+                                    <menuItem title="名前" id="5hN-u0-d8Q"/>
+                                    <menuItem title="愛称" id="VZ9-bh-vnw"/>
+                                    <menuItem title="クラス名" id="LA0-PX-h8J"/>
+                                    <menuItem title="タイプ" id="8JT-vB-0oe"/>
+                                    <menuItem title="移動タイプ" id="MGl-4H-e4P"/>
+                                    <menuItem title="物資" id="Fat-dc-LVW"/>
+                                    <menuItem title="食料" id="UCy-YO-QUH"/>
+                                    <menuItem title="資金" id="NSu-0Q-Lkh"/>
+                                    <menuItem title="作成WT" id="Kdu-XG-qiO"/>
+                                </items>
+                            </menu>
+                        </popUpButtonCell>
+                    </popUpButton>
                 </subviews>
             </view>
         </window>
@@ -21991,7 +22028,7 @@
                 </subviews>
             </view>
         </window>
-        <window title="Awars III" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="AKE-Yl-5aP" userLabel="シナリオウィンド立ち絵">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="AKE-Yl-5aP" userLabel="シナリオウィンド立ち絵">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="390" width="640" height="480"/>