p

card/guozhan.js

@@ -594,6 +594,7 @@ card.guozhan={
 			},
 			forced:true,
 			popup:false,
+			priority:-50,
 			content:function(){
 				"step 0"
 				player.removeSkill('xietianzi');

character/extra.js

@@ -108,6 +108,7 @@ character.extra={
 		lianpo2:{
 			trigger:{global:'phaseAfter'},
 			forced:true,
+			priority:-50,
 			content:function(){
 				player.removeSkill('lianpo2');
 				player.phase();

character/hearth.js

@@ -2403,6 +2403,7 @@ character.hearth={
 		jixuan:{
 			trigger:{player:'phaseAfter'},
 			forced:true,
+			priority:-50,
 			filter:function(event,player){
 				return event.parent.name!='jixuan';
 			},
@@ -4141,6 +4142,7 @@ character.hearth={
 				return !player.storage.jihuo&&player.num('h')>0;
 			},
 			direct:true,
+			priority:-50,
 			content:function(){
 				"step 0"
 				var next=player.chooseToDiscard(get.prompt('jihuo'));

character/rank.js

@@ -61,6 +61,7 @@ window.characterRank={
         'gjqt_ouyangshaogong',
     ],
     a:[
+        'pal_muchanglan',
         'hs_aya',
         'ow_heiying',
         'pal_longkui',

character/shenhua.js

@@ -657,10 +657,11 @@ character.shenhua={
 			}
 		},
 		fangquan2:{
-			trigger:{player:'phaseEnd'},
+			trigger:{player:'phaseAfter'},
 			forced:true,
 			popup:false,
 			audio:false,
+			priority:-50,
 			content:function(){
 				"step 0"
 				player.chooseToDiscard(true);

character/sp.js

@@ -5940,16 +5940,10 @@ character.sp={
 					target:function(player){
 						var num=player.num('h');
 						if(player.hp==1) return 1;
-						if(player.hp==2&&num<=1) return 1;
-						if(player.hp==3&&num==0) return 1;
-						if(player.hp>=3&&num>=3) return 0;
-						var mode=get.mode();
-						if(mode=='identity'||mode=='guozhan'){
-							for(var i=0;i<game.players.length;i++){
-								if(game.players[i].ai.shown<=0) return 0;
-							}
-						}
+						if(player.hp==2&&num<=2) return 1;
+						if(player.hp==3&&num<=1) return 1;
 						if(game.phaseNumber<game.players.length*2) return 0;
+						if(player.hasUnknown()) return 0;
 						return 1;
 					},
 				}

character/xianjian.js

@@ -33,11 +33,84 @@ character.xianjian={
 		// pal_xiaoman:['male','wei',4,[]],
 
 		pal_xiahoujinxuan:['male','shu',3,['xuanmo','danqing']],
-		// pal_muchanglan:['female','shu',3,['feixia','lueying']],
+		pal_muchanglan:['female','wu',3,['feixia','lueying']],
 		// pal_xia:['male','wei',4,[]],
 		// pal_jiangcheng:['male','wei',4,[]],
 	},
 	skill:{
+		feixia:{
+			enable:'phaseUse',
+			usable:1,
+			filterCard:{color:'red'},
+			position:'he',
+			filter:function(event,player){
+				return player.num('he',{color:'red'})>0;
+			},
+			check:function(card){
+				return 7-ai.get.value(card);
+			},
+			content:function(){
+				var targets=player.getEnemies();
+				if(targets.length){
+					var target=targets.randomGet();
+					target.addExpose(0.2);
+					player.useCard({name:'sha'},target,false);
+				}
+			},
+			ai:{
+				order:2.9,
+				result:{
+					player:1
+				}
+			}
+		},
+		lueying:{
+			trigger:{player:'shaBegin'},
+			filter:function(event,player){
+				if(event.target.num('he')>0){
+					for(var i=0;i<game.players.length;i++){
+						if(game.players[i]!=player&&game.players[i]!=event.target&&
+							game.players[i].num('he')){
+							return true;
+						}
+					}
+				}
+				return false;
+			},
+			logTarget:'target',
+			usable:1,
+			content:function(){
+				'step 0'
+				var card=trigger.target.get('he').randomGet();
+				player.gain(card,trigger.target);
+				if(get.position(card)=='e'){
+					trigger.target.$give(card,player);
+				}
+				else{
+					trigger.target.$give(1,player);
+				}
+				'step 1'
+				if(game.players.length>2){
+					trigger.target.chooseTarget(function(card,player,target){
+						return target!=player&&target!=_status.event.parent.player&&target.num('he')>0;
+					},'选择一名角色并令'+get.translation(player)+'弃置其一张牌').ai=function(target){
+						return -ai.get.attitude(_status.event.player,target);
+					};
+				}
+				else{
+					event.finish();
+				}
+				'step 2'
+				if(result.bool){
+					trigger.target.line(result.targets[0],'green');
+					player.discardPlayerCard(result.targets[0],true,'he');
+				}
+			},
+			ai:{
+				threaten:1.5,
+				expose:0.2,
+			}
+		},
 		yujian:{
 			enable:'phaseUse',
 			viewAs:{name:'wanjian'},
@@ -2318,6 +2391,10 @@ character.xianjian={
 		pal_changqing:'长卿',
 		pal_xuanxiao:'玄霄',
 
+		feixia:'飞霞',
+		feixia_info:'出牌阶段限一次，你可以弃置一张红色牌视为对一名随机敌人使用一张不计入出杀次数的杀',
+		lueying:'掠影',
+		lueying_info:'每当你使用一张杀，你可以随机获得目标的一张牌，然后目标可以指定一名其他角色，你弃置该角色一张牌（每回合限发动一次，没有弃牌目标时无法发动）',
 		feng:'风',
 		feng_info:'锁定技，当你累计摸2次牌后，你下一次摸牌时摸牌数+1',
 		ya:'雅',

game/game.js

@@ -55,7 +55,7 @@
 	};
 	var lib={
 		configprefix:'noname_0.9_',
-        versionOL:15,
+        versionOL:16,
         sourceURL:'https://rawgit.com/libccy/noname/$version$/',
         updateURL:'https://raw.githubusercontent.com/libccy/noname/$version$/',
 		assetURL:'',
@@ -14842,7 +14842,7 @@
                 forced:true,
                 popup:false,
                 silent:true,
-                priority:-50,
+                priority:-25,
                 content:function(){
                     player.removeSkill('counttrigger');
                     delete player.storage.counttrigger;

game/update.js

@@ -10,6 +10,7 @@ window.noname_update={
         'game/asset.js',
         'card/hearth.js',
         'card/swd.js',
+        'card/guozhan.js',
         'character/rank.js',
         'character/ow.js',
         'character/hearth.js',
@@ -20,6 +21,7 @@ window.noname_update={
         'character/swd.js',
         'character/yxs.js',
         'character/yijiang.js',
+        'character/extra.js',
         'mode/boss.js',
         'mode/versus.js',
         // 'mode/guozhan.js',