From b6d7bdac423e0633537ab62b0dcc5f81884606d4 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Wed, 13 Sep 2023 19:21:30 +0800
Subject: [PATCH] game.cardsGotoPile

---
 character/refresh.js  | 18 +++++----
 character/standard.js | 16 ++++----
 game/game.js          | 90 +++++++++++++++++++++++++++++++++----------
 3 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/character/refresh.js b/character/refresh.js
index 654bfc5d3..acd3ad9b8 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -11859,22 +11859,24 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var top=result.moved[0];
 					var bottom=result.moved[1];
 					top.reverse();
-					for(var i=0;i<top.length;i++){
-						ui.cardPile.insertBefore(top[i],ui.cardPile.firstChild);
-					}
-					for(i=0;i<bottom.length;i++){
-						ui.cardPile.appendChild(bottom[i]);
-					}
+					game.cardsGotoPile(
+						top.concat(bottom),
+						['top_cards',top],
+						function(event,card){
+							if(event.top_cards.includes(card)) return ui.cardPile.firstChild;
+							return null;
+						}
+					)
 					if(event.triggername=='phaseZhunbeiBegin'&&top.length==0){
 						player.addTempSkill('reguanxing_on');
 					}
 					player.popup(get.cnNumber(top.length)+'上'+get.cnNumber(bottom.length)+'下');
 					game.log(player,'将'+get.cnNumber(top.length)+'张牌置于牌堆顶');
-					game.updateRoundNumber();
+					"step 2"
 					game.delayx();
 				},
 				subSkill:{
-					on:{}
+					on:{charlotte:true}
 				}
 			},
 			reluoshen:{
diff --git a/character/standard.js b/character/standard.js
index 8b0a539ea..c47133cdd 100755
--- a/character/standard.js
+++ b/character/standard.js
@@ -1166,15 +1166,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var top=result.moved[0];
 					var bottom=result.moved[1];
 					top.reverse();
-					for(var i=0;i<top.length;i++){
-						ui.cardPile.insertBefore(top[i],ui.cardPile.firstChild);
-					}
-					for(i=0;i<bottom.length;i++){
-						ui.cardPile.appendChild(bottom[i]);
-					}
+					game.cardsGotoPile(
+						top.concat(bottom),
+						['top_cards',top],
+						function(event,card){
+							if(event.top_cards.includes(card)) return ui.cardPile.firstChild;
+							return null;
+						}
+					)
 					player.popup(get.cnNumber(top.length)+'上'+get.cnNumber(bottom.length)+'下');
 					game.log(player,'将'+get.cnNumber(top.length)+'张牌置于牌堆顶');
-					game.updateRoundNumber();
+					"step 2"
 					game.delayx();
 				},
 				ai:{
diff --git a/game/game.js b/game/game.js
index 9ef06116c..b7438fcd7 100644
--- a/game/game.js
+++ b/game/game.js
@@ -12575,6 +12575,18 @@
 						game.updateRenku();
 					}
 				},
+				cardsGotoPile:function(){
+					if(event.washCard){
+						event.trigger('washCard')
+						for(var i=0;i<lib.onwash.length;i++){
+							if(lib.onwash[i]()=='remove'){
+								lib.onwash.splice(i--,1);
+							}
+						}
+					}
+					game.getGlobalHistory().cardMove.push(event);
+					if(!event._triggeronly) game.$cardsGotoPile(event);
+				},
 				chooseToEnable:function(){
 					'step 0'
 					var list=[];
@@ -18283,16 +18295,16 @@
 								}
 							}
 							if(event.insert_index){
-								event.position.insertBefore(cards[i],event.insert_index(event,cards[i]));
 								cards[i].fix();
+								event.position.insertBefore(cards[i],event.insert_index(event,cards[i]));
 							}
 							else if(event.insert_card){
-								event.position.insertBefore(cards[i],event.position.firstChild);
 								cards[i].fix();
+								event.position.insertBefore(cards[i],event.position.firstChild);
 							}
 							else if(event.position==ui.cardPile){
-								event.position.appendChild(cards[i]);
 								cards[i].fix();
+								event.position.appendChild(cards[i]);
 							}
 							else cards[i].goto(event.position);
 						}
@@ -32771,6 +32783,58 @@
 			next.setContent('cardsGotoSpecial');
 			return next;
 		},
+		cardsGotoPile:function(){
+			const cards=[];
+			const next=game.createEvent('cardsGotoPile');
+			next.cards=cards;
+			for(let i=0;i<arguments.length;i++){
+				let arg=arguments[i],itemtype=get.itemtype(arg);
+				if(itemtype=='cards'){
+					cards.addArray(arg);
+				}
+				else if(itemtype=='card'){
+					cards.add(arg);
+				}
+				else if(typeof arg=='function'){
+					next.insert_index=arg;
+				}
+				else if(typeof arg=='string'){
+					if(arg=='insert') next.insert_card=true;
+					else if(arg=='washCard') next.washCard=true;
+					else if(arg=='triggeronly') next._triggeronly=true;
+				}
+				else if(Array.isArray(arg)&&arg.length==2&&typeof arg[0]=='string'){
+					next.set(arg[0],arg[1]);
+				}
+			}
+			if(!cards.length){
+				_status.event.next.remove(next);
+			}
+			else{
+				next.setContent('cardsGotoPile');
+				if(next._triggeronly) game.$cardsGotoPile(next);
+			}
+			return next;
+		},
+		$cardsGotoPile:function(event){
+			const cards=event.cards;
+			const pile=ui.cardPile;
+			for(let i=0;i<cards.length;i++){
+				if(event.insert_index){
+					cards[i].fix();
+					pile.insertBefore(cards[i],event.insert_index(event,cards[i]));
+				}
+				else if(event.insert_card){
+					cards[i].fix();
+					pile.insertBefore(cards[i],pile.firstChild);
+				}
+				else{
+					cards[i].fix();
+					pile.appendChild(cards[i]);
+				}
+			}
+			game.updateRoundNumber();
+		},
 		online:false,
 		onlineID:null,
 		onlineKey:null,
@@ -54450,11 +54514,6 @@
 					}
 					game.shuffleNumber++;
 					var cards=[],i;
-					for(var i=0;i<lib.onwash.length;i++){
-						if(lib.onwash[i]()=='remove'){
-							lib.onwash.splice(i--,1);
-						}
-					}
 					if(_status.discarded){
 						_status.discarded.length=0;
 					}
@@ -54468,10 +54527,7 @@
 						cards.push(currentcard);
 					}
 					cards.randomSort();
-					for(var i=0;i<cards.length;i++){
-						ui.cardPile.appendChild(cards[i]);
-					}
-					if(_status.event.trigger) _status.event.trigger('washCard');
+					game.cardsGotoPile(cards,'triggeronly','washCard')
 				}
 				if(ui.cardPile.hasChildNodes()==false){
 					game.over('平局');
@@ -55947,11 +56003,6 @@
 					}
 					game.shuffleNumber++;
 					var cards=[],i;
-					for(var i=0;i<lib.onwash.length;i++){
-						if(lib.onwash[i]()=='remove'){
-							lib.onwash.splice(i--,1);
-						}
-					}
 					if(_status.discarded){
 						_status.discarded.length=0;
 					}
@@ -55965,10 +56016,7 @@
 						cards.push(currentcard);
 					}
 					cards.randomSort();
-					for(var i=0;i<cards.length;i++){
-						ui.cardPile.appendChild(cards[i]);
-					}
-					if(_status.event.trigger) _status.event.trigger('washCard');
+					game.cardsGotoPile(cards,'triggeronly','washCard')
 				}
 				if(ui.cardPile.hasChildNodes()==false){
 					game.over('平局');