more bug fix

character/ddd.js

@@ -1262,7 +1262,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							if(!evt||evt.player!=player) return false;
 							return player.getHistory('useCard',function(evtx){
 								return evtx.getParent('phaseUse')==evt;
-							},event).length==2;
+							},event).length==3;
 						},
 						forced:true,
 						charlotte:true,
@@ -1862,7 +1862,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				trigger:{global:'useCardAfter'},
 				frequent:true,
 				filter:function(event,player){
-					return event.card.storage&&event.card.storage._3dfusi_owner==player&&!player.hasCard(function(card){
+					return event.card.storage&&event.card.storage._dddfusi_owner==player&&!player.hasCard(function(card){
 						return !card.hasGaintag('dddxujing_tag');
 					},'h');
 				},

character/rank.js

@@ -1657,6 +1657,12 @@ window.noname_character_rank={
 			'tw_niufudongxie',
 			'tw_shen_lvmeng',
 			'zhangjinyun',
+			'sunwukong',
+			'libai',
+			'old_lingju',
+			'wu_zhugeliang',
+			'yue_caiwenji',
+			'clan_zhongyan',
 			'key_tomoya',
 			'key_masato',
 			'key_shiorimiyuki',
@@ -1882,6 +1888,20 @@ window.noname_character_rank={
 			'dc_ruiji',
 			'xia_zhaoe',
 			'duanqiaoxiao',
+			'longwang',
+			'taoshen',
+			'xiaoyuehankehan',
+			'zhutiexiong',
+			'sunyang',
+			'yeshiwen',
+			'ganfurenmifuren',
+			'ruanji',
+			'zhangxuan',
+			'zhangchu',
+			'dc_sunhanhua',
+			'dc_wangjun',
+			'zhanghua',
+			'lushi',
 			'key_kano',
 			'key_haruko',
 			'key_akiko',
@@ -2357,6 +2377,15 @@ window.noname_character_rank={
 			'ol_yanwen',
 			'yanghong',
 			're_zhuzhi',
+			'dongguiren',
+			'xielingyu',
+			'liupi',
+			'xianglang',
+			'furongfuqian',
+			'zhenghun',
+			'clan_wangling',
+			'clan_wangyun',
+			'quhuang',
 		],
 		junk:[
 			'sunshao',
@@ -2401,6 +2430,7 @@ window.noname_character_rank={
 			'junk_duanwei',
 			'zerong',
 			'std_panfeng',
+			're_caochong',
 		],
 	}
 };

character/sp.js

@@ -2205,7 +2205,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						trigger:{source:'damageBegin1'},
 						charlotte:true,
 						forced:true,
-						onremove:true,
+						onremove:['olkangrui_add','olkangrui_nil'],
 						filter:function(event,player){
 							return player.hasMark('olkangrui_add');
 						},

character/xianding.js

@@ -1383,7 +1383,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.goto(3);
 					'step 2'
 					if(get.position(card)=='h'&&get.owner(card)==player&&player.hasUseTarget(card)){
-						player.chooseUseTarget(card,true);
+						if(get.name(card,player)=='sha') player.chooseUseTarget(card,true,false);
+						else player.chooseUseTarget(card,true);
 					}
 					'step 3'
 					if(player.hasHistory('useCard',evt=>{
@@ -3455,9 +3456,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				group:'dcfengying_record',
 				locked:false,
 				filter:function(event,player){
-					return player.storage.dcfengying&&player.storage.dcfengying.length&&player.storage.dcfengying.filter(name=>{
+					var mark=player.countMark('dclingfang');
-						return event.filterCard({name:name},player,event);
+					if(mark<=0||!player.hasCard(card=>get.number(card)<=mark,'hs')) return false;
-					}).length&&!player.hasSkill('dcfengying_used');
+					var storage=player.getStorage('dcfengying');
+					if(!storage.length) return false;
+					var storage2=player.getStorage('dcfengying_used')
+					return storage.some(name=>{
+						return !storage2.contains(name)&&event.filterCard({name:name},player,event);
+					});
 				},
 				hiddenCard:function(player,name){
 					var list=player.getStorage('dcfengying');