Merge pull request #655 from mengxinzxz/PR-Branch

small bugfix

character/extra.js

@@ -115,8 +115,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					'虎：使用仅指定唯一目标的牌对目标角色造成的伤害+1',
 					'鹿：回复1点体力并弃置判定区的所有牌；不能成为延时锦囊牌的目标',
 					'熊：受到伤害时，此伤害-1',
-					'猿：出牌阶段开始时，摸两张牌',
-					'鹤：出牌阶段开始时，选择一名角色，随机获得其装备区里的一张牌',
+					'猿：出牌阶段开始时，选择一名角色，随机获得其装备区里的一张牌',
+					'鹤：出牌阶段开始时，摸两张牌',
 				],
 				updateMark:function(player){
 					var wuqinxi=player.storage.wuling_wuqinxi;
@@ -143,11 +143,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						intro:{
 							content:function(storage){
 								var str='<li>当前效果：'+storage;
-								var list=lib.skill.wuling.wuqinxiMap;
-								var list1=list.map(str2=>str2.slice(0,1));
-								var list2=list.map(str2=>str2.slice(2));
+								var list=lib.skill.wuling.wuqinxiMap.map(str2=>str2.slice(2));
 								str+='<br><li>';
-								str+=list2[list1.indexOf(storage)];
+								str+=list[lib.skill.wuling.wuqinxi.indexOf(storage)];
 								return str;
 							},
 						},
@@ -166,8 +164,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							if(event.name=='phase') return true;
 							switch(name){
 								case 'damageBegin1':
-									if(wuqinxi!='虎') return false;
-									return event.card&&event.targets&&event.targets.length==1&&event.targets.includes(event.player);
+									if(wuqinxi!='虎'||!event.card) return false;
+									var evt=event.getParent('useCard');
+									return evt.targets&&evt.targets.length==1&&evt.targets.includes(event.player);
 									break;
 								case 'damageBegin2':
 									return wuqinxi=='熊';
@@ -234,7 +233,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							effect:{
 								target:function(card,player,target){
 									var wuqinxi=target.storage.wuling_wuqinxi;
-									if(!wuqinxi&&wuqinxi!='熊') return;
+									if(!wuqinxi||wuqinxi!='熊') return;
 									if(player.hasSkillTag('jueqing',false,target)) return;
 									var num=get.tag(card,'damage');
 									if(num){
@@ -7809,8 +7808,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			'<br><li>虎：你使用仅指定唯一目标的牌对目标角色造成的伤害+1'+
 			'<br><li>鹿：获得或更换至此效果时，回复1点体力并弃置判定区的所有牌；你不能成为延时锦囊牌的目标'+
 			'<br><li>熊：当你受到伤害时，此伤害-1'+
-			'<br><li>猿：出牌阶段开始时，你摸两张牌'+
-			'<br><li>鹤：出牌阶段开始时，你选择一名角色，随机获得其装备区里的一张牌',
+			'<br><li>猿：出牌阶段开始时，你选择一名角色，随机获得其装备区里的一张牌'+
+			'<br><li>鹤：出牌阶段开始时，你摸两张牌',
 			youyi:'游医',
 			youyi_info:'①弃牌阶段结束时，你可以将所有于此阶段进入弃牌堆的牌置入仁区。②出牌阶段限一次，你可以将仁区的所有牌置入弃牌堆，然后令所有角色各回复1点体力。',
 			

character/refresh.js

@@ -171,9 +171,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		skill:{
 			//界凌统
 			olxuanfeng:{
-				audio:2,
+				audio:'xuanfeng',
+				audioname:['boss_lvbu3'],
 				audioname2:{
 					lingtong:'xuanfeng',
+					ol_lingtong:'rexuanfeng',
 				},
 				trigger:{
 					player:['loseAfter'],
@@ -5222,7 +5224,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			//贾诩
 			rewansha:{
 				audio:'wansha',
-				audioname:['re_jiaxu','shen_simayi','boss_lvbu2'],
+				audioname:['re_jiaxu','shen_simayi','boss_lvbu3'],
 				global:'rewansha_global',
 				trigger:{global:'dyingBegin'},
 				forced:true,

character/sb.js

@@ -364,7 +364,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						filter:function(event,player){
 							return event.player!=player&&player.getStorage('sbkanpo').includes(event.card.name);
 						},
-						prompt:function(event,player){
+						prompt2:function(event,player){
 							return '移除'+get.translation(event.card.name)+'，令'+get.translation(event.card)+'失效';
 						},
 						check:function(event,player){
@@ -414,7 +414,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(cards.length) player.loseToDiscardpile(cards);
 					var bool=player.getAllHistory('useSkill',evt=>evt.skill=='sbguanxing').length>1;
 					var num=Math.min(7,bool?cards.length+1:7);
-					var cards2=get.cards(num+1);
+					var cards2=get.cards(num);
 					player.$gain2(cards2,false);
 					game.log(player,'将',cards2,'置于了武将牌上');
 					player.loseToSpecial(cards2,'sbguanxing').visible=true;

character/sp.js

@@ -9,7 +9,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				sp_sibi:["yangxiu","chenlin","chengyu","shixie","fuwan","wangyun","zhugejin","simalang","maliang","buzhi","dongyun","kanze","sunqian","xizhicai","sunshao",'duxi',"jianggan",'ol_dengzhi','ol_yangyi','ol_dongzhao','ol_chendeng','jin_yanghu','wangyan','xiahouxuan','quhuang','zhanghua','wangguan','sunhong','caoxi'],
 				sp_tianzhu:['zhangyan','niujin','hejin','hansui',"wutugu","yanbaihu","shamoke","zhugedan",'huangzu','gaogan',"tadun","fanjiangzhangda","ahuinan","dongtuna",'ol_wenqin'],
 				sp_nvshi:["lingju","guanyinping","zhangxingcai","mayunlu","dongbai","zhaoxiang",'ol_zhangchangpu',"daxiaoqiao","jin_guohuai"],
-				sp_shaowei:["simahui","zhangbao","zhanglu","zhugeguo","xujing","zhangling",'huangchengyan','zhangzhi','lushi'],
+				sp_shaowei:['lvboshe',"simahui","zhangbao","zhanglu","zhugeguo","xujing","zhangling",'huangchengyan','zhangzhi','lushi'],
 				sp_huben:['duanjiong','ol_mengda',"caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","huojun",'zhaoyǎn','dengzhong','ol_furong','macheng','ol_zhangyì','ol_zhujun','maxiumatie','luoxian','ol_huban','haopu','ol_qianzhao'],
 				sp_liesi:['mizhu','weizi','ol_liuba','zhangshiping'],
 				sp_default:["sp_diaochan","sp_zhaoyun","sp_sunshangxiang","sp_caoren","sp_jiangwei","sp_machao","sp_caiwenji","jsp_guanyu","jsp_huangyueying","sp_pangde","sp_jiaxu","yuanshu",'sp_zhangliao','sp_ol_zhanghe','sp_menghuo'],
@@ -18,7 +18,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				sp_zhongdan:["cuiyan","huangfusong"],
 				sp_guozhan2:["sp_dongzhuo","liqueguosi","zhangren"],
 				sp_others:["hanba","caiyang"],
-				sp_waitforsort:['ol_luyusheng','ol_pengyang','ol_tw_zhangji','ol_feiyi','lvboshe','ol_dingshangwan','ol_liwan'],
+				sp_waitforsort:['ol_luyusheng','ol_pengyang','ol_tw_zhangji','ol_feiyi','ol_dingshangwan','ol_liwan'],
 			},
 		},
 		characterFilter:{

character/yijiang.js

@@ -5477,14 +5477,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 					else{
 						player.addTempSkill('taoluan3');
-						var next=player.loseHp();
-						event.next.remove(next);
-						event.getParent('phase').after.push(next);
+						player.loseHp();
 					}
 				}
 			},
 			taoluan3:{charlotte:true},
 			taoluan4:{
+				audio:'taoluan',
 				prompt:'将一张牌当做闪使用',
 				enable:'chooseToUse',
 				filter:function(event,player){
@@ -14238,11 +14237,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			lianhuo:'链祸',
 			lianhuo_info:'锁定技，当你受到火焰伤害时，若你的武将牌处于横置状态且此伤害不为连环伤害，则此伤害+1。',
 			taoluan:'滔乱',
+			taoluan_backup:'滔乱',
 			taoluan4:'滔乱',
 			taoluan5:'滔乱',
 			taoluan_backup:'滔乱',
-			taoluan_info:'你可以将一张牌当做任意一张基本牌或普通锦囊牌使用（此牌不得是本局游戏你以此法使用过的牌），然后你令一名其他角色选择一项：1.交给你一张与你以此法使用的牌类别不同的牌；2.你于回合结束时失去1点体力且〖滔乱〗无效直到回合结束。',
+			taoluan_info:'你可以将一张牌当做任意一张基本牌或普通锦囊牌使用（此牌不得是本局游戏你以此法使用过的牌），然后你令一名其他角色选择一项：1.交给你一张与你以此法使用的牌类别不同的牌；2.你失去1点体力且〖滔乱〗无效直到回合结束。',
 			xintaoluan:'滔乱',
+			xintaoluan_backup:'滔乱',
 			xintaoluan4:'滔乱',
 			xintaoluan5:'滔乱',
 			xintaoluan_backup:'滔乱',

game/game.js

@@ -27370,8 +27370,19 @@
 				}
 				addSkillLog(skill){
 					this.addSkill(skill);
-					this.popup(skill);
-					game.log(this,'获得了技能','#g【'+get.translation(skill)+'】');
+					if(!Array.isArray(skill)) skill=[skill];
+					skill.forEach(i=>{
+						this.popup(i);
+						game.log(this,'获得了技能','#g【'+get.translation(i)+'】');
+					});
+				}
+				removeSkillLog(skill,popop){
+					this.removeSkill(skill);
+					if(!Array.isArray(skill)) skill=[skill];
+					skill.forEach(i=>{
+						if(popop===true) this.popup(i);
+						game.log(this,'失去了技能','#g【'+get.translation(i)+'】');
+					});
 				}
 				addInvisibleSkill(skill){
 					if(Array.isArray(skill)){
@@ -27859,7 +27870,7 @@
 							this.removeAdditionalSkill(i);
 						}
 					}
-					this.removeSkill(list);
+					this[all?'removeSkill':'removeSkillLog'](list);
 					this.checkConflict();
 					this.checkMarks();
 					return list;

mode/boss.js

@@ -895,7 +895,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				boss_dizangwang:['male','qun',8,['boss_bufo','boss_wuliang','boss_dayuan','boss_diting'],['shu','hiddenboss','bossallowed']],
 				//boss_shikieiki:['female','qun',8,['boss_yingzhong'],['qun','hiddenboss','bossallowed']],
 
-				boss_lvbu1:['male','shen',8,['mashu','wushuang','boss_baonu','boss_jingjia','boss_aozhan'],['qun','boss','bossallowed'],'wei'],
+				boss_lvbu1:['male','shen',8,['mashu','wushuang','boss_baonu','boss_jingjia','boss_aozhan'],['qun','boss','bossallowed'],'qun'],
 				boss_lvbu2:['male','shen',6,['mashu','wushuang','xiuluo','shenwei','shenji'],['qun','hiddenboss','bossallowed'],'qun'],
 				boss_lvbu3:['male','shen',6,['wushuang','shenqu','jiwu'],['qun','hiddenboss','bossallowed'],'qun'],
 
@@ -8551,20 +8551,21 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				}
 			},
 			jiwu:{
+				derivation:['qiangxix','retieji','olxuanfeng','rewansha'],
 				audio:2,
 				enable:'phaseUse',
 				filter:function(event,player){
 					if(player.countCards('h')==0) return false;
 					if(!player.hasSkill('qiangxix')) return true;
 					if(!player.hasSkill('retieji')) return true;
-					if(!player.hasSkill('rexuanfeng')) return true;
-					if(!player.hasSkill('wansha')) return true;
+					if(!player.hasSkill('olxuanfeng')) return true;
+					if(!player.hasSkill('rewansha')) return true;
 					return false;
 				},
 				filterCard:true,
 				position:'he',
 				check:function(card){
-					if(get.position(card)=='e'&&_status.event.player.hasSkill('rexuanfeng')) return 16-get.value(card);
+					if(get.position(card)=='e'&&_status.event.player.hasSkill('olxuanfeng')) return 16-get.value(card);
 					return 7-get.value(card);
 				},
 				content:function(){
@@ -8572,30 +8573,30 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					var list=[];
 					if(!player.hasSkill('qiangxix')) list.push('qiangxix');
 					if(!player.hasSkill('retieji')) list.push('retieji');
-					if(!player.hasSkill('rexuanfeng')) list.push('rexuanfeng');
-					if(!player.hasSkill('wansha')) list.push('wansha');
+					if(!player.hasSkill('olxuanfeng')) list.push('olxuanfeng');
+					if(!player.hasSkill('rewansha')) list.push('rewansha');
 					if(list.length==1){
 						player.addTempSkill(list[0]);
 						event.finish();
 					}
 					else{
 						player.chooseControl(list,function(){
-							if(list.contains('rexuanfeng')&&player.countCards('he',{type:'equip'})) return 'rexuanfeng';
+							if(list.contains('olxuanfeng')&&player.countCards('he',{type:'equip'})) return 'olxuanfeng';
 							if(!player.getStat().skill.qiangxix){
-								if(player.hasSkill('qiangxix')&&player.getEquip(1)&&list.contains('rexuanfeng')) return 'rexuanfeng';
-								if(list.contains('wansha')||list.contains('qiangxix')){
+								if(player.hasSkill('qiangxix')&&player.getEquip(1)&&list.contains('olxuanfeng')) return 'olxuanfeng';
+								if(list.contains('rewansha')||list.contains('qiangxix')){
 									var players=game.filterPlayer();
 									for(var i=0;i<players.length;i++){
 										if(players[i].hp==1&&get.attitude(player,players[i])<0){
-											if(list.contains('wansha')) return 'wansha';
+											if(list.contains('rewansha')) return 'rewansha';
 											if(list.contains('qiangxix')) return 'qiangxix';
 										}
 									}
 								}
 							}
 							if(list.contains('qiangxix')) return 'qiangxix';
-							if(list.contains('wansha')) return 'wansha';
-							if(list.contains('rexuanfeng')) return 'rexuanfeng';
+							if(list.contains('rewansha')) return 'rewansha';
+							if(list.contains('olxuanfeng')) return 'olxuanfeng';
 							return 'retieji';
 						}).set('prompt','选择获得一项技能直到回合结束');
 					}
@@ -8608,8 +8609,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						var player=_status.event.player;
 						if(player.countCards('e',{type:'equip'})) return 10;
 						if(!player.getStat().skill.qiangxix){
-							if(player.hasSkill('qiangxix')&&player.getEquip(1)&&!player.hasSkill('rexuanfeng')) return 10;
-							if(player.hasSkill('wansha')) return 1;
+							if(player.hasSkill('qiangxix')&&player.getEquip(1)&&!player.hasSkill('olxuanfeng')) return 10;
+							if(player.hasSkill('rewansha')) return 1;
 							var players=game.filterPlayer();
 							for(var i=0;i<players.length;i++){
 								if(players[i].hp==1&&get.attitude(player,players[i])<0) return 10;
@@ -8621,8 +8622,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						player:function(player){
 							if(player.countCards('e',{type:'equip'})) return 1;
 							if(!player.getStat().skill.qiangxix){
-								if(player.hasSkill('qiangxix')&&player.getEquip(1)&&!player.hasSkill('rexuanfeng')) return 1;
-								if(!player.hasSkill('wansha')||!player.hasSkill('qiangxix')){
+								if(player.hasSkill('qiangxix')&&player.getEquip(1)&&!player.hasSkill('olxuanfeng')) return 1;
+								if(!player.hasSkill('rewansha')||!player.hasSkill('qiangxix')){
 									var players=game.filterPlayer();
 									for(var i=0;i<players.length;i++){
 										if(players[i].hp==1&&get.attitude(player,players[i])<0) return 1;
@@ -9293,11 +9294,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			shenwei:'神威',
 			shenwei_info:'锁定技，摸牌阶段，你额外摸X张牌，你的手牌上限+X（X为场上其他角色的数目且至多为3）。',
 			xiuluo:'修罗',
-			xiuluo_info:'准备阶段，你可以弃置一张牌，然后弃置你判定区内一张同花色的牌。你可以重复此流程。',
+			xiuluo_info:'准备阶段，你可以弃置一张牌，然后弃置你判定区内一张同花色的牌，然后你可以重复此流程。',
 			shenqu:'神躯',
 			shenqu_info:'每名角色的准备阶段，若你的手牌数少于或等于你的体力上限数，你可以摸两张牌；当你受到伤害后，你可以使用一张【桃】。',
 			jiwu:'极武',
-			jiwu_info:'出牌阶段，你可以弃置一张牌，然后获得一项：“强袭”、“铁骑”(界)、“旋风”、“完杀”，直到回合结束。',
+			jiwu_info:'出牌阶段，你可以弃置一张牌，然后获得获得以下一项技能直到回合结束：〖强袭〗、〖铁骑〗、〖旋风〗、〖完杀〗。',
 			
 			"boss_jingjia":"精甲",
 			"boss_jingjia_info":"锁定技，游戏开始时，将本局游戏中加入的装备随机置入你的装备区。",