外服武将配音补充

character/tw.js

@@ -693,32 +693,47 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			twxiayong:{
 				audio:2,
 				audioname:['tw_yanliang'],
-				trigger:{global:'damageBegin1'},
-				filter(event,player){
-					if(event.getParent().type!='card'||event.card.name!='juedou'||!event.player.isIn()) return false;
-					const evt=game.getGlobalHistory('useCard',evt=>evt.card==event.card)[0];
-					if(evt&&evt.targets&&(event.player!=player||player.countCards('h'))){
-						if(evt.player==player){
-							return evt.targets.includes(event.player)&&event.player!=player;
-						}
-						return evt.targets.includes(player)&&evt.player!=player;
-					}
-					return false;
-				},
-				forced:true,
-				logTarget:'player',
-				async content(event,trigger,player){
-					if(trigger.player===player){
-						const cards=player.getCards('h',card=>{
-							return lib.filter.cardDiscardable(card,player,'twxiayong');
-						});
-						if(cards.length>0) player.discard(cards.randomGet());
-					}
-					else{
-						trigger.increase('num');
-					}
+				locked:true,
+				group:'twxiayong_effect',
+				subSkill:{
+					effect:{
+						trigger:{global:'damageBegin1'},
+						filter(event,player){
+							if(event.getParent().type!='card'||event.card.name!='juedou'||!event.player.isIn()) return false;
+							const evt=game.getGlobalHistory('useCard',evt=>evt.card==event.card)[0];
+							if(evt&&evt.targets&&(event.player!=player||player.countCards('h'))){
+								if(evt.player==player){
+									return evt.targets.includes(event.player)&&event.player!=player;
+								}
+								return evt.targets.includes(player)&&evt.player!=player;
+							}
+							return false;
+						},
+						forced:true,
+						popup:false,
+						async content(event,trigger,player){
+							player.logSkill('twxiayong'+(trigger.player===player?'1':'2'),trigger.player);
+							if(trigger.player===player){
+								const cards=player.getCards('h',card=>{
+									return lib.filter.cardDiscardable(card,player,'twxiayong');
+								});
+								if(cards.length>0) player.discard(cards.randomGet());
+							}
+							else{
+								trigger.increase('num');
+							}
+						},
+					},
 				},
 			},
+			twxiayong1:{
+				audio:true,
+				audioname:['tw_yanliang'],
+				sourceSkill:'twxiayong',
+			},
+			twxiayong2:{
+				inherit:'twxiayong1',
+			},
 			//袁谭
 			twqiaosi:{
 				audio:2,