diff --git a/game/game.js b/game/game.js
index d7abadfdc..21f6b3a26 100644
--- a/game/game.js
+++ b/game/game.js
@@ -4530,6 +4530,7 @@
 							map.four_assign.show();
                             map.four_phaseswap.show();
 							map.expand_dialog.show();
+							map.fouralign.show();
 						}
 						else{
 							map.change_choice.show();
@@ -4541,6 +4542,7 @@
 							map.four_assign.hide();
 							map.four_phaseswap.hide();
                             map.expand_dialog.hide();
+							map.fouralign.hide();
 						}
 						if(config.versus_mode=='three'||config.versus_mode=='one'){
 							map.enable_all_three.show();
@@ -4678,6 +4680,10 @@
 							}
 						}
 					},
+					fouralign:{
+						name:'自由选择阵型',
+						init:false
+					},
                     change_identity:{
 						name:'自由选择座位',
 						init:true,
diff --git a/game/update.js b/game/update.js
index e50f45797..d6eccd42d 100644
--- a/game/update.js
+++ b/game/update.js
@@ -26,7 +26,7 @@ window.noname_update={
         // 'character/xianjian.js',
         // 'mode/identity.js',
         // 'mode/guozhan.js',
-        // 'mode/versus.js',
+        'mode/versus.js',
         // 'mode/chess.js',
         // 'mode/tafang.js',
         // 'mode/guozhan.js',
diff --git a/mode/versus.js b/mode/versus.js
index e59bc95e9..b44d1b664 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -147,13 +147,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     			}
     		}
     		else if(_status.mode=='four'){
+                _status.fouralign=[0,1,2,3,4];
     			var list=[
     				['zhong','ezhong','ezhong','zhong','zhong','ezhong','ezhong','zhong'],
     				['zhong','ezhong','zhong','ezhong','ezhong','zhong','ezhong','zhong'],
     				['zhong','ezhong','ezhong','zhong','ezhong','zhong','zhong','ezhong'],
     				['zhong','ezhong','zhong','ezhong','zhong','ezhong','zhong','ezhong'],
     				['zhong','ezhong','ezhong','zhong','ezhong','zhong','ezhong','zhong'],
-    			].randomGet();
+    			][_status.fouralign.randomRemove()];
     			var rand1=Math.floor(Math.random()*4);
     			var rand2=Math.floor(Math.random()*4);
     			for(var i=0;i<list.length;i++){
@@ -1435,7 +1436,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
                             _status.rechoose=true;
                             for(var i=0;i<game.players.length;i++){
                                 game.players[i].uninit();
-                                game.players[i].node.name_seat.style.display='';
+                                if(game.players[i].node.name_seat) game.players[i].node.name_seat.style.display='';
                                 game.players[i].classList.remove('selectedx');
                             }
                             game.resume();
@@ -1471,8 +1472,73 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
                             }
                         }
                     };
-                    if(get.config('change_identity')&&!get.config('four_assign')&&!get.config('four_phaseswap')){
-                        event.addSetting();
+                    if(!get.config('four_assign')&&!get.config('four_phaseswap')){
+                        if(get.config('change_identity')){
+                            event.addSetting();
+                        }
+                        if(get.config('fouralign')){
+                            event.fouralignbutton=ui.create.control('变阵',function(){
+                                if(!_status.fouralign.length||(_status.fouralign.length==1&&_status.fouralign[0]==0)){
+                                    _status.fouralign=[0,1,2,3,4];
+                                }
+                                var list=[
+                                    ['zhong','ezhong','ezhong','zhong','zhong','ezhong','ezhong','zhong'],
+                                    ['zhong','ezhong','zhong','ezhong','ezhong','zhong','ezhong','zhong'],
+                                    ['zhong','ezhong','ezhong','zhong','ezhong','zhong','zhong','ezhong'],
+                                    ['zhong','ezhong','zhong','ezhong','zhong','ezhong','zhong','ezhong'],
+                                    ['zhong','ezhong','ezhong','zhong','ezhong','zhong','ezhong','zhong'],
+                                ][_status.fouralign.shift()];
+                                var rand1=Math.floor(Math.random()*4);
+                                var rand2=Math.floor(Math.random()*4);
+                                for(var i=0;i<list.length;i++){
+                                    if(list[i]=='zhong'){
+                                        if(rand1==0){
+                                            list[i]='zhu';
+                                        }
+                                        rand1--;
+                                    }
+                                    else{
+                                        if(rand2==0){
+                                            list[i]='ezhu';
+                                        }
+                                        rand2--;
+                                    }
+                                }
+
+                                var side=Math.random()<0.5;
+                                var num=game.players.indexOf(_status.firstAct);
+                                list=list.splice(8-num).concat(list);
+
+                                for(var i=0;i<8;i++){
+                                    if(list[i][0]=='e'){
+                                        game.players[i].side=side;
+                                        game.players[i].identity=list[i].slice(1);
+                                    }
+                                    else{
+                                        game.players[i].side=!side;
+                                        game.players[i].identity=list[i];
+                                    }
+                                    if(game.players[i].identity=='zhu'){
+                                        game[game.players[i].side+'Zhu']=game.players[i];
+                                        game.players[i].isZhu=true;
+                                    }
+                                    game.players[i].setIdentity(game.players[i].identity);
+                                    game.players[i].node.identity.dataset.color=get.translation(game.players[i].side+'Color');
+                                    if(game.players[i].node.name_seat){
+                                        game.players[i].node.name_seat.remove();
+                                        delete game.players[i].node.name_seat;
+                                    }
+                                }
+
+                                _status.rechoose=true;
+                                for(var i=0;i<game.players.length;i++){
+                                    game.players[i].uninit();
+                                    if(game.players[i].node.name_seat) game.players[i].node.name_seat.style.display='';
+                                    game.players[i].classList.remove('selectedx');
+                                }
+                                game.resume();
+                            });
+                        }
                     }
     				"step 1"
     				if(event.current==game.me||(event.four_assign&&event.current.side==game.me.side)){
@@ -1589,6 +1655,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
     					ui.control.style.transitionDuration='';
     				},500);
     				lib.init.onfree();
+                    delete _status.fouralign;
+                    if(event.fouralignbutton){
+                        event.fouralignbutton.close();
+                        delete event.fouralignbutton;
+                    }
     			});
     		},
     		chooseCharacterThree:function(){