ユニット同士の通行を修正

diff --git a/Awars III/FieldView.m b/Awars III/FieldView.m
index 8591e96..ce6cfce 100755 (executable)
--- a/Awars III/FieldView.m
+++ b/Awars III/FieldView.m
@@ -132,7 +132,25 @@
             
             unitNum[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = Uselected->C.chipNumb;
             loadNum[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = Uselected->CL.chipNumb;
-            unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = Uselected->team;
+            if(Uselected->team == 0){
+                if(Uselected->joinArmyFromNext){
+                    unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = 1;
+                }else{
+                    unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = 0;
+                }
+            }else if(Uselected->team == 1){
+                if(Uselected->joinArmyFromNext){
+                    unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = 5;
+                }else{
+                    unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = 4;
+                }
+            }else if(Uselected->team == 2){
+                if(Uselected->joinArmyFromNext){
+                    unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = 3;
+                }else{
+                    unitTeam[g_moveRoute[i0][1]][g_moveRoute[i0][0]] = 2;
+                }
+            }
             
             submitFlag = true;
             unitMoveEndFlag = true;
@@ -964,7 +982,11 @@
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY-1][startX]];  // 上
     
-    if(unitNum[startY-1][startX] > -1 && unitTeam[startY-1][startX] != chipTeam){
+    
+    if(unitNum[startY-1][startX] > -1 && (unitTeam[startY-1][startX] == 1 || unitTeam[startY-1][startX] == 4 || unitTeam[startY-1][startX] == 5) && chipTeam == 0){
+    }else if(unitNum[startY-1][startX] > -1 && (unitTeam[startY-1][startX] == 0  || unitTeam[startY-1][startX] == 4 || unitTeam[startY-1][startX] == 5) && chipTeam == 1){
+    }else if(unitNum[startY-1][startX] > -1 && (unitTeam[startY-1][startX] == 3) && chipTeam == 2){
+    }else if(unitNum[startY-1][startX] > -1 && unitTeam[startY-1][startX] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY-1][startX] < i0 ){
@@ -973,7 +995,12 @@
     
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY+1][startX]];  // 下
-    if(unitNum[startY+1][startX] > -1 && unitTeam[startY+1][startX] != chipTeam){
+    
+    
+    if(unitNum[startY+1][startX] > -1 && (unitTeam[startY+1][startX] == 1 || unitTeam[startY+1][startX] == 4 || unitTeam[startY+1][startX] == 5) && chipTeam == 0){
+    }else if(unitNum[startY+1][startX] > -1 && (unitTeam[startY+1][startX] == 0  || unitTeam[startY+1][startX] == 4 || unitTeam[startY+1][startX] == 5) && chipTeam == 1){
+    }else if(unitNum[startY+1][startX] > -1 && (unitTeam[startY+1][startX] == 3) && chipTeam == 2){
+    }else if(unitNum[startY+1][startX] > -1 && unitTeam[startY+1][startX] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY+1][startX] < i0 ){
@@ -982,7 +1009,12 @@
     
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY][startX-1]];  // 右
-    if(unitNum[startY][startX-1] > -1 && unitTeam[startY][startX-1] != chipTeam){
+    
+    
+    if(unitNum[startY][startX-1] > -1 && (unitTeam[startY][startX-1] == 1 || unitTeam[startY][startX-1] == 4 || unitTeam[startY][startX-1] == 5) && chipTeam == 0){
+    }else if(unitNum[startY][startX-1] > -1 && (unitTeam[startY][startX-1] == 0  || unitTeam[startY][startX-1] == 4 || unitTeam[startY][startX-1] == 5) && chipTeam == 1){
+    }else if(unitNum[startY][startX-1] > -1 && (unitTeam[startY][startX-1] == 3) && chipTeam == 2){
+    }else if(unitNum[startY][startX-1] > -1 && unitTeam[startY][startX-1] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY][startX-1] < i0 ){
@@ -991,7 +1023,10 @@
     
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY][startX+1]];  // 左
-    if(unitNum[startY][startX+1] > -1 && unitTeam[startY][startX+1] != chipTeam){
+    if(unitNum[startY][startX+1] > -1 && (unitTeam[startY][startX+1] == 1 || unitTeam[startY][startX+1] == 4 || unitTeam[startY][startX+1] == 5) && chipTeam == 0){
+    }else if(unitNum[startY][startX+1] > -1 && (unitTeam[startY][startX+1] == 0  || unitTeam[startY][startX+1] == 4 || unitTeam[startY][startX+1] == 5) && chipTeam == 1){
+    }else if(unitNum[startY][startX+1] > -1 && (unitTeam[startY][startX+1] == 3) && chipTeam == 2){
+    }else if(unitNum[startY][startX+1] > -1 && unitTeam[startY][startX+1] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY][startX+1] < i0 ){
@@ -1015,7 +1050,10 @@
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY-1][startX]];  // 上
     
-    if(loadNum[startY-1][startX] > -1 && unitTeam[startY-1][startX] != chipTeam){
+    if(loadNum[startY-1][startX] > -1 && (unitTeam[startY-1][startX] == 1 || unitTeam[startY-1][startX] == 4 || unitTeam[startY-1][startX] == 5) && chipTeam == 0){
+    }else if(loadNum[startY-1][startX] > -1 && (unitTeam[startY-1][startX] == 0  || unitTeam[startY-1][startX] == 4 || unitTeam[startY-1][startX] == 5) && chipTeam == 1){
+    }else if(loadNum[startY-1][startX] > -1 && (unitTeam[startY-1][startX] == 3) && chipTeam == 2){
+    }else if(loadNum[startY-1][startX] > -1 && unitTeam[startY-1][startX] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY-1][startX] < i0 ){
@@ -1024,7 +1062,12 @@
     
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY+1][startX]];  // 下
-    if(loadNum[startY+1][startX] > -1 && unitTeam[startY+1][startX] != chipTeam){
+    
+    
+    if(loadNum[startY+1][startX] > -1 && (unitTeam[startY+1][startX] == 1 || unitTeam[startY+1][startX] == 4 || unitTeam[startY+1][startX] == 5) && chipTeam == 0){
+    }else if(loadNum[startY+1][startX] > -1 && (unitTeam[startY+1][startX] == 0  || unitTeam[startY+1][startX] == 4 || unitTeam[startY+1][startX] == 5) && chipTeam == 1){
+    }else if(loadNum[startY+1][startX] > -1 && (unitTeam[startY+1][startX] == 3) && chipTeam == 2){
+    }else if(loadNum[startY+1][startX] > -1 && unitTeam[startY+1][startX] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY+1][startX] < i0 ){
@@ -1033,7 +1076,12 @@
     
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY][startX-1]];  // 右
-    if(loadNum[startY][startX-1] > -1 && unitTeam[startY][startX-1] != chipTeam){
+    
+    
+    if(loadNum[startY][startX-1] > -1 && (unitTeam[startY][startX-1] == 1 || unitTeam[startY][startX-1] == 4 || unitTeam[startY][startX-1] == 5) && chipTeam == 0){
+    }else if(loadNum[startY][startX-1] > -1 && (unitTeam[startY][startX-1] == 0  || unitTeam[startY][startX-1] == 4 || unitTeam[startY][startX-1] == 5) && chipTeam == 1){
+    }else if(loadNum[startY][startX-1] > -1 && (unitTeam[startY][startX-1] == 3) && chipTeam == 2){
+    }else if(loadNum[startY][startX-1] > -1 && unitTeam[startY][startX-1] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY][startX-1] < i0 ){
@@ -1042,7 +1090,12 @@
     
     
     i0 = leftPow - g_moveCost[pieceType][g_map[startY][startX+1]];  // 左
-    if(loadNum[startY][startX+1] > -1 && unitTeam[startY][startX+1] != chipTeam){
+    
+    
+    if(loadNum[startY][startX+1] > -1 && (unitTeam[startY][startX+1] == 1 || unitTeam[startY][startX+1] == 4 || unitTeam[startY][startX+1] == 5) && chipTeam == 0){
+    }else if(loadNum[startY][startX+1] > -1 && (unitTeam[startY][startX+1] == 0  || unitTeam[startY][startX+1] == 4 || unitTeam[startY][startX+1] == 5) && chipTeam == 1){
+    }else if(loadNum[startY][startX+1] > -1 && (unitTeam[startY][startX+1] == 3) && chipTeam == 2){
+    }else if(loadNum[startY][startX+1] > -1 && unitTeam[startY][startX+1] != chipTeam){
         i0 = 0;
     }
     if( aMap[startY][startX+1] < i0 ){
@@ -2105,7 +2158,7 @@
                 UT = 0;
             }else if(unitBreak->team == 2){
                 UT = 1;
-            }else if(unitBreak->team == 1){
+            }else if(unitBreak->team == 4){
                 UT = 2;
             }
             
@@ -2317,7 +2370,7 @@
                 UT = 0;
             }else if(unitBreak->team == 2){
                 UT = 1;
-            }else if(unitBreak->team == 1){
+            }else if(unitBreak->team == 4){
                 UT = 2;
             }