x

character/hearth.js

@@ -4927,9 +4927,6 @@ character.hearth={
 			usable:1,
 			unique:true,
 			direct:true,
-			check:function(){
-				return 0;
-			},
 			delay:0,
 			init:function(){
 				for(var i=1;i<=8;i++){

character/shenhua.js

@@ -1346,7 +1346,7 @@ character.shenhua={
 					return false;
 				}
 			},
-			check:function(event,player){
+			checkx:function(event,player){
 				var du=false;
 				var num=0;
 				for(var i=0;i<event.cards.length;i++){
@@ -1379,7 +1379,7 @@ character.shenhua={
 					event.finish();
 					return;
 				}
-				var check=lib.skill.guzheng.check(trigger,player);
+				var check=lib.skill.guzheng.checkx(trigger,player);
 				player.chooseCardButton(event.cards,'固政：选择令'+get.translation(trigger.player)+'收回的牌').set('ai',function(button){
 					if(_status.event.check){
 						return 20-ai.get.value(button.link);
@@ -1415,16 +1415,21 @@ character.shenhua={
 					event.player.classList.contains('dead')==false&&player.countCards('he'));
 			},
 			direct:true,
-			check:function(event,player){
+			checkx:function(event,player){
 				var att1=ai.get.attitude(player,event.player);
 				var att2=ai.get.attitude(player,event.source);
-				return att1>0&&att2<0;
+				return att1>0&&att2<=0;
 			},
 			content:function(){
 				"step 0"
 				var next=player.chooseToDiscard('he',get.prompt('beige'));
-				next.set('ai',ai.get.unuseful2);
+				var check=lib.skill.beige.checkx(trigger,player);
+				next.set('ai',function(card){
+					if(_status.event.goon) return 8-ai.get.value(card);
+					return 0;
+				});
 				next.set('logSkill','beige');
+				next.set('goon',check);
 				"step 1"
 				if(result.bool){
 					trigger.player.judge();

character/sp.js

@@ -1714,14 +1714,6 @@ character.sp={
 		},
 		zhaolie:{
 			trigger:{player:'phaseDrawBegin'},
-			check:function(event,player){
-				return game.hasPlayer(function(current){
-					return (current!=player&&
-						get.distance(player,current,'attack')<=1&&
-						ai.get.attitude(player,current)<=0&&
-						ai.get.damageEffect(current,player,player)>0);
-				});
-			},
 			direct:true,
 			content:function(){
 				'step 0'
@@ -6669,9 +6661,6 @@ character.sp={
 		xiaoguo:{
 			audio:2,
 			trigger:{global:'phaseEnd'},
-			check:function(event,player){
-				return ai.get.damageEffect(event.player,player,player)>0;
-			},
 			filter:function(event,player){
 				return event.player.isAlive()&&event.player!=player&&player.countCards('h',{type:'basic'});
 			},

character/yijiang.js

@@ -3668,9 +3668,6 @@ character.yijiang={
 				return player.countCards('he')>0&&event.source&&event.source.getEquip(1)!=undefined&&
 					event.card&&event.card.name=='sha';
 			},
-			check:function(event,player){
-				return ai.get.attitude(player,event.source)<=0;
-			},
 			direct:true,
 			priority:5,
 			audio:2,
@@ -3679,7 +3676,7 @@ character.yijiang={
 				var next=player.chooseToDiscard('he',get.prompt('duodao'));
 				next.logSkill=['duodao',trigger.source];
 				next.set('ai',function(card){
-					if(ai.get.attitude(_status.event.player,_status.event.getTrigger().source)<0){
+					if(ai.get.attitude(_status.event.player,_status.event.getTrigger().source)<=0){
 						return 6-ai.get.value(card);
 					}
 					return 0;
@@ -3842,17 +3839,15 @@ character.yijiang={
 			filter:function(event,player){
 				return player.countCards('he')>0;
 			},
-			check:function(event,player){
-				return player.countCards('h','sha')<=player.countCards('h')/3;
-			},
 			content:function(){
 				"step 0"
 				player.chooseTarget(get.prompt('youdi'),function(card,player,target){
 					return player!=target;
 				}).set('ai',function(target){
+					if(!_status.event.goon) return 0;
 					if(target.countCards('he')==0) return 0;
 					return -ai.get.attitude(_status.event.player,target);
-				});
+				}).set('goon',player.countCards('h','sha')<=player.countCards('h')/3);
 				"step 1"
 				if(result.bool){
 					game.delay();
@@ -6638,29 +6633,17 @@ character.yijiang={
 			filter:function(event,player){
 				return event.player.hp<=0&&event.player.countCards('h')>0;
 			},
-			check:function(event,player){
-				if(event.player.isUnderControl(true,player)){
-					return event.player.getCards('h',function(card){
-						return get.type(card)!='basic';
-					}).length>0;
-				}
-				return ai.get.attitude(player,event.player)>0;
-			},
 			direct:true,
 			content:function(){
 				"step 0"
-				var check=false;
-				if(trigger.player==player){
-					if(player.hasCard(function(card){
+				var check;
+				if(trigger.player.isUnderControl(true,player)){
+					check=player.hasCard(function(card){
 						return get.type(card)!='basic';
-					})){
-						check=true;
-					}
+					});
 				}
 				else{
-					if(ai.get.attitude(player,trigger.player)>0){
-						check=true;
-					}
+					check=(ai.get.attitude(player,trigger.player)>0);
 				}
 				player.choosePlayerCard(trigger.player,get.prompt('buyi',trigger.player),'h').set('ai',function(button){
 					if(!_status.event.check) return 0;

game/update.js

@@ -3,6 +3,7 @@ window.noname_update={
     // update:'1.9.17',
     changeLog:[
         'bug修复',
+        '4v4单人控制',
     ],
     files:[
         'game/game.js',