ナビのウェイト改善

diff --git a/Awars III/BattleView.m b/Awars III/BattleView.m
index 2a00bd7..d21e77c 100755 (executable)
--- a/Awars III/BattleView.m
+++ b/Awars III/BattleView.m
@@ -32,11 +32,9 @@
 
 
 -(void)mouseDown:(NSEvent *)theEvent{
-    
-    oopsCnt = 30;
 
     bLoopFlag = false;
-
+    oopsCnt = 0;
 
 }
 

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index e237825..eeca839 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -3992,9 +3992,7 @@ ahhh:{}
     
     
     if(Utarget){
-        if(battleRdy && battleFlag &&
-           ((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
-            (unitBreak->team == 2 && Utarget->team == 1 && MF[MFselectedRow+1].MS.playerSet2 == 2) || (unitBreak->team == 1 && Utarget->team == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
+        if(battleRdy && ((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) || (unitBreak->team == 2 && Utarget->team == 1 && MF[MFselectedRow+1].MS.playerSet2 == 2) || (unitBreak->team == 1 && Utarget->team == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
             (unitBreak->team == 0 && Utarget->team == 1 && MF[MFselectedRow+1].MS.playerSet1 == 2) || (unitBreak->team == 1 && Utarget->team == 0 && MF[MFselectedRow+1].MS.playerSet1 == 2) ||
             (unitBreak->team == 1 && Utarget->team == 1) ||
             (unitBreak->team == 2 && Utarget->team == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
@@ -4010,7 +4008,7 @@ ahhh:{}
             if(oopsCnt > 0)
                 return;
             else{
-                oopsCnt = 30;//cpu攻撃ナビ
+                //cpu攻撃ナビ
             }
             
             bLoopFlag = false;
@@ -9121,7 +9119,7 @@ ahhh:{}
                 }
                 
             if(grazeFlag) message = [message stringByAppendingString:[NSString stringWithFormat:@"かすりヒット！\n"]];
-                if(!healFlag) {
+            if(!healFlag) {
                     message = [message stringByAppendingString:[NSString stringWithFormat:@"%@は%gのダメージを受けた！", U->C.name, dmg]];
                 btHitFlag1 = true;
                 }
@@ -9192,6 +9190,7 @@ ahhh:{}
             avPlayerFlag1 = false;
             animationFlag3 = false;
             btAtattckMoveEnd = false;
+            oopsCnt = 30;
             break;
         
         case 2:
@@ -9753,6 +9752,7 @@ ahhh:{}
             avPlayerFlag2 = false;
             animationFlag3 = false;
             btAtattckMoveEnd = false;
+            oopsCnt = 30;
             break;
         case 3:
             //おまんこ