From 7984f74a4323f42b7a1a2711614d4aeb602da274 Mon Sep 17 00:00:00 2001
From: copcap <copcap@outlook.com>
Date: Sun, 23 Jul 2023 02:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A9=E6=88=98=E5=BC=83?=
 =?UTF-8?q?=E7=89=8C=E8=A7=86=E4=B8=BA=E9=9D=9E=E8=87=AA=E5=B7=B1=E5=BC=83?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 card/yingbian.js   |  2 +-
 character/extra.js |  2 +-
 character/sp.js    |  6 +++---
 game/game.js       | 17 ++++++++++++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/card/yingbian.js b/card/yingbian.js
index 1a0d39d63..cf75083d8 100644
--- a/card/yingbian.js
+++ b/card/yingbian.js
@@ -678,7 +678,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					if(event.zhuzhanresult){
 						var target=event.zhuzhanresult;
 						target.line(player,'green');
-						target.discard(event.zhuzhanresult2.cards);
+						target.discard(event.zhuzhanresult2.cards).discarder=target;
 						target.popup('助战','wood');
 						game.log(target,'响应了',player,'发起的助战');
 						target.addExpose(0.2);
diff --git a/character/extra.js b/character/extra.js
index 4a1c6edcd..492a76e85 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -2275,7 +2275,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(event.zhuzhanresult){
 						var target=event.zhuzhanresult;
 						target.line(player,'green');
-						target.discard(event.zhuzhanresult2.cards);
+						target.discard(event.zhuzhanresult2.cards).discarder=target;
 						target.draw(2);
 						target.popup('助战','wood');
 						game.log(target,'响应了',player,'发起的助战');
diff --git a/character/sp.js b/character/sp.js
index 03b919fdf..fdb2cb2d4 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -763,10 +763,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						'将势力改为任意一个势力'
 					].map((text,ind)=>{
 						var hint='';
-						if(list.contains(ind+1)){
+						if(list2.contains(ind+1)){
 							return text;
 						}
-						else{
+						else if(!list.contains(ind+1)){
 							hint+='已被执行过且';
 						}
 						if(ind==1&&nochai&&!list2.contains(ind+1)) hint+='无有手牌角色且';
@@ -841,7 +841,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							}
 						},
 						选项三:function(){
-							player.chooseUseTarget('sha',true,false).set('logSkill','olgoude');
+							player.chooseUseTarget('sha',true,false).set('logSkill','olgoude').set('prompt','苟得：选择【杀】的目标');
 						},
 						选项四:function(){
 							'step 0'
diff --git a/game/game.js b/game/game.js
index e2f7133fb..1af569f8a 100644
--- a/game/game.js
+++ b/game/game.js
@@ -10545,6 +10545,7 @@
 				},
 				changeGroup:function(){
 					'step 0'
+					event.originGroup=player.group;
 					if(!event.group) event.group=player.group;
 					var group=event.group;
 					player.getHistory('custom').push(event);
@@ -16210,6 +16211,7 @@
 					game.log(player,'弃置了',cards);
 					event.done=player.lose(cards,event.position,'visible');
 					event.done.type='discard';
+					if(event.discarder) event.done.discarder=event.discarder;
 					"step 1"
 					event.trigger('discard');
 				},
@@ -23662,7 +23664,7 @@
 					this.addSkill(skill,checkConflict,true,true);
 
 					if(!expire){
-						expire='phaseAfter';
+						expire=['phaseAfter','phaseBefore'];
 					}
 					this.tempSkills[skill]=expire;
 
@@ -29055,6 +29057,19 @@
 				content:function(){
 					player.removeSkill('counttrigger');
 					delete player.storage.counttrigger;
+				},
+				group:'counttrigger_2',
+				subSkill:{
+					2:{
+						trigger:{global:'phaseBefore'},
+						silent:true,
+						charlotte:true,
+						priority:100,
+						content:function(){
+							player.removeSkill('counttrigger');
+							delete player.storage.counttrigger;
+						},
+					}
 				}
 			},
 			_recovercheck:{