攻撃ナビやギルド選択バグ修正

diff --git a/Awars III/BattleView.h b/Awars III/BattleView.h
index 1de152b..3fa5555 100755 (executable)
--- a/Awars III/BattleView.h
+++ b/Awars III/BattleView.h
@@ -47,6 +47,7 @@ int btHitExtendFix2;
 int btAttackType1;
 int btAttackType2;
 bool btSelfAction;
+bool btAtattckMoveEnd;
 
 NSSound *hitSoundBasic;
 

diff --git a/Awars III/BattleView.m b/Awars III/BattleView.m
index a59a12e..2a00bd7 100755 (executable)
--- a/Awars III/BattleView.m
+++ b/Awars III/BattleView.m
@@ -33,6 +33,7 @@
 
 -(void)mouseDown:(NSEvent *)theEvent{
     
+    oopsCnt = 30;
 
     bLoopFlag = false;
 
@@ -182,6 +183,7 @@
         if(btAttackMoveValue1 < 2){
             [self drawImage:img x:BT_POINTX1 + btDistanceX1 + btAttackMove1 y:BT_POINTY f:1.0];
         }else{
+            btAtattckMoveEnd = true;
             [self drawImage:img x:BT_POINTX1 + btDistanceX1 y:BT_POINTY f:1.0];
         }
         }else if(btAttackType1 == BT_TYPE_MAGIC){
@@ -218,6 +220,7 @@
             if(btAttackMoveValue1 < 4){
                 [self drawImage:img x:BT_POINTX1 + btDistanceX1 y:BT_POINTY - btAttackMove1 f:1.0];
             }else{
+                btAtattckMoveEnd = true;
                 [self drawImage:img x:BT_POINTX1 + btDistanceX1 y:BT_POINTY f:1.0];
             }
         }else if(btAttackType1 == BT_TYPE_ABILITY){
@@ -238,6 +241,7 @@
             if(btAttackMoveValue1 < 2){
                 [self drawImage:img x:BT_POINTX1 + btDistanceX1 + btAttackMove1 y:BT_POINTY f:1.0];
             }else{
+                btAtattckMoveEnd = true;
                 [self drawImage:img x:BT_POINTX1 + btDistanceX1 y:BT_POINTY f:1.0];
             }
         }
@@ -286,6 +290,7 @@
             if(btAttackMoveValue2 < 2){
                 if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 - btAttackMove2 y:BT_POINTY f:1.0];
             }else{
+                btAtattckMoveEnd = true;
                 if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
             }
         }else if(btAttackType2 == BT_TYPE_MAGIC){
@@ -322,6 +327,7 @@
             if(btAttackMoveValue2 < 4){
                 if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY - btAttackMove2 f:1.0];
             }else{
+                btAtattckMoveEnd = true;
                 if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
             }
         }else if(btAttackType2 == BT_TYPE_ABILITY){
@@ -342,6 +348,7 @@
             if(btAttackMoveValue2 < 2){
                 if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 - btAttackMove2 y:BT_POINTY f:1.0];
             }else{
+                btAtattckMoveEnd = true;
                 if(!btSelfAction) [self drawImage:img x:BT_POINTX2 - btDistanceX2 y:BT_POINTY f:1.0];
             }
         }

diff --git a/Awars III/FieldScene.h b/Awars III/FieldScene.h
index 97f9890..79e7172 100755 (executable)
--- a/Awars III/FieldScene.h
+++ b/Awars III/FieldScene.h
@@ -365,6 +365,10 @@ UNIT *effCun;
 bool fuckingLoadBugFix;
 bool battleEndFlag;
 
+int oopsCnt;
+int lmao;
+int vaginaCnt;
+
 @interface Savedatadat : NSObject<NSCoding>{
 @public
     

diff --git a/Awars III/FieldScene.m b/Awars III/FieldScene.m
index ddc7fb7..64a0d16 100755 (executable)
--- a/Awars III/FieldScene.m
+++ b/Awars III/FieldScene.m
@@ -15,6 +15,8 @@
     sdd = self;
     sdd2 = self;
 
+    oopsCnt = 30;
+    
     return self;
 }
 
@@ -1242,7 +1244,6 @@
     }
     
     if(coolTime){
-        static int lmao = 0;
         
         lmao++;
         
@@ -1265,12 +1266,8 @@
             battleSetUp = true;
             goto ahhh;
         }
-        if(!battleSetUpIgnore){/*
-        [self AttackDisplay];
-        windowPoint.x = [mapWindow frame].origin.x;
-        windowPoint.y = [mapWindow frame].origin.y;
-        [battleWindow setFrameOrigin:windowPoint];
-        [battleWindow makeKeyAndOrderFront:nil];*/
+        if(!battleSetUpIgnore){
+
             battleFlag = false;
             battleRdy = false;
             battleSet1Flag = false;
@@ -1285,12 +1282,8 @@
             battleSetUp = true;
             goto ahhh;
         }
-        if(!battleSetUpIgnore){/*
-        [self AttackDisplay];
-        windowPoint.x = [mapWindow frame].origin.x;
-        windowPoint.y = [mapWindow frame].origin.y;
-        [battleWindow setFrameOrigin:windowPoint];
-        [battleWindow makeKeyAndOrderFront:nil];*/
+        if(!battleSetUpIgnore){
+
             battleFlag = false;
             battleRdy = false;
             battleSet1Flag = false;
@@ -1770,6 +1763,7 @@ ahhh:{}
                     
                     [fieldView scrollPoint:NSMakePoint((wtPx-8)*32, (wtPy-8)*32)];
                     
+                    
                     if(buildNum[U->x][U->y] >= 0){
                         B = BTop;
                         while(B){
@@ -1890,6 +1884,25 @@ ahhh:{}
             [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 && U->team == 1)
+            || (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))
+           ){
+            
+            //おまんこかわいい
+            
+            vaginaCnt++;
+            if(vaginaCnt > 50){
+                [self battleStartCPU];
+                vaginaCnt = 0;
+            }
+        }
+        
+        
     }
         break;
     }
@@ -2242,7 +2255,6 @@ ahhh:{}
     }
     
     
-    static int oopsCnt = 30;
     
     U = UTop;
     
@@ -2254,15 +2266,15 @@ ahhh:{}
         (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)
+        if(!(AVpreview.rate > 0) && !animationFlag1 && !animationFlag2 && btAtattckMoveEnd)
             oopsCnt--;
         if(oopsCnt > 0)
             return;
         else{
-            oopsCnt = 30;//cpu攻撃ナビ
+            oopsCnt = 25;//cpu攻撃ナビ
         }
         
-        battleFlag = false;
+        //battleFlag = false;
         battleRdy = false;
         battleSet1Flag = false;
         battleSet2Flag = false;
@@ -2270,6 +2282,8 @@ ahhh:{}
 
     }
     }
+    
+    
     if(Utarget){
     if(battleRdy &&
        ((Utarget && MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
@@ -2292,6 +2306,7 @@ ahhh:{}
        bLoopFlag = false;
     }
     }
+    
     U = UTop;
     
 
@@ -3052,6 +3067,7 @@ ahhh:{}
     [researchACU setStringValue:[NSString stringWithFormat:@"命中値 ----"]];
     [researchEVA setStringValue:[NSString stringWithFormat:@"回避値 ----"]];
     [researchMOV setStringValue:[NSString stringWithFormat:@"移動力 ----"]];
+    [researchIMG setImage:NULL];
     
     BUILDCHIP *B0;
     
@@ -3077,7 +3093,8 @@ ahhh:{}
         return false;
     
         }
-    }else if(buildTeam[possionX][possionY] == 2 || buildTeam[possionX][possionY] == 3){
+    }
+    else if(buildTeam[possionX][possionY] == 2 || buildTeam[possionX][possionY] == 3){
     
     
         if(GCnum2 < 0)
@@ -3162,7 +3179,7 @@ ahhh:{}
             if(!guildRE1){
                 n = [self chooseGuildList:GuildChosen1 gcnum:GCnum1];
             if(n == -1)
-                return false;
+                break;
                 *(GuildDisp1 + i) = *(GuildChosen1 + n);
             }
         
@@ -3193,6 +3210,8 @@ ahhh:{}
         }
         
         for(int i = k;i <= crCRL;i++){
+            if(*(GuildDisp2 + i - k) <= 0)
+                continue;
             
             [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.ATK]];
             [researchDEF setStringValue:[NSString stringWithFormat:@"防御力 %g", UC[*(GuildDisp1 + i - k)-1].S_M.DEF]];
@@ -3229,7 +3248,7 @@ ahhh:{}
             if(!guildRE2){
                 n = [self chooseGuildList:GuildChosen2 gcnum:GCnum2];
                 if(n == -1)
-                    return false;
+                    break;
                 *(GuildDisp2 + i) = *(GuildChosen2 + n);
             }
             
@@ -3256,6 +3275,9 @@ ahhh:{}
         }
         
         for(int i = k;i <= crCRL;i++){
+            if(*(GuildDisp2 + i - k) <= 0)
+                continue;
+            
             
             [researchATK setStringValue:[NSString stringWithFormat:@"攻撃力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.ATK]];
             [researchDEF setStringValue:[NSString stringWithFormat:@"防御力 %g", UC[*(GuildDisp2 + i - k)-1].S_M.DEF]];
@@ -4946,10 +4968,10 @@ ahhh:{}
     if((MF[MFselectedRow+1].MS.playerSet1 == 2 && MF[MFselectedRow+1].MS.playerSet2 == 2) ||
        unitBreak->team == 1 || (unitBreak->team == 2 && U->team == 1)
        ){
-        /*
-        [battleStartBtn setEnabled:NO];
-        [battleStartBtn setTransparent:YES];
-         */
+ 
+ //おまんこかわいい
+        
+        
     }else{
         [battleStartBtn setEnabled:YES];
         [battleStartBtn setTransparent:NO];
@@ -6660,6 +6682,7 @@ ahhh:{}
             message = @"";
             avPlayerFlag1 = false;
             animationFlag3 = false;
+            btAtattckMoveEnd = false;
             break;
         
         case 2:
@@ -7220,6 +7243,7 @@ ahhh:{}
             message = @"";
             avPlayerFlag2 = false;
             animationFlag3 = false;
+            btAtattckMoveEnd = false;
             break;
         case 3:
             if(bLoopFlag) break;
@@ -9387,7 +9411,8 @@ SKIP1:
     battleSet1Flag = false;
     battleSet2Flag = false;
     battleSettingFlag = false;
-    battleRdy = false;
+    
+    [battlePanel close];
 }
 
 -(IBAction)battleSet1:(id)sender{

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 4b55d06..97f7bc9 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -2498,7 +2498,7 @@
                         if(!guildRE2){
                             Gnum2 = 0;
                             if(a > 0)
-                                Gnum2 = MS.guildListRegistNum21 + arc4random()%(MS.guildListRegistNum22 - MS.guildListRegistNum21+1);
+                                Gnum2 = MS.guildListRegistNum21 + arc4random()%(a+1);
                             else
                                 Gnum2 = MS.guildListRegistNum22;
                             
@@ -3150,6 +3150,8 @@
                                     break;
                                 if((buildTeam[x][y] == 4 || buildTeam[x][y] == 5) && unitBreak->team == 1)
                                     break;
+                                if((buildTeam[x][y] == 0 || buildTeam[x][y] == 1) && unitBreak->team == 1)
+                                    break;
                                 
                                 dist = 999;
                                 g_target_x = y;

diff --git a/Awars III/MapEditor.m b/Awars III/MapEditor.m
index eeb7f45..ae88332 100755 (executable)
--- a/Awars III/MapEditor.m
+++ b/Awars III/MapEditor.m
@@ -1937,6 +1937,7 @@
     saveMapDataName = [[saveMapTF stringValue] retain];
     saveMapListSubmitFlag = true;
     saveMapChipFlag = true;
+    [self setEventGuildList];
     [saveMapWindow close];
 }
 -(IBAction)saveMapCancel:(id)sender{

diff --git a/Awars III/en.lproj/MainMenu.xib b/Awars III/en.lproj/MainMenu.xib
index cc174e4..4b55917 100755 (executable)
--- a/Awars III/en.lproj/MainMenu.xib
+++ b/Awars III/en.lproj/MainMenu.xib
@@ -9016,7 +9016,7 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="10395">
-                            <rect key="frame" x="466" y="1" width="15" height="480"/>
+                            <rect key="frame" x="465" y="1" width="16" height="480"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
@@ -9411,7 +9411,7 @@
                     <button verticalHuggingPriority="750" id="10687">
                         <rect key="frame" x="25" y="159" width="100" height="23"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <buttonCell key="cell" type="smallSquare" title="攻撃" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="10689">
+                        <buttonCell key="cell" type="smallSquare" title="行動" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="10689">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" size="13" name="AquaKana"/>
                         </buttonCell>