孔融（十周年）

character/huicui.js

@@ -4,6 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'huicui',
 		connect:true,
 		character:{
+			kongrong:['male','qun',3,['dckrmingshi','lirang']],
 			dc_sp_menghuo:['male','qun',4,['dcmanwang']],
 			dc_lingcao:['male','wu','4/5',['dcdufeng']],
 			yue_xiaoqiao:['female','wu',3,['dcqiqin','dcweiwan']],
@@ -98,7 +99,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		characterSort:{
 			huicui:{
 				sp_baigei:['re_panfeng','xingdaorong','caoxing','re_chunyuqiong','xiahoujie','dc_caiyang','zhoushan'],
-				sp_caizijiaren:['re_dongbai','re_sunluyu','heyan','zhaoyan','wangtao','wangyue','zhangxuan','tengyin','zhangyao','xiahoulingnv','dc_sunru','pangshanmin','kuaiqi'],
+				sp_caizijiaren:['kongrong','re_dongbai','re_sunluyu','heyan','zhaoyan','wangtao','wangyue','zhangxuan','tengyin','zhangyao','xiahoulingnv','dc_sunru','pangshanmin','kuaiqi'],
 				sp_zhilan:['liuyong','wanniangongzhu','zhanghu','lvlingqi','tenggongzhu','panghui','dc_zhaotongzhaoguang','yuantanyuanxiyuanshang','yuechen','dc_lingcao'],
 				sp_guixin:['re_kanze','re_chendeng','caimaozhangyun','dc_lvkuanglvxiang','dc_gaolan','yinfuren','chengui','chenjiao','dc_sp_jiaxu','qinlang','dc_dongzhao'],
 				sp_daihan:['mamidi','dc_jiling','zhangxun','dc_yuejiu','wanglie','leibo','qiaorui','dongwan','yuanyin'],
@@ -113,6 +114,43 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			}
 		},
 		skill:{
+			//孔融
+			dckrmingshi:{
+				audio:'kongrong',
+				trigger:{player:'damageBegin4'},
+				filter(event,player){
+					return event.source&&event.source.countCards('h')>player.countCards('h');
+				},
+				forced:true,
+				logTarget:'source',
+				async content(event,trigger,player){
+					const target=trigger.source;
+					const {result:{bool}}=await target.chooseToDiscard('名士：弃置一张手牌，或防止对'+get.translation(player)+'造成的伤害').set('ai',card=>{
+						if(get.event('goon')) return 0;
+						return 6-get.value(card);
+					}).set('goon',get.damageEffect(player,target,target)<=0);
+					if(!bool) trigger.decrease('num');
+				},
+				ai:{
+					effect:{
+						target_use(card,player,target,current){
+							if(get.tag(card,'damage')&&target!=player){
+								if(_status.event.name=='dckrmingshi') return;
+								if(get.attitude(player,target)>0&&current<0) return 'zerotarget';
+								var bs=player.getCards('h');
+								bs.remove(card);
+								if(card.cards) bs.removeArray(card.cards);
+								else bs.removeArray(ui.selected.cards);
+								if(bs.length>target.countCards('h')){
+									if(bs.some(bsi=>get.value(bsi)<7)) return [1,0,1,-0.5];
+									return [1,0,0.3,0];
+								}
+								return [1,0,1,-0.5];
+							}
+						},
+					},
+				},
+			},
 			//新服SP孟获
 			dcmanwang:{
 				audio:'spmanwang',
@@ -11715,6 +11753,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			dcmanwang_info:'出牌阶段，你可以弃置任意张牌。然后你依次执行以下选项中的前X项：⒈获得〖叛侵〗。⒉摸一张牌。⒊回复1点体力。⒋摸两张牌并失去〖叛侵〗。',
 			dcpanqin:'叛侵',
 			dcpanqin_info:'出牌阶段或弃牌阶段结束时，你可将你于本阶段内弃置且位于弃牌堆的所有牌当做【南蛮入侵】使用。然后若此牌被使用时对应的实体牌数不大于此牌的目标数，则你执行并移除〖蛮王〗中的最后一个选项，然后加1点体力上限并回复1点体力。',
+			kongrong:'孔融',
+			dckrmingshi:'名士',
+			dckrmingshi_info:'锁定技，当你受到其他角色造成的伤害时，若其手牌数大于你，则其需弃置一张手牌，否则此伤害-1。',
 
 			sp_baigei:'无双上将',
 			sp_caizijiaren:'才子佳人',

character/offline.js

@@ -11,7 +11,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				offline_yijiang:['ol_xinxianying'],
 				offline_luanwu:["ns_lijue","ns_zhangji","ns_fanchou"],
 				offline_yongjian:["ns_chendao","yj_caoang","yj_caocao",'yj_liru','yj_caohong','yj_zhangfei','yongjian_ganning','yj_dongzhuo','yj_xuyou','yj_jiaxu','yj_zhenji'],
-				offline_piracyE:['shen_jiaxu','pe_wangyun','pe_zhonghui','pe_sunchen','pe_mengda','pe_wenqin','ns_caoanmin','jiangfei','chendong','jiangqing','kongrong','jiling','tianfeng','mateng'],
+				offline_piracyE:['shen_jiaxu','pe_wangyun','pe_zhonghui','pe_sunchen','pe_mengda','pe_wenqin','ns_caoanmin','jiangfei','chendong','jiangqing','zy_kongrong','jiling','tianfeng','mateng'],
 				offline_piracyS:['ns_jiaxu','longyufei','ps_guanyu','ps1059_guojia','ps2070_guojia','ps2063_zhaoyun','ps2067_zhaoyun','ps1062_zhouyu','ps2080_zhouyu','ps_caozhi','ps_jin_simayi','ps_caopi','ps_simayi','ps2068_simayi','ps_machao','ps_zhugeliang','ps2066_zhugeliang','ps_jiaxu','ps_lvbu','ps_shen_machao','jsp_liubei'],
 				offline_piracyK:['pk_sp_duyu'],
 				offline_vtuber:['vtb_xiaosha','vtb_xiaoshan','vtb_xiaotao','vtb_xiaole','vtb_xiaojiu'],
@@ -33,7 +33,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			mateng:['male','qun',4,['mashu','xiongyi']],
 			tianfeng:['male','qun',3,['sijian','gzsuishi']],
 			jiling:['male','qun',4,['shuangren']],
-			kongrong:['male','qun',3,['zymingshi','lirang']],
+			zy_kongrong:['male','qun',3,['zymingshi','lirang']],
 			chendong:['male','wu',4,['duanxie','fenming']],
 			jiangqing:['male','wu',4,['zyshangyi']],
 			jiangfei:['male','shu',3,['reshengxi','shoucheng']],
@@ -6802,8 +6802,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			tianfeng_prefix:'战役篇',
 			jiling:'战役篇纪灵',
 			jiling_prefix:'战役篇',
-			kongrong:'战役篇孔融',
-			kongrong_prefix:'战役篇',
+			zy_kongrong:'战役篇孔融',
+			zy_kongrong_prefix:'战役篇',
 			mateng:'战役篇马腾',
 			mateng_prefix:'战役篇',
 

character/rank.js

@@ -47,6 +47,7 @@ window.noname_character_rank={
 		'sb_machao',
 		'dc_zhouxuān',
 		'key_iriya',
+		'dc_zhaoyun',
 	],
 	ap:[
 		'xia_guanyu',
@@ -1364,6 +1365,7 @@ window.noname_character_rank={
 		'xia_shie',
 	],
 	bm:[
+		'kongrong',
 		'diy_xizhenxihong',
 		'ns_nanhua_left',
 		'ns_nanhua_right',
@@ -1663,6 +1665,11 @@ window.noname_character_rank={
 	],
 	rarity:{
 		legend:[
+			'dc_zhaoyun',
+			'dc_caocao',
+			'dc_liubei',
+			'dc_sunquan',
+			'dc_sunce',
 			'xia_yuzhenzi',
 			'xia_guanyu',
 			'swd_muyun',

character/shiji.js

@@ -6532,7 +6532,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			qiaogong:['qiaogong','tw_qiaogong'],
 			sp_chendong:['sp_chendong','tw_chendong','chendong'],
 			sp_jiangqing:['sp_jiangqing','tw_jiangqing','jiangqing'],
-            kongrong:['sp_kongrong','jsrg_kongrong','kongrong'],
+            kongrong:['sp_kongrong','jsrg_kongrong','kongrong','zy_kongrong'],
 			dc_mifuren:['dc_mifuren','sp_mifuren'],
 		},
 		translate:{
@@ -6560,6 +6560,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sp_wangcan_prefix:'手杀',
 			sp_sunshao_prefix:'手杀',
 			sp_xunchen_prefix:'手杀',
+			sp_kongrong_prefix:'手杀',
 
 			sp_wangcan:'手杀王粲',
 			spqiai:'七哀',
@@ -6688,7 +6689,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			rechuhai_info:'使命技。①出牌阶段限一次，你可以摸一张牌，然后和一名其他角色拼点。若你赢，则你观看其手牌，并从牌堆/弃牌堆中获得其手牌中包含的类型的牌各一张，且当你于此阶段内对其造成伤害后，你将牌堆/弃牌堆中的一张装备牌置于你的一个空置装备栏内。②当你因发动〖除害①〗而展示拼点牌时，你令此牌的点数+X（X=(4-你装备区的牌数)）。③使命：当有装备牌进入你的装备区后，若你的装备区内有至少三张牌，则你将体力值回复至上限，失去〖乡害〗并获得〖彰名〗。④失败：当你因发动〖除害①〗发起的拼点没赢时，若你的最终点数不大于6，则你触发使命失败分支。',
 			zhangming:'彰名',
 			zhangming_info:'锁定技。①你使用的♣牌不能被其他角色响应。②每回合限一次，当你对其他角色造成伤害后，你随机弃置其一张手牌，然后你从牌堆或弃牌堆中获得与其展示牌类型不同类型的牌各一张（若其没有手牌，则你改为从牌堆或弃牌堆中获得所有类型牌各一张），且以此法得到的牌不计入本回合的手牌上限。',
-			sp_kongrong:'孔融',
+			sp_kongrong:'手杀孔融',
 			spmingshi:'名士',
 			spmingshi_info:'锁定技，当你受到1点伤害后，伤害来源弃置一张牌。',
 			splirang:'礼让',