stone

card/refresh.js

@@ -47,7 +47,7 @@ card.refresh={
 				players.sort(lib.sort.seat);
 				var choice=players[0];
 				player.chooseTarget('是否移动木牛流马？',function(card,player,target){
-					return player!=target&&!target.get('e','5');
+					return !target.isMin()&&player!=target&&!target.get('e','5');
 				}).ai=function(target){
 					return target==choice?1:-1;
 				};

card/swd.js

@@ -311,8 +311,8 @@ card.swd={
 				return (lib.filter.judge(card,player,target)&&player!=target);
 			},
 			judge:function(card){
-				if(get.color(card)=='red') return 0;
-				return -3;
+				if(get.color(card)=='black') return -3;
+				return 0;
 			},
 			effect:function(){
 				if(result.bool==false){

character/wind.js

@@ -224,7 +224,7 @@ character.wind={
 				"step 1"
 				event.dialog.close();
 				for(var i=0;i<player.storage.buqu.length-1;i++){
-					if(get.number(event.card)==get.number(player.storage.buqu[i])) return;
+					if(get.number(event.card)&&get.number(event.card)==get.number(player.storage.buqu[i])) return;
 				}
 				trigger.untrigger();
 				trigger.finish();

character/woods.js

@@ -27,6 +27,7 @@ character.woods={
 		huoshou1:{
 			trigger:{target:'useCardToBefore'},
 			forced:true,
+			priority:15,
 			filter:function(event,player){
 				return (event.card.name=='nanman');
 			},
@@ -107,6 +108,7 @@ character.woods={
 		juxiang1:{
 			trigger:{target:'useCardToBefore'},
 			forced:true,
+			priority:15,
 			filter:function(event,player){
 				return (event.card.name=='nanman');
 			},

character/xswd.js

@@ -37,7 +37,7 @@ character.xswd={
 			swd_shaowei:['female','shu',3,['jianji','huangyu'],['fullskin']],
 
 			swd_youzhao:['male','shu',4,['longdan','yuchen'],['fullskin']],
-		swd_qingming:['male','shu',3,['mingfu','tianlun']],
+		// swd_qingming:['male','shu',3,['mingfu','tianlun']],
 			swd_shangzhang:['male','shu',4,['lianwu'],['fullskin']],
 			swd_situqiang:['female','shu',3,['qingnang','chulao'],['fullskin']],
 
@@ -47,6 +47,6 @@ character.xswd={
 			swd_zhanggao:['male','wei',4,['yicong','poxing'],['fullskin']],
 
 			swd_hupo:['male','wu',3,['dunxing','guiying'],['fullskin']],
-			swd_jiangziya:['male','wu',3,['xuanzhou','tianlun'],['fullskin']],
+			swd_jiangziya:['male','wu',3,['mingfu','tianlun'],['fullskin']],
 	},
 }

game/config.js

@@ -5,6 +5,7 @@ window.config={
 	forbidall:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu',
 	'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan'],
 	forbidversus:['swd_kangnalishi'],
+	forbidstone:['zhugedan','pal_xuanxiao'],
 	forbiddouble:['zhugedan','swd_kangnalishi','swd_nicole','dongzhuo','jg_simayi'],
 	all:{
 		mode:['identity','guozhan','versus','stone'],
@@ -277,7 +278,7 @@ window.config={
 			free_choose:true,
 			swap:true,
 			change_identity:true,
-			battle_number:1
+			battle_number:3
 		},
 		identity:{
 			identity:[

game/game.js

@@ -4143,7 +4143,16 @@ window.play={};
 						this.node.info.style.opacity=lib.card[card[2]].opacity;
 						this.node.name.style.opacity=lib.card[card[2]].opacity;
 					}
-					this.node.info.innerHTML=get.translation(card[0])+' '+card[1];
+					if(lib.card[card[2]].modinfo){
+						this.node.info.innerHTML=lib.card[card[2]].modinfo;
+					}
+					else{
+						this.node.info.innerHTML=get.translation(card[0])+' '+card[1];
+					}
+					if(lib.card[card[2]].addinfo){
+						this.node.addinfo=ui.create.div('.addinfo',this);
+						this.node.addinfo.innerHTML=lib.card[card[2]].addinfo;
+					}
 					if(card[0]=='heart'||card[0]=='diamond'){
 						this.node.info.classList.add('red');
 					}
@@ -6472,6 +6481,7 @@ window.play={};
 				if(thisiscard){
 					groupSort=function(name){
 						if(lib.card[name[2]].type=='basic') return 0;
+						if(lib.card[name[2]].type=='stone') return 0.5;
 						if(lib.card[name[2]].type=='stonecharacter') return 1;
 						if(lib.card[name[2]].type=='trick') return 2;
 						if(lib.card[name[2]].type=='delay') return 3;
@@ -9702,7 +9712,7 @@ window.play={};
 			if(card.parentNode.id=='special') return 's';
 		},
 		translation:function(str,arg){
-			if(typeof str=='object'&&str.name){
+			if(str&&typeof str=='object'&&str.name){
 				var str2;
 				if(arg=='viewAs'&&str.viewAs){
 					str2=get.translation(str.viewAs);
@@ -9931,6 +9941,7 @@ window.play={};
 			if(sort=='type_sort'){
 				func=function(card){
 					if(get.type(card)=='basic') return 2;
+					if(get.type(card)=='stone') return 1.5;
 					if(get.type(card)=='stonecharacter') return 1;
 					if(get.type(card)=='trick') return -1;
 					if(get.type(card)=='delay') return -2;

layout/default/layout.css

@@ -100,6 +100,10 @@ body>.background{z-index:-2}
 	-webkit-transform:scale(0.8);
 	-webkit-transform-origin:top right;
 }
+.buttons .card.button>.addinfo{
+	-webkit-transform:scale(0.8);
+	-webkit-transform-origin:bottom left;
+}
 .card.center{top:calc(50% - 52px);left:calc(50% - 52px);}
 .card>.background{font-size: 80px;height: 80px;padding-top: 14px;text-align: center;}
 .equips>.card>.background{font-size: 36px;height: 36px;padding-top: 3px;}
@@ -283,18 +287,18 @@ margin-bottom: 5px;
 #arena.stone>.card[data-position='5']{top:calc(100% - 297px);left:8px;}
 #arena.stone>.popup[data-position='5']{top:calc(100% - 340px);left:8px;}
 
-#arena>.player.minskin[data-position='9']{top:10px;left:calc(100% - 120px);}
-#arena.stone>.card[data-position='9']{top:18px;left:calc(100% - 112px);}
-#arena.stone>.popup[data-position='9']{top:140px;left:calc(100% - 112px);}
+#arena>.player.minskin[data-position='9']{top:30px;left:calc(100% - 120px);}
+#arena.stone>.card[data-position='9']{top:38px;left:calc(100% - 112px);}
+#arena.stone>.popup[data-position='9']{top:160px;left:calc(100% - 112px);}
 #arena>.player.minskin[data-position='11']{top:10px;left:calc(100% - 260px);}
 #arena.stone>.card[data-position='11']{top:18px;left:calc(100% - 252px);}
 #arena.stone>.popup[data-position='11']{top:140px;left:calc(100% - 252px);}
 #arena>.player.minskin[data-position='10']{top:10px;left:140px;}
 #arena.stone>.card[data-position='10']{top:18px;left:148px;}
 #arena.stone>.popup[data-position='10']{top:140px;left:148px;}
-#arena>.player.minskin[data-position='8']{top:10px;left:0;}
-#arena.stone>.card[data-position='8']{top:18px;left:8px;}
-#arena.stone>.popup[data-position='8']{top:140px;left:8px;}
+#arena>.player.minskin[data-position='8']{top:30px;left:0;}
+#arena.stone>.card[data-position='8']{top:38px;left:8px;}
+#arena.stone>.popup[data-position='8']{top:160px;left:8px;}
 /*--------位置(8人)------*/
 [data-number='8']>.player[data-position='1']{top:calc(200% / 3 - 90px);left:calc(100% - 240px);}
 [data-number='8']>.player[data-position='2']{top:calc(100% / 3 - 40px);left:calc(100% - 240px);}
@@ -419,6 +423,7 @@ margin-bottom: 5px;
 #arena.selecting #me .card:not(.selectable)>.name,
 #arena.selecting #me .card:not(.selectable)>.name2,
 #arena.selecting #me .card:not(.selectable)>.info,
+#arena.selecting #me .card:not(.selectable)>.addinfo,
 #arena.selecting .dialog:not(.noselect) .button:not(.selectable):not(.noclick),
 .dead,.likedead{opacity: 0.6;}
 .mark>.background{opacity: 1 !important;}
@@ -685,6 +690,10 @@ div[data-nature='soil']{
 	top:74px;
 	right:6px;
 }
+.card .addinfo{
+	bottom:6px;
+	left:6px;
+}
 .button.card .wunature{
 	top:59px;
 }