From 501bbe7b6428e260158909385f6622c4acae58ad Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Sat, 9 Sep 2023 13:23:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=99=BD=E9=93=B6=E7=8B=AE=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 card/extra.js       | 40 ++++++++++++++++++++++++++--------------
 character/mobile.js | 42 +++++++++++++++++++++++++++---------------
 2 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/card/extra.js b/card/extra.js
index 8ed23ed07..75c0962b5 100644
--- a/card/extra.js
+++ b/card/extra.js
@@ -453,20 +453,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				subtype:'equip2',
 				loseDelay:false,
 				onLose:function(){
-					var next=game.createEvent('baiyin_recover');
-					event.next.remove(next);
-					var evt=event.getParent();
-					if(evt.getlx===false) evt=evt.getParent();
-					evt.after.push(next);
-					next.player=player;
-					next.setContent(function(){
-						if(player.isDamaged()) player.logSkill('baiyin_skill');
-						player.recover();
-					});
-				},
-				filterLose:function(card,player){
-					if(player.hasSkillTag('unequip2')) return false;
-					return true;
+					player.addTempSkill('baiyin_skill_lose')
 				},
 				skills:['baiyin_skill'],
 				tag:{
@@ -865,6 +852,31 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					trigger.num=1;
 				},
+				subSkill:{
+					lose:{
+						audio:'baiyin_skill',
+						forced:true,
+						charlotte:true,
+						equipSkill:true,
+						trigger:{
+							player:'loseAfter',
+							global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
+						},
+						filter:(event,player)=>{
+							if(player.isHealthy()||player.hasSkillTag('unequip2')) return false;
+							var evt=event.getl(player);
+							return evt&&evt.es.some(card=>card.name=='baiyin')
+						},
+						content:function(){
+							var evt=trigger.getl(player);
+							evt.es.forEach(card=>{
+								if(card.name=='baiyin'){
+									player.recover();
+								}
+							})
+						},
+					},
+				},
 				ai:{
 					filterDamage:true,
 					skillTagFilter:function(player,tag,arg){
diff --git a/character/mobile.js b/character/mobile.js
index 263ba72d9..cfe81c095 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -262,23 +262,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				//cardimage:"baiyin",
 				type:"equip",
 				subtype:"equip2",
-				filterLose:function(card,player){
-					if(player.hasSkillTag('unequip2')) return false;
-					return true;
-				},
 				loseDelay:false,
 				onLose:function(){
-					var next=game.createEvent('rewrite_baiyin_recover');
-					event.next.remove(next);
-					var evt=event.getParent();
-					if(evt.getlx===false) evt=evt.getParent();
-					evt.after.push(next);
-					next.player=player;
-					next.setContent(function(){
-						player.logSkill('rw_baiyin_skill');
-						player.draw(2);
-						player.recover();
-					});
+					player.addTempSkill('rw_baiyin_skill_lose')
 				},
 				skills:["rw_baiyin_skill"],
 				tag:{
@@ -11576,6 +11562,32 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			"rw_baiyin_skill":{
 				inherit:"baiyin_skill",
 				audio:true,
+				subSkill:{
+					lose:{
+						audio:'rw_baiyin_skill',
+						forced:true,
+						charlotte:true,
+						equipSkill:true,
+						trigger:{
+							player:'loseAfter',
+							global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
+						},
+						filter:(event,player)=>{
+							if(player.hasSkillTag('unequip2')) return false;
+							var evt=event.getl(player);
+							return evt&&evt.es.some(card=>card.name=='rewrite_baiyin')
+						},
+						content:function(){
+							var evt=trigger.getl(player);
+							evt.es.forEach(card=>{
+								if(card.name=='rewrite_baiyin'){
+									player.recover();
+									player.draw(2);
+								}
+							})
+						},
+					},
+				},
 			},
 			"rw_lanyinjia":{
 				inherit:"lanyinjia",