REFLECTION BLUE

libccy · Jul 31, 2020 · 49a8d93 · 49a8d93 · xiaoas · Aug 4, 2020
1 parent f940028
commit 49a8d93
Show file tree

Hide file tree

Showing 20 changed files with 1,513 additions and 59 deletions.
diff --git a/card/extra.js b/card/extra.js
@@ -653,14 +653,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						return true;
 					},
 					check:function(button){
+						if(_status.event.getParent().type!='phase') return 1;
 						if(button.link.name=='du') return 10;
 						var player=_status.event.player;
 						if(player.getUseValue(button.link)>0) return get.order(button.link);
 						return -1;
 					},
 					backup:function(links,player){
 						return {
-							prompt:'选择'+get.translation(links)+'的目标',
 							filterCard:function(){return false},
 							selectCard:-1,
 							viewAs:links[0],
@@ -674,6 +674,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							}
 						}
 					},
+					prompt:function(links){
+						return '选择'+get.translation(links)+'的目标';
+					},
 				},
 				ai:{
 					order:function(item,player){

diff --git a/card/standard.js b/card/standard.js
@@ -2021,7 +2021,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 										if(typeof aiii=='number') return aiii;
 									}
 									if(Math.abs(get.attitude(_status.event.player,source))<3) return 0;
-									if(source.hasSkillTag('guanxing')&&(source!=player||!source.hasSkill('guanxing_fail'))) return 0;
+									if(source.hasSkillTag('nowuxie_judge')||source.hasSkillTag('guanxing')&&(source!=player||!source.hasSkill('guanxing_fail'))) return 0;
 									if(name!='lebu'&&name!='bingliang'){
 										if(source!=_status.event.player){
 											return 0;

diff --git a/card/yunchou.js b/card/yunchou.js
@@ -859,7 +859,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				trigger:{target:'shaBefore'},
 				direct:true,
 				filter:function(event,player){
-					return !event.getParent().directHit.contains(player)&&player.hasCard('youdishenru');
+					return !event.getParent().directHit.contains(player)&&player.hasUsableCard('youdishenru');
 				},
 				content:function(){
 					event.youdiinfo={
@@ -880,7 +880,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(!event.player.countCards('he')) return false;
 					if(!lib.filter.targetEnabled({name:'chenhuodajie'},player,event.player)) return false;
 					if(event._notrigger.contains(event.player)) return false;
-					return player.hasCard('chenhuodajie');
+					return player.hasUsableCard('chenhuodajie');
 				},
 				content:function(){
 					player.chooseToUse(get.prompt('chenhuodajie',trigger.player).replace(/发动/,'使用'),function(card,player){