unitBreakのズレを修正

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index 7fc3501..8bb0dcb 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -924,6 +924,8 @@ double waitinTime;
 NSSound *BGMsub;
 NSSound *SEsub;
 
+bool attackingWait;
+
 bool eventEndFlag;
 int displayBattleCheckPanelFlag;
 

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index 58af80d..a0b306e 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -3385,8 +3385,7 @@
             goto ahhh;
         }
         if(!battleSetUpIgnore){
-
-            battleFlag = false;
+            
             battleRdy = false;
             battleSet1Flag = false;
             battleSet2Flag = false;
@@ -3402,7 +3401,7 @@
         }
         if(!battleSetUpIgnore){
 
-            battleFlag = false;
+            
             battleRdy = false;
             battleSet1Flag = false;
             battleSet2Flag = false;
@@ -3908,7 +3907,7 @@ ahhh:{}
    
     
     if(cpuAImodeflag){
-        if(!cpuTurnEndFlag && wtRdy && unitBreak->C.S_C.WT == 0){
+        if(!cpuTurnEndFlag && unitBreak->C.S_C.WT == 0){
             [fieldView modeCPUturn];
             CPUturn = true;
             //NSLog(@"%d", U->x);
@@ -3930,11 +3929,95 @@ ahhh:{}
         [self DisplayMessage];
     }
     
+    while(1){
+        if(battleFlag && !battleSetUp){
+            
+            if(!battleRdy)
+                if(((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
+                    unitBreak->team == 1 ||
+                    (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
+                    (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2))
+                   ){
+                    
+                    //おまんこかわいい
+                    
+                    vaginaCnt++;
+                    if(vaginaCnt > 50){
+                        [self battleStartCPU];//攻撃目標ウェイト
+                        attackingWait = true;
+                        vaginaCnt = 0;
+                    }
+                }
+            
+            if(!battleSettingFlag && attackingWait){
+                windowPoint.x = [mapWindow frame].origin.x;
+                windowPoint.y = [mapWindow frame].origin.y;
+                [battlePanel setFrameOrigin:windowPoint];
+                [battlePanel makeKeyAndOrderFront:nil];
+                [self setBattlePanel];
+            }
+            attackingWait = false;
+        }
+        
+        break;
+    }
+
+    
+    if(Utarget){
+        
+        if(battleFlag && !battleSetUp &&
+           ((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
+            (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
+            (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2))
+           ){
+            if(!(AVpreview.rate > 0) && !animationFlag1 && !animationFlag2 && btAtattckMoveEnd)
+                oopsCnt--;
+            if(oopsCnt > 0)
+                return;
+            else{
+                oopsCnt = 25;//cpu攻撃設定
+            }
+            
+            //battleFlag = false;
+            battleRdy = false;
+            battleSet1Flag = false;
+            battleSet2Flag = false;
+            battleSettingFlag = false;
+            
+        }
+    }
+    
+    
+    if(Utarget){
+        if(battleRdy &&
+           ((Utarget && MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
+            (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
+            (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2)
+            )
+           ){
+            
+            if(!Uselected)
+                oopsCnt = 30;
+            
+            if(!(AVpreview.rate > 0) && !animationFlag1 && !animationFlag2)
+                oopsCnt--;
+            if(oopsCnt > 0)
+                return;
+            else{
+                oopsCnt = 30;//cpu攻撃ナビ
+            }
+            
+            bLoopFlag = false;
+        }
+    }
+    
+    U = UTop;
+    
     if(wtRdy3)
         return;
     U = UTop;
     U = unitBreak;
-    if(battleBegin && !wtRdy2)
+    if(battleBegin && !wtRdy2 && !battleFlag)
         while (!wtRdy) {
             wtPx = 0;
             wtPy = 0;
@@ -4068,48 +4151,7 @@ ahhh:{}
     
     
     
-    while(1){
-    if(battleFlag){
-        /*
-        static int openWait = 0;
-        
-        if(openWait < 100){
-            openWait++;
-            break;
-        }else{
-            openWait = 0;
-        }*/
-        
-        
-        if(!battleSettingFlag){
-            windowPoint.x = [mapWindow frame].origin.x;
-            windowPoint.y = [mapWindow frame].origin.y;
-            [battlePanel setFrameOrigin:windowPoint];
-            [battlePanel makeKeyAndOrderFront:nil];
-        }
-        [self setBattlePanel];
-        
-        if(!battleRdy)
-        if(((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
-           unitBreak->team == 1 ||
-           (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
-           (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2))
-           ){
-            
-            //おまんこかわいい
-            
-            vaginaCnt++;
-            if(vaginaCnt > 50){
-                [self battleStartCPU];
-                vaginaCnt = 0;
-            }
-        }
-        
-        
-    }
-        break;
-    }
-  
+    
     
     
     
@@ -4462,56 +4504,8 @@ ahhh:{}
     U = UTop;
     
     
-    if(Utarget){
-    
-    if(battleFlag &&
-       ((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
-        (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
-        (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2))
-       ){
-        if(!(AVpreview.rate > 0) && !animationFlag1 && !animationFlag2 && btAtattckMoveEnd)
-            oopsCnt--;
-        if(oopsCnt > 0)
-            return;
-        else{
-            oopsCnt = 25;//cpu攻撃ナビ
-        }
-        
-        //battleFlag = false;
-        battleRdy = false;
-        battleSet1Flag = false;
-        battleSet2Flag = false;
-        battleSettingFlag = false;
-
-    }
-    }
     
     
-    if(Utarget){
-    if(battleRdy &&
-       ((Utarget && MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
-        (unitBreak->team == 2 && Utarget->team == 1) || (unitBreak->team == 1 && Utarget->team == 2) ||
-        (unitBreak->team == 1 && Utarget->team == 1) || (unitBreak->team == 2 && Utarget->team == 2)
-        )
-       ){
-        
-        if(!Uselected)
-            oopsCnt = 30;
-        
-        if(!(AVpreview.rate > 0) && !animationFlag1 && !animationFlag2)
-            oopsCnt--;
-        if(oopsCnt > 0)
-            return;
-        else{
-            oopsCnt = 30;//cpu攻撃準備
-        }
-        
-       bLoopFlag = false;
-    }
-    }
-    
-    U = UTop;
-    
 
 }
 
@@ -4525,7 +4519,7 @@ ahhh:{}
     }
     
     
-    if(battleFlag){
+    if(battleSetUp){
         return;
     }
     
@@ -8551,6 +8545,8 @@ ahhh:{}
 
 -(void)DisplayMessage{
     
+    battleFlag = true;
+    
     if(!battleSetUp) return;
     if(!fuckingLoadBugFix) return;
     
@@ -9718,6 +9714,7 @@ ahhh:{}
             btAtattckMoveEnd = false;
             break;
         case 3:
+            //おまんこ
             if(bLoopFlag) break;
             if(cpuAImodeflag && !cpuTurnEndFlag) {
                 wtRdy = false;
@@ -11871,7 +11868,6 @@ SKIP1:
 }
 
 -(IBAction)battleStart:(id)sender{
-    battleFlag = false;
     battleSetUp = true;
     battleSet1Flag = false;
     battleSet2Flag = false;
@@ -11885,7 +11881,6 @@ SKIP1:
 
 
 -(void)battleStartCPU{
-    battleFlag = false;
     battleSetUp = true;
     battleSet1Flag = false;
     battleSet2Flag = false;

diff --git a/Awars III/FieldView.h b/Awars III/FieldView.h
index 6f34e2b..984c105 100755 (executable)
--- a/Awars III/FieldView.h
+++ b/Awars III/FieldView.h
@@ -179,8 +179,6 @@ bool CPUturn;
 -(void)modeCPUturn;
 
 
--(IBAction)FSVtitle:(id)sender;
--(IBAction)FSVcancel:(id)sender;
 //-(void)loadMesh:(NSMutableArray *)theMapString;
 @end
 FieldView *fieldView;

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index ae72a1b..83e8289 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -685,6 +685,7 @@
             U = U->next;
         }U = UTop;
         okflag = true;
+        attackingWait = true;
         //NSLog(@"%d", DUN[0]);
         return;
     }else if(attackExtentFlag2){
@@ -745,6 +746,7 @@
             U = UTop;
             
             wtAttackedFlag = true;
+            attackingWait = true;
             return;
         }
     }U = UTop;
@@ -1903,10 +1905,10 @@
             if(battleFlag || battleRdy || battleSetUp)
                 return;
             
-            /*
+            
             wtRdy = true;
             wtRdy2 = true;
-            */
+            
             
             unitMoveEndFlag = false;
             cpuAtkExtendFlag = false;
@@ -1983,10 +1985,10 @@
                     unitNoMoveStanbyFlag = false;
                     
                     
-                    
+                    /*
                     wtRdy = false;
                     wtRdy2 = false;
-                    
+                    */
                     pushStanbyFlag = true;
                     unitMoveEndFlag = true;
                     
@@ -1995,7 +1997,7 @@
                     cpuAImodeflag = false;
                     moveFlag = false;
                     stanbyFlag = true;
-                    wtMovedFlag = true;
+                    //wtMovedFlag = true;
                     CPUAttackFlag = false;
                     CPUAttackFlag2 = false;
                     unitNoMoveFlag = false;
@@ -2058,10 +2060,18 @@
                 unitCPUAttackFlag = true;
                 cpuModeBATTLEendFlag = false;
                 cpuMODE = MODE_CPU_BATTLE;
+                oopsCnt = 25;
                 return;
             }
             break;
         case MODE_CPU_BATTLE:
+            battleFlag = true;
+            
+            if(!Utarget){
+                CPUAttackFlag = false;
+                cpuAtkExtendFlag = false;
+                battleFlag = false;
+            }
             
             if(cpuModeBATTLEendFlag){
                 
@@ -2116,7 +2126,6 @@
                         CPUAttackSubmitFlag = true;
                         battleWindowFlag = false;
                         cpuModeBATTLEflag = true;
-                        battleFlag = false;
                         CPUAttackFlag2 = false;
                         cpuAtkExtendFlag = false;
                         cpuAtkExtendFlag2 = true;
@@ -2143,7 +2152,6 @@
                         CPUAttackSubmitFlag = true;
                         battleWindowFlag = false;
                         cpuModeBATTLEflag = true;
-                        battleFlag = false;
                         CPUAttackFlag2 = false;
                         cpuAtkExtendFlag = false;
                         cpuAtkExtendFlag2 = true;
@@ -2265,9 +2273,11 @@
             break;
         case MODE_CPU_STANBY:
             
-            if(!Utarget){
-                CPUAttackFlag = false;
-                cpuAtkExtendFlag = false;
+            
+            
+            if(battleFlag){
+                wtRdy3 = true;
+                return;
             }
             
             if(!CPUAttackFlag){
@@ -2292,6 +2302,7 @@
                 
                 wtRdy = false;
                 wtRdy2 = false;
+                wtRdy3 = false;
                 stanbyFlag = true;
                 
                 pushStanbyFlag = true;
@@ -2332,8 +2343,9 @@
             U = UTop;
             
             
-            wtRdy = true;
-            wtRdy2 = true;
+            wtRdy = false;
+            wtRdy2 = false;
+            wtRdy3 = false;
             
             pushStanbyFlag = true;
             
@@ -2344,8 +2356,6 @@
             moveFlag = false;
             stanbyFlag = true;
             wtMovedFlag = true;
-            CPUAttackFlag = false;
-            CPUAttackFlag2 = false;
             unitNoMoveFlag = false;
             cpuModeBATTLEendFlag = false;
             cpuMODE = MODE_CPU_IDLE;