OSDN Git Service

行動、移動などを抑制した
authorKillery <Killery@kiritani-no-mac-mini.local>
Mon, 1 Aug 2016 19:16:13 +0000 (04:16 +0900)
committerKillery <Killery@kiritani-no-Mac-mini.local>
Mon, 1 Aug 2016 19:16:13 +0000 (04:16 +0900)
Awars III/Awars III-Info.plist
Awars III/EventScene.m
Awars III/FieldScene.h
Awars III/FieldScene.m
Awars III/FieldView.m
Awars III/MapEditor.m
Awars III/SeedView.m
Awars III/Title.m
Awars III/en.lproj/MainMenu.xib

index 4ff1494..ef733f2 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.683</string>
+       <string>0.685</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index ad62eeb..5c85f2b 100755 (executable)
         return;
     }
     
+    if(!ST)
+        return;
+    
     NSString *oopsString = @"";
     //任意文字列置換
     NSArray *oopsArray = [ST->string componentsSeparatedByString:@"$$"];
index a23267b..89b3e3d 100755 (executable)
@@ -1057,6 +1057,8 @@ bool openingAVPisDeactive;
 
 bool battleIsProcFlag;
 
+int STErow;
+
 @interface FieldScene : NSObject
 {
     NSTimer *time;
@@ -1064,6 +1066,9 @@ bool battleIsProcFlag;
     IBOutlet AVPlayerView *openingAVPV;
     
     
+    IBOutlet NSTextField *dmgFixTF;
+    IBOutlet NSTextField *recoveryTF;
+    
     IBOutlet NSTextField *btHITtf1;
     IBOutlet NSTextField *btHITtf2;
     IBOutlet NSTextField *btDMGtf1;
index a007a7a..97536ef 100755 (executable)
     [loadFileOutputListTV setAction:@selector(clickLFOL:)];
     
     [saveGameListTV setTarget:self];
-    [saveGameListTV setAction:@selector(clickSGL)];
-    
+    [saveGameListTV setAction:@selector(clickSGL:)];
     
+    [STequipListTV setTarget:self];
+    [STequipListTV setAction:@selector(clickSTE:)];
     
     CAttackListMA = [NSMutableArray new];
     CResearchListMA = [NSMutableArray new];
     loadFileOutputListMA = [NSMutableArray new];
     saveGameListMA = [NSMutableArray new];
     
+    STequipListMA = [NSMutableArray new];
+    STskillListMA = [NSMutableArray new];
+    STjoinListMA = [NSMutableArray new];
+    
     SAV = [NSMutableArray new];
     
     [IVimage setHidden:YES];
     datRow = (int)[saveGameListTV clickedRow];
 }
 
+-(void)clickSTE:(id)sender{
+    
+    STErow = (int)[STequipListTV clickedRow];
+}
+
 -(void)clickLFOL:(id)sender{
 
     LFOLrow = (int)[loadFileOutputListTV selectedRow];
             U->C.A = aTop;
             U = UTop;
             crCAL1 = crCAL;
+            [self setBattlePanel];
             return;
         }else{
             ATTACK *aTop = U->CL.A;
             U->CL.A = aTop;
             U = UTop;
             crCAL1 = crCAL;
+            [self setBattlePanel];
             return;
         }
     }
                 [atkPanel close];
                 U->C.A = aTop;
                 U = UTop;
+                [self setBattlePanel];
                 return;
             }
             U->C.A = aTop;
             crCAL1 = crCAL;
             U = UTop;
-            
+            [self setBattlePanel];
         }else{
             ATTACK *aTop = U->CL.A;
             crCAL1 = (int)[CAttackListTV clickedRow];
                 [atkPanel close];
                 U->CL.A = aTop;
                 U = UTop;
+                [self setBattlePanel];
                 return;
             }
             U->CL.A = aTop;
             crCAL1 = crCAL;
             U = UTop;
+            [self setBattlePanel];
         }
     
     }
                 [atkPanel close];
                 U->C.A = aTop;
                 U = UTop;
+                [self setBattlePanel];
                 return;
             }
             U->C.A = aTop;
                 [atkPanel close];
                 U->CL.A = aTop;
                 U = UTop;
+                [self setBattlePanel];
                 return;
             }
             U->CL.A = aTop;
             crCAL1 = crCAL;
             U = UTop;
-        
+            [self setBattlePanel];
         }
         
         U = UTop;
@@ -3741,10 +3758,12 @@ ahhh:{}
     
     if(buildNum[possionX][possionY] < 0){
         [selectMesh setImage:MC[chipNum[possionX][possionY]].img];
+        [selectMesh setImageScaling:NSScaleToFit];
         [selectMeshText setStringValue:MC[chipNum[possionX][possionY]].name];
         [selectMeshValue setStringValue:[NSString stringWithFormat:@"%d%", MC[chipNum[possionX][possionY]].dmgfix]];
     }else{
         [selectMesh setImage:BC[buildNum[possionX][possionY]].img];
+        [selectMesh setImageScaling:NSScaleToFit];
         [selectMeshText setStringValue:BC[buildNum[possionX][possionY]].name];
         [selectMeshValue setStringValue:[NSString stringWithFormat:@"%d%", BC[buildNum[possionX][possionY]].dmgfix]];
     }
@@ -3756,9 +3775,27 @@ ahhh:{}
         
         if(1){
 
-            
-            
-            
+            if(buildNum[possionX][possionY] < 0){
+                [dmgFixTF setStringValue:[NSString stringWithFormat:@"地形効果 %d%",MC[chipNum[possionX][possionY]].dmgfix]];
+                
+                
+                [recoveryTF setStringValue:@""];
+                
+            }else{
+                [dmgFixTF setStringValue:[NSString stringWithFormat:@"地形効果 %d%",BC[buildNum[possionX][possionY]].dmgfix]];
+                
+                NSString *string = [@"" retain];
+                
+                if(BC[buildNum[possionX][possionY]].recHP > 0 || BC[buildNum[possionX][possionY]].recMP > 0)
+                    string = [string stringByAppendingString:@"回復 "];
+                if(BC[buildNum[possionX][possionY]].recHP > 0)
+                    string = [string stringByAppendingFormat:@"HP%d%", BC[buildNum[possionX][possionY]].recHP];
+                if(BC[buildNum[possionX][possionY]].recMP > 0)
+                    string = [string stringByAppendingFormat:@"MP%d%", BC[buildNum[possionX][possionY]].recMP];
+                
+                [recoveryTF setStringValue:string];
+            }
+           
             if(Uselected){
             if(Uselected->chipNumberL < 0){
             if(!Uselected->dead){
@@ -3773,7 +3810,7 @@ ahhh:{}
                     [tfArmy setStringValue:[NSString stringWithFormat:@"%@", P[2].name]];
                 }
                 
-                [tfName setStringValue:[NSString stringWithFormat:@"%@", Uselected->C.name]];
+                [tfName setStringValue:[NSString stringWithFormat:@"%@", Uselected->C.nameNick]];
                 [HPbarTF setStringValue:[NSString stringWithFormat:@"HP %g/%g", Uselected->C.S_C.HP, Uselected->C.S_M.HP]];
                 [HPbarLI setIntValue:[[NSString stringWithFormat:@"%g", Uselected->C.S_C.HP/Uselected->C.S_M.HP*100 + 0.5] intValue]];
                 [MPbarTF setStringValue:[NSString stringWithFormat:@"MP %g/%g", Uselected->C.S_C.MP, Uselected->C.S_M.MP]];
@@ -6123,6 +6160,7 @@ ahhh:{}
     U = UTop;
 
     [STIV setImage:Uselected->C.imgb];
+    [STIV setImageScaling:NSScaleToFit];
     [STnameTF setStringValue:Uselected->C.name];
     [STclassTF setStringValue:Uselected->C.nameClass];
     [SThpTF setStringValue:[NSString stringWithFormat:@"HP %g/%g", Uselected->C.S_C.HP, Uselected->C.S_M.HP]];
@@ -6148,7 +6186,52 @@ ahhh:{}
 
 
 
-
+    [self willChangeValueForKey:@"STequipListMA"];
+    [STequipListMA removeAllObjects];
+    [self didChangeValueForKey:@"STequipListMA"];
+    
+    if(Uselected->C.eHandRflag) {
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"%@", Uselected->C.eHandR.name] forKey:@"name"];
+        [self willChangeValueForKey:@"STequipListMA"];
+        [STequipListMA addObject:dict];
+        [self didChangeValueForKey:@"STequipListMA"];
+    }
+    if(Uselected->C.eHandLflag) {
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"%@", Uselected->C.eHandL.name] forKey:@"name"];
+        [self willChangeValueForKey:@"STequipListMA"];
+        [STequipListMA addObject:dict];
+        [self didChangeValueForKey:@"STequipListMA"];
+    }
+    if(Uselected->C.eHeadflag) {
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"%@", Uselected->C.eHead.name] forKey:@"name"];
+        [self willChangeValueForKey:@"STequipListMA"];
+        [STequipListMA addObject:dict];
+        [self didChangeValueForKey:@"STequipListMA"];
+    }
+    if(Uselected->C.eBodyflag) {
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"%@", Uselected->C.eBody.name] forKey:@"name"];
+        [self willChangeValueForKey:@"STequipListMA"];
+        [STequipListMA addObject:dict];
+        [self didChangeValueForKey:@"STequipListMA"];
+    }
+    if(Uselected->C.eFootflag) {
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"%@", Uselected->C.eFoot.name] forKey:@"name"];
+        [self willChangeValueForKey:@"STequipListMA"];
+        [STequipListMA addObject:dict];
+        [self didChangeValueForKey:@"STequipListMA"];
+    }
+    if(Uselected->C.eArmflag) {
+        NSMutableDictionary* dict = [NSMutableDictionary new];
+        [dict setValue:[NSString stringWithFormat:@"%@", Uselected->C.eArm.name] forKey:@"name"];
+        [self willChangeValueForKey:@"STequipListMA"];
+        [STequipListMA addObject:dict];
+        [self didChangeValueForKey:@"STequipListMA"];
+    }
 
 
 
@@ -7110,6 +7193,9 @@ ahhh:{}
     //おまんちん
     U = UTop;
     
+    if(DUN[1] <= 0 || AUN[1] <= 0)
+        return;
+    
     while (!(DUN[1] == U->number)) {
         U = U->next;
     }
@@ -9222,7 +9308,7 @@ ahhh:{}
             healFlag = false;
             
             int wtf = 100;
-            if(battleDod2Flag) wtf = 50;
+            if(battleDod2Flag) hit /= 2;
             if(hit - rand()%wtf > 0 && !battleDef1Flag && !battleDod1Flag){
                 
                 if(U2A->D->sort == 0){
@@ -9819,7 +9905,7 @@ ahhh:{}
             }
             
             int omg = 100;
-            if(battleDod1Flag) omg = 50;
+            if(battleDod1Flag) hit /= 2;
             
             if(hit - rand()%omg > 0 && !battleDef2Flag && !battleDod2Flag){
                 if(U2A->D->type == 0) NSLog(@"計算式:((%g+%g)*%g-%g)*%g*%g", U2->C.S_C.ATK,U2A->totalD,oopsIsRight,U->C.S_C.DEF, val, val2);
@@ -10039,6 +10125,10 @@ ahhh:{}
             btHitExtendFlag2 = false;
             btHitExtendProc2 = 0;
             btHitExtendMove2 = 0;
+            battleDef1Flag = false;
+            battleDef2Flag = false;
+            battleDod1Flag = false;
+            battleDod2Flag = false;
             baseDistanceCompFlag = false;
             battleVeryBegunFlag = false;
             CPUAttackSubmitFlag = false;
@@ -10047,6 +10137,7 @@ ahhh:{}
             battleEndFlag = true;
             assholeLoadBugFix = false;
             
+            cpuOMFGmoveATKfixFlag = true;
             battleIsProcFlag = false;
             break;
             
@@ -12199,11 +12290,13 @@ SKIP1:
     battleDef1Flag = true;
     battleSet1Flag = false;
     battleDod1Flag = false;
+    [self setBattlePanel];
 }
 -(IBAction)battleDod1:(id)sender{
     battleDod1Flag = true;
     battleDef1Flag = false;
     battleSet1Flag = false;
+    [self setBattlePanel];
 }
 -(IBAction)battleSet2:(id)sender{
     battleSetFlag = true;
@@ -12235,11 +12328,13 @@ SKIP1:
     battleDef2Flag = true;
     battleSet2Flag = false;
     battleDod2Flag = false;
+    [self setBattlePanel];
 }
 -(IBAction)battleDod2:(id)sender{
     battleDod2Flag = true;
     battleDef2Flag = false;
     battleSet2Flag = false;
+    [self setBattlePanel];
 }
 
 -(IBAction)battleCancel:(id)sender{
@@ -12249,6 +12344,11 @@ SKIP1:
     battleSet2PushedFlag = false;
     attackingWait = false;
     
+    battleDef1Flag = false;
+    battleDef2Flag = false;
+    battleDod1Flag = false;
+    battleDod2Flag = false;
+    
     [battlePanel close];
 }
 
@@ -12271,20 +12371,52 @@ SKIP1:
         menuPoint.y -= 20;
     }else cIncludeSummonFlag = false;
     int plusBtnValue = 0;
+    int plusBtnValue2 = 0;
+    int plusBtnValue3 = 0;
     
     if(cIncludeCreateFlag && cIncludeSummonFlag && MF[MFselectedRow+1].MS.buildAllowedFlag && MF[MFselectedRow+1].MS.summonAllowedFlag){
         
         plusBtnValue = 200;
-        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
+        plusBtnValue2 = plusBtnValue;
+        //[commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
         
+        plusBtnValue -= 10;
         
-        plusBtnValue -= moveBtn.frame.size.height + 12;
+        if(!wtMovedFlag){
+        plusBtnValue -= moveBtn.frame.size.height + 2;
         [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
         [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+           
+        }else{
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            plusBtnValue2 -= moveBtn.frame.size.height + 2;
+            plusBtnValue3 -= moveBtn.frame.size.height + 2;
+            [moveBtn setTransparent: YES];
+            [moveBtn setEnabled:NO];
+        }
         
+        if(!wtAttackedFlag){
         plusBtnValue -= attackBtn.frame.size.height + 2;
         [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
         [[commandPanel contentView] addSubview:attackBtn];
+            [attackBtn setTransparent: NO];
+            [attackBtn setEnabled: YES];
+        }else{
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            plusBtnValue2 -= attackBtn.frame.size.height + 2;
+            plusBtnValue3 -= attackBtn.frame.size.height + 2;
+            [attackBtn setTransparent: YES];
+            [attackBtn setEnabled:NO];
+        }
+        
+        if(!wtMovedFlag && wtAttackedFlag){
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }
         
         plusBtnValue -= stanbyBtn.frame.size.height + 2;
         [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
@@ -12310,18 +12442,49 @@ SKIP1:
         [cancelBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
         [[commandPanel contentView] addSubview:cancelBtn];
         
+        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y - plusBtnValue3, 150, plusBtnValue2) display:YES];
     }
     else if(cIncludeCreateFlag && !cIncludeSummonFlag && MF[MFselectedRow+1].MS.buildAllowedFlag){
         plusBtnValue = 180;
-        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
+        plusBtnValue2 = plusBtnValue;
+        //[commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
         
-        plusBtnValue -= moveBtn.frame.size.height + 12;
-        [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
-        [[commandPanel contentView] addSubview:moveBtn];
+        plusBtnValue -= 10;
         
-        plusBtnValue -= attackBtn.frame.size.height + 2;
-        [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
-        [[commandPanel contentView] addSubview:attackBtn];
+        if(!wtMovedFlag){
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }else{
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            plusBtnValue2 -= moveBtn.frame.size.height + 2;
+            plusBtnValue3 -= moveBtn.frame.size.height + 2;
+            [moveBtn setTransparent: YES];
+            [moveBtn setEnabled:NO];
+        }
+        
+        if(!wtAttackedFlag){
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:attackBtn];
+            [attackBtn setTransparent: NO];
+            [attackBtn setEnabled: YES];
+        }else{
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            plusBtnValue2 -= attackBtn.frame.size.height + 2;
+            plusBtnValue3 -= attackBtn.frame.size.height + 2;
+            [attackBtn setTransparent: YES];
+            [attackBtn setEnabled:NO];
+        }
+        
+        if(!wtMovedFlag && wtAttackedFlag){
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }
         
         plusBtnValue -= stanbyBtn.frame.size.height + 2;
         [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
@@ -12344,22 +12507,52 @@ SKIP1:
         [cancelBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
         [[commandPanel contentView] addSubview:cancelBtn];
         
-        
+        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y - plusBtnValue3, 150, plusBtnValue2) display:YES];
     }else if(cIncludeSummonFlag && !cIncludeCreateFlag && MF[MFselectedRow+1].MS.summonAllowedFlag){
         
-        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, 210) display:YES];
+        //[commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, 210) display:YES];
         
         plusBtnValue = 180;
-        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
+        plusBtnValue2 = plusBtnValue;
+        //[commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
         
+        plusBtnValue -= 10;
         
-        plusBtnValue -= moveBtn.frame.size.height + 12;
-        [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
-        [[commandPanel contentView] addSubview:moveBtn];
+        if(!wtMovedFlag){
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }else{
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            plusBtnValue2 -= moveBtn.frame.size.height + 2;
+            plusBtnValue3 -= moveBtn.frame.size.height + 2;
+            [moveBtn setTransparent: YES];
+            [moveBtn setEnabled:NO];
+    
+        }
         
-        plusBtnValue -= attackBtn.frame.size.height + 2;
-        [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
-        [[commandPanel contentView] addSubview:attackBtn];
+        if(!wtAttackedFlag){
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:attackBtn];
+            [attackBtn setTransparent: NO];
+            [attackBtn setEnabled: YES];
+        }else{
+            plusBtnValue2 -= attackBtn.frame.size.height + 2;
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            plusBtnValue3 -= attackBtn.frame.size.height + 2;
+            [attackBtn setTransparent: YES];
+            [attackBtn setEnabled:NO];
+        }
+        
+        if(!wtMovedFlag && wtAttackedFlag){
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }
         
         plusBtnValue -= stanbyBtn.frame.size.height + 2;
         [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
@@ -12381,18 +12574,50 @@ SKIP1:
         plusBtnValue -= cancelBtn.frame.size.height + 2;
         [cancelBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
         [[commandPanel contentView] addSubview:cancelBtn];
+        
+        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y - plusBtnValue3, 150, plusBtnValue2) display:YES];
     }else{
         
         plusBtnValue = 160;
-        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
+        plusBtnValue2 = plusBtnValue;
+        //[commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y, 150, plusBtnValue) display:YES];
         
-        plusBtnValue -= moveBtn.frame.size.height + 12;
-        [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
-        [[commandPanel contentView] addSubview:moveBtn];
+        plusBtnValue -= 10;
         
-        plusBtnValue -= attackBtn.frame.size.height + 2;
-        [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
-        [[commandPanel contentView] addSubview:attackBtn];
+        if(!wtMovedFlag){
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }else{
+            plusBtnValue -= moveBtn.frame.size.height + 2;
+            plusBtnValue2 -= moveBtn.frame.size.height + 2;
+            plusBtnValue3 -= moveBtn.frame.size.height + 2;
+            [moveBtn setTransparent: YES];
+            [moveBtn setEnabled:NO];
+        }
+        
+        if(!wtAttackedFlag){
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            [attackBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:attackBtn];
+            [attackBtn setTransparent: NO];
+            [attackBtn setEnabled: YES];
+        }else{
+            plusBtnValue -= attackBtn.frame.size.height + 2;
+            plusBtnValue2 -= attackBtn.frame.size.height + 2;
+            plusBtnValue3 -= attackBtn.frame.size.height + 2;
+            [attackBtn setTransparent: YES];
+            [attackBtn setEnabled:NO];
+        }
+        
+        if(!wtMovedFlag && wtAttackedFlag){
+            [moveBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
+            [[commandPanel contentView] addSubview:moveBtn];
+            [moveBtn setTransparent: NO];
+            [moveBtn setEnabled: YES];
+        }
         
         plusBtnValue -= stanbyBtn.frame.size.height + 2;
         [stanbyBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
@@ -12411,6 +12636,8 @@ SKIP1:
         plusBtnValue -= cancelBtn.frame.size.height + 2;
         [cancelBtn setFrame:NSMakeRect(25, plusBtnValue, 100, 23)];
         [[commandPanel contentView] addSubview:cancelBtn];
+     
+        [commandPanel setFrame:NSMakeRect(menuPoint.x, menuPoint.y - plusBtnValue3, 150, plusBtnValue2) display:YES];
     }
     
 
index f853e64..ba07230 100755 (executable)
             wtRdy2 = false;
             wtRdy3 = false;
             stanbyFlag = true;
+            cpuOMFGmoveATKfixFlag = true;
         }
         
         if(unitBreak->dead && unitBreak->C.S_C.WT != 999999){
             wtRdy2 = false;
             wtRdy3 = false;
             stanbyFlag = true;
+            cpuOMFGmoveATKfixFlag = true;
         }
         
     }
     
     menuDisplayFlag = false;
     
+    cpuOMFGmoveATKfixFlag = true;
+    
     U = UTop;
     
     if(attackExtentFlag2 && g_attackRangeExtent[possionX][possionY] > 0){
             return;
         }
         
+        if(!wtMovedFlag){
         if(U->chipNumber >= 0) [self LookupMovableRange:possionY startY:possionX aPiece:&UC[unitNum[possionX][possionY]] turnSide:YES];
         if(U->chipNumberL >= 0) [self LookupMovableRange2:possionY startY:possionX aPiece:&LC[loadNum[possionX][possionY]] turnSide:YES];
-        
+        }
         U = UTop;
         
         //return;
index 22f8675..73d6330 100755 (executable)
 
 -(void)EventLoop0:(NSTimer*)time{
     
+    //ベータ版(初回)では不完全なモビールユニット廃止
+    if(SLSx >= 3)
+        SLSx = 2;
+    
     static int doubleClickWaitCnt = 0;
     if (doubleClickedFlag) {
         doubleClickWaitCnt++;
     if(MSDTOPP) NSLog(@"%d", MSDTOPP->index);
      */
     if(SLSx == 0){
-        [topIV setImage:MC[SLindexU].img];
+        [topIV setImage:MC[SLindex].img];
         [topIV setImageScaling:NSScaleToFit];
     
         
-        [topName setStringValue:[NSString stringWithFormat:@"%@", MC[SLindexU].name]];
+        [topName setStringValue:[NSString stringWithFormat:@"%@", MC[SLindex].name]];
         
-        [topHealth setStringValue:[NSString stringWithFormat:@"地形修正 %d%", MC[SLindexU].dmgfix]];
+        [topHealth setStringValue:[NSString stringWithFormat:@"地形修正 %d%", MC[SLindex].dmgfix]];
     }else if(SLSx == 1){
-        [topIV setImage:BC[SLindexU].img];
+        [topIV setImage:BC[SLindexB].img];
         [topIV setImageScaling:NSScaleToFit];
         
-        [topName setStringValue:[NSString stringWithFormat:@"%@", BC[SLindexU].name]];
+        [topName setStringValue:[NSString stringWithFormat:@"%@", BC[SLindexB].name]];
         
-        [topHealth setStringValue:[NSString stringWithFormat:@"地形修正 %d%", BC[SLindexU].dmgfix]];
+        [topHealth setStringValue:[NSString stringWithFormat:@"地形修正 %d%", BC[SLindexB].dmgfix]];
     }else if(SLSx == 2){
         [topIV setImage:UC[SLindexU].imgb];
         [topIV setImageScaling:NSScaleToFit];
     
         }
         
+        /*
         if(SLSx == 3){
             
             loadChipSideFlag = true;
             
             [PLCL makeKeyAndOrderFront:nil];
             
-        }
+        }*/
         
     }
 
index 34d10ed..366f709 100755 (executable)
@@ -90,7 +90,7 @@
     [self DrawImage:chip2 x:0 y:0 cx:0 cy:0];
     [self DrawImage:chip3 x:1*32 y:0 cx:1 cy:0];
     [self DrawImage:chip4 x:2*32 y:0 cx:2 cy:0];
-    [self DrawImage:chip6 x:3*32 y:0 cx:2 cy:0];
+    //[self DrawImage:chip6 x:3*32 y:0 cx:2 cy:0];
     [self DrawImage:chip5 x:SLSx*32 y:0 cx:2 cy:0];
 }
 
index ca8089d..24642a1 100755 (executable)
 -(IBAction)Start:(id)sender{
     startClickedFlag = true;
     [scenarioList initScenarioList];
+    
+    NSPoint SLPpoint;
+    
+    SLPpoint.x = [TitleWindow frame].origin.x + 100;
+    SLPpoint.y = [TitleWindow frame].origin.y + 100;
+    [StartWindow setFrameOrigin:SLPpoint];
+    
     [StartWindow makeKeyAndOrderFront:nil];
 }
 
index 48850ad..9dd9092 100755 (executable)
                     <textField verticalHuggingPriority="750" id="558">
                         <rect key="frame" x="18" y="443" width="553" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.683" id="559">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Version alpha 0.685" id="559">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                 <outlet property="createBtn" destination="10705" id="a2T-pd-7cG"/>
                 <outlet property="createPanel" destination="13903" id="Ojz-bR-GmG"/>
                 <outlet property="crytical" destination="11147" id="11174"/>
+                <outlet property="dmgFixTF" destination="10461" id="0hl-Ds-5l5"/>
                 <outlet property="endGamePanel" destination="13719" id="13737"/>
                 <outlet property="endGameText" destination="13721" id="13738"/>
                 <outlet property="esWindow" destination="10241" id="13716"/>
                 <outlet property="nplayer1" destination="10756" id="11224"/>
                 <outlet property="nplayer2" destination="10807" id="11225"/>
                 <outlet property="openingAVPV" destination="1km-GI-bUn" id="aEL-yr-gNd"/>
+                <outlet property="recoveryTF" destination="10482" id="xgj-Tx-TGd"/>
                 <outlet property="region" destination="11086" id="11173"/>
                 <outlet property="researchACU" destination="12712" id="12761"/>
                 <outlet property="researchATK" destination="12709" id="12754"/>
                     <textField verticalHuggingPriority="750" id="736">
                         <rect key="frame" x="255" y="85" width="208" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="ToLoveるダークネスBlack" id="741">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="741">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField verticalHuggingPriority="750" id="10352">
-                        <rect key="frame" x="480" y="223" width="134" height="17"/>
+                        <rect key="frame" x="485" y="223" width="125" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="キャラクター名" id="10400">
                             <font key="font" size="13" name="AquaKana"/>
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="photo" id="10431"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" id="10441">
-                        <rect key="frame" x="540" y="387" width="70" height="32"/>
+                        <rect key="frame" x="540" y="387" width="102" height="32"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="草原" id="10442">
                             <font key="font" size="13" name="AquaKana"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" id="10461">
-                        <rect key="frame" x="495" y="362" width="64" height="17"/>
+                        <rect key="frame" x="495" y="362" width="147" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="地形効果" id="10463">
                             <font key="font" size="13" name="AquaKana"/>
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" id="10482">
-                        <rect key="frame" x="495" y="344" width="104" height="17"/>
+                        <rect key="frame" x="495" y="344" width="147" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="HP回復" id="10484">
                             <font key="font" size="13" name="AquaKana"/>
                         </textFieldCell>
                     </textField>
                     <customView id="C6A-AL-lae" customClass="FieldSideView">
-                        <rect key="frame" x="481" y="-1" width="159" height="481"/>
+                        <rect key="frame" x="481" y="0.0" width="159" height="481"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </customView>
                 </subviews>
             </view>
+            <point key="canvasLocation" x="331" y="298"/>
         </window>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="10516" userLabel="登録数マップチップ" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" utility="YES"/>
                             <action selector="battleDod1:" target="10496" id="12292"/>
                         </connections>
                     </button>
-                    <textField verticalHuggingPriority="750" id="12131">
+                    <textField hidden="YES" verticalHuggingPriority="750" id="12131">
                         <rect key="frame" x="58" y="47" width="125" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="12135">
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" id="12132">
+                    <textField hidden="YES" verticalHuggingPriority="750" id="12132">
                         <rect key="frame" x="-3" y="50" width="56" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="コマンド" id="12133">
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" id="12163">
+                    <textField hidden="YES" verticalHuggingPriority="750" id="12163">
                         <rect key="frame" x="366" y="47" width="125" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="12166">
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" id="12164">
+                    <textField hidden="YES" verticalHuggingPriority="750" id="12164">
                         <rect key="frame" x="305" y="50" width="56" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="コマンド" id="12165">
                             <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"/>
                 </subviews>
             </view>
         </window>
-        <arrayController id="Mad-BG-dmK" userLabel="STjoinListAC"/>
-        <arrayController id="9A4-Cg-LcC" userLabel="STequipListAC"/>
-        <arrayController id="73J-iY-S3k" userLabel="STskillListAC"/>
+        <arrayController id="Mad-BG-dmK" userLabel="STjoinListAC">
+            <connections>
+                <binding destination="10496" name="contentArray" keyPath="STjoinListMA" id="1eu-wl-cAK"/>
+            </connections>
+        </arrayController>
+        <arrayController id="9A4-Cg-LcC" userLabel="STequipListAC">
+            <connections>
+                <binding destination="10496" name="contentArray" keyPath="STequipListMA" id="duJ-NI-Xc1"/>
+            </connections>
+        </arrayController>
+        <arrayController id="73J-iY-S3k" userLabel="STskillListAC">
+            <connections>
+                <binding destination="10496" name="contentArray" keyPath="STskillListMA" id="oX7-3L-tG1"/>
+            </connections>
+        </arrayController>
         <menuItem title="敵の手数時間" id="Suo-px-r0H"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="Cnw-Ln-Ynn" userLabel="タイマーの決定">
             <windowStyleMask key="styleMask" titled="YES"/>
                     <imageView id="nKC-L3-rYm">
                         <rect key="frame" x="17" y="357" width="106" height="106"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="grayBezel" id="cIX-2J-8VA"/>
+                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="photo" id="cIX-2J-8VA"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" id="zZn-ap-80z">
                         <rect key="frame" x="236" y="267" width="94" height="17"/>
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="145" minWidth="40" maxWidth="1000" id="IEo-8K-51a">
+                                        <tableColumn editable="NO" width="145" minWidth="40" maxWidth="1000" id="IEo-8K-51a">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="9A4-Cg-LcC" name="value" keyPath="arrangedObjects.name" id="jNv-Rq-Hp0">
+                                                    <dictionary key="options">
+                                                        <bool key="NSCreatesSortDescriptor" value="NO"/>
+                                                    </dictionary>
+                                                </binding>
+                                            </connections>
                                         </tableColumn>
                                     </tableColumns>
                                 </tableView>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="mQh-8y-zOh">
+                    <scrollView hidden="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="mQh-8y-zOh">
                         <rect key="frame" x="195" y="11" width="150" height="173"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" id="dAW-2H-piF">
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="145" minWidth="40" maxWidth="1000" id="3kn-zY-jby">
+                                        <tableColumn editable="NO" width="145" minWidth="40" maxWidth="1000" id="3kn-zY-jby">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="73J-iY-S3k" name="value" keyPath="arrangedObjects.name" id="7aQ-pd-5r2">
+                                                    <dictionary key="options">
+                                                        <bool key="NSCreatesSortDescriptor" value="NO"/>
+                                                    </dictionary>
+                                                </binding>
+                                            </connections>
                                         </tableColumn>
                                     </tableColumns>
                                 </tableView>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="ukW-0g-kRt">
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="ukW-0g-kRt">
                         <rect key="frame" x="193" y="192" width="82" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="スキルリスト" id="Mkj-m0-Wdi">
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="fCh-Vx-Qyt">
+                    <scrollView hidden="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="fCh-Vx-Qyt">
                         <rect key="frame" x="336" y="262" width="150" height="78"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" id="BTt-xV-uMe">
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="145" minWidth="40" maxWidth="1000" id="CBn-hR-A24">
+                                        <tableColumn editable="NO" width="145" minWidth="40" maxWidth="1000" id="CBn-hR-A24">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                             <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="Mad-BG-dmK" name="value" keyPath="arrangedObjects.name" id="NTV-hQ-N1O">
+                                                    <dictionary key="options">
+                                                        <bool key="NSCreatesSortDescriptor" value="NO"/>
+                                                    </dictionary>
+                                                </binding>
+                                            </connections>
                                         </tableColumn>
                                     </tableColumns>
                                 </tableView>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Vpt-hA-5bE">
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Vpt-hA-5bE">
                         <rect key="frame" x="334" y="348" width="69" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="合流リスト" id="Tqw-74-dCs">
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="hHC-9y-Gyd">
+                    <scrollView hidden="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="hHC-9y-Gyd">
                         <rect key="frame" x="336" y="369" width="150" height="78"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <clipView key="contentView" id="FIW-Fm-eGJ">
                                     <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                     <tableColumns>
-                                        <tableColumn width="145" minWidth="40" maxWidth="1000" id="QzK-uS-Wud">
+                                        <tableColumn editable="NO" width="145" minWidth="40" maxWidth="1000" id="QzK-uS-Wud">
                                             <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Zpv-ri-g7m">
+                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Zpv-ri-g7m">
                         <rect key="frame" x="334" y="455" width="95" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="ステータス異常" id="9Fy-W0-GN4">