Merge pull request #834 from copcap/dev

新杀凌操；bug修复

character/huicui.js

@@ -4,6 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'huicui',
 		connect:true,
 		character:{
+			dc_lingcao:['male','wu','4/5',['dcdufeng']],
 			yue_xiaoqiao:['female','wu',3,['dcqiqin','dcweiwan']],
 			dc_dongzhao:['male','wei',3,['dcyijia','dcdingji']],
 			kuaiqi:['male','wei',3,['dcliangxiu','dcxunjie']],
@@ -97,7 +98,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			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_zhilan:['liuyong','wanniangongzhu','zhanghu','lvlingqi','tenggongzhu','panghui','dc_zhaotongzhaoguang','yuantanyuanxiyuanshang','yuechen'],
+				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'],
 				sp_jianghu:['guanning','huzhao','dc_huangchengyan','mengjie'],
@@ -111,6 +112,55 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			}
 		},
 		skill:{
+			//凌操
+			dcdufeng:{
+				audio:2,
+				trigger:{player:'phaseUseBegin'},
+				forced:true,
+				async content(event,trigger,player){
+					const list=[];
+					for(let i=1;i<6;i++){
+						if(player.isDisabled(i)) continue;
+						list.push('equip'+i);
+					}
+					list.push('cancel2');
+					const next=player.chooseControl(list);
+					next.set('prompt','独锋：请废除一个装备栏，或点击“取消”失去1点体力');
+					next.set('ai',()=>{
+						const list=get.event().list.slice(),player=get.player();
+						if(player.hp<=2&&list.length>1) list.remove('cancel2');
+						const listx=list.filter(subtype=>!player.getEquips(subtype).length);
+						if(listx.length) return listx.randomGet();
+						return list.randomGet();
+					})
+					next.set('list',list);
+					const {result}=await next;
+					if(result.control=='cancel2') await player.loseHp();
+					else await player.disableEquip(result.control);
+					if(!player.isIn()) return;
+					const num=Math.min(player.countDisabled()+player.getDamagedHp(),player.maxHp);
+					await player.draw(num);
+					player.addTempSkill('dcdufeng_effect');
+					player.addMark('dcdufeng_effect',num,false);
+				},
+				subSkill:{
+					effect:{
+						charlotte:true,
+						onremove:true,
+						intro:{
+							content:'本回合攻击范围与使用【杀】的次数上限均为#',
+						},
+						mod:{
+							attackRangeBase(player,num){
+								return player.countMark('dcdufeng_effect');
+							},
+							cardUsable(card,player,num){
+								if(card.name=='sha') return player.countMark('dcdufeng_effect');
+							},
+						},
+					}
+				},
+			},
 			//小乔
 			dcqiqin:{
 				audio:2,
@@ -11088,6 +11138,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			liuyong:['liuyong','jsrg_liuyong'],
 			zhangxuan:['zhangxuan','jsrg_zhangxuan'],
 			gaoxiang:['gaoxiang','jsrg_gaoxiang'],
+			lingcao:['lingcao','dc_lingcao'],
 		},
 		translate:{
 			re_panfeng:'潘凤',
@@ -11551,6 +11602,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			dcqiqin_info:'锁定技。①游戏开始时，你将所有手牌标记为“琴”。②你的“琴”牌不计入手牌上限。③准备阶段，你获得弃牌堆中所有你标记过的“琴”牌。',
 			dcweiwan:'媦婉',
 			dcweiwan_info:'出牌阶段限一次，你可以弃置一张“琴”并随机获得一名其他角色区域内花色与此牌不相同的牌各一张，若你获得了：一张牌，其失去1点体力；两张牌，本回合你对其使用牌无距离和次数限制；三张牌，本回合你不能对其使用牌。',
+			dc_lingcao:'新杀凌操',
+			dc_lingcao_prefix:'新杀',
+			dcdufeng:'独锋',
+			dcdufeng_info:'锁定技。出牌阶段开始时，你失去1点体力或废除一个装备栏，摸X张牌，然后你的攻击范围与使用【杀】的次数上限均为X直到回合结束（X为你已废除的装备栏数与损失的体力值之和，至多为你的体力上限）。',
 
 			sp_baigei:'无双上将',
 			sp_caizijiaren:'才子佳人',

character/jsrg.js

@@ -8208,6 +8208,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			jsrg_fanjiangzhangda_prefix:'转',
 			jsrgfushan:'负山',
 			jsrgfushan_info:'出牌阶段开始时，所有其他角色可以依次交给你一张牌并令你此阶段使用【杀】的次数上限+1。此阶段结束时，若你使用【杀】的次数未达到上限且此阶段以此法交给你牌的角色均存活，你失去2点体力，否则你将手牌摸至体力上限。',
+			//江山如故·合
 			jsrg_zhugeliang:'梦诸葛亮',
 			jsrg_zhugeliang_prefix:'梦',
 			jsrgwentian:'问天',

character/rank.js

@@ -129,6 +129,7 @@ window.noname_character_rank={
 		'caoxian',
 		'sb_guanyu',
 		'mb_chengui',
+		'jsrg_guozhao',
 		'sb_caopi',
 	],
 	a:[
@@ -355,6 +356,8 @@ window.noname_character_rank={
 		'ol_jianyong',
 		'ol_sb_jiangwei',
 		'dc_sb_zhouyu',
+		'dc_lingcao',
+		'jsrg_zhugeliang',
 	],
 	am:[
 		'muludawang',
@@ -650,6 +653,9 @@ window.noname_character_rank={
 		'zhugeruoxue',
 		'dc_sb_lusu',
 		'mb_huban',
+		'jsrg_simayi',
+		'jsrg_zhaoyun',
+		'jsrg_zhangxuan',
 	],
 	bp:[
 		'xin_huojun',
@@ -1020,6 +1026,13 @@ window.noname_character_rank={
 		'sunhuan',
 		'yue_caiyong',
 		'sb_huangyueying',
+		'jsrg_jiangwei',
+		'jsrg_luxun',
+		'jsrg_caofang',
+		'jsrg_guoxun',
+		'jsrg_gaoxiang',
+		'jsrg_sunlubansunluyu',
+		'jsrg_weiwenzhugezhi',
 	],
 	b:[
 		'liyi',
@@ -1336,6 +1349,8 @@ window.noname_character_rank={
 		'lvboshe',
 		'ol_caozhang',
 		'ol_lingtong',
+		'jsrg_liuyong',
+		'jsrg_sunjun',
 	],
 	bm:[
 		'diy_xizhenxihong',

character/tw.js

@@ -8340,6 +8340,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					effect:{
 						intro:{content:'使用下一张牌时弃置&张牌'},
 						charlotte:true,
+						onremove:true,
 						audio:'twchayi',
 						trigger:{player:'useCard'},
 						forced:true,