v1.10.1

v1.10.1

card/extra.js

@@ -453,20 +453,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				subtype:'equip2',
 				loseDelay:false,
 				onLose:function(){
-					var next=game.createEvent('baiyin_recover');
-					event.next.remove(next);
-					var evt=event.getParent();
-					if(evt.getlx===false) evt=evt.getParent();
-					evt.after.push(next);
-					next.player=player;
-					next.setContent(function(){
-						if(player.isDamaged()) player.logSkill('baiyin_skill');
-						player.recover();
-					});
-				},
-				filterLose:function(card,player){
-					if(player.hasSkillTag('unequip2')) return false;
-					return true;
+					player.addTempSkill('baiyin_skill_lose')
 				},
 				skills:['baiyin_skill'],
 				tag:{
@@ -865,6 +852,31 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					trigger.num=1;
 				},
+				subSkill:{
+					lose:{
+						audio:'baiyin_skill',
+						forced:true,
+						charlotte:true,
+						equipSkill:true,
+						trigger:{
+							player:'loseAfter',
+							global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
+						},
+						filter:(event,player)=>{
+							if(player.isHealthy()||player.hasSkillTag('unequip2')) return false;
+							var evt=event.getl(player);
+							return evt&&evt.es.some(card=>card.name=='baiyin')
+						},
+						content:function(){
+							var evt=trigger.getl(player);
+							evt.es.forEach(card=>{
+								if(card.name=='baiyin'){
+									player.recover();
+								}
+							})
+						},
+					},
+				},
 				ai:{
 					filterDamage:true,
 					skillTagFilter:function(player,tag,arg){

card/guozhan.js

@@ -481,7 +481,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							return 'take_damage';
 						}
 						return 'discard_card';
-					});
+					}).set('prompt','水淹七军').set('prompt2','请选择一项：⒈弃置装备区里的所有牌；⒉受到'+get.translation(player)+'造成的1点雷电伤害。');
 					'step 1'
 					if(result.control=='discard_card'){
 						target.discard(target.getCards('e',function(card){

card/mtg.js

@@ -495,7 +495,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					player.recast(cards,null,(player,cards)=>{
 						var cardsToGain=[];
-						for(let repetition=0;repetition<cards.length;repetition++){
+						for(var repetition=0;repetition<cards.length;repetition++){
 							var card=get.cardPile(card=>get.type(card,'trick')=='trick');
 							if(card) cardsToGain.push(card);
 						}

card/yingbian.js

@@ -239,7 +239,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				type:'equip',
 				subtype:'equip5',
 				loseDelay:false,
-				global:'tianjitu_skill',
+				skills:['tianjitu_skill'],
+				onLose:function(){
+					player.addTempSkill('tianjitu_skill_lose')
+				},
+				loseDelay:false,
 				ai:{
 					value:function(card,player){
 						if(player.countCards('h')>3||get.position(card)!='e') return 0.5;
@@ -374,14 +378,33 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			},
 			tianjitu_skill:{
 				audio:true,
-				trigger:{player:['equipBegin','loseBegin']},
+				trigger:{player:'equipAfter'},
 				forced:true,
 				equipSkill:true,
-				filter:(event,player,name)=>name=='equipBegin'?event.card.name=='tianjitu'&&player.hasCard(card=>card!=event.card):event.cards.some(value=>get.position(value)=='e'&&value.name=='tianjitu')&&player.countCards('h')<5,
+				filter:(event,player)=>event.card.name=='tianjitu'&&player.hasCard(card=>card!=event.card),
 				content:()=>{
-					if(event.triggername=='loseBegin') player.drawTo(5);
-					else player.chooseToDiscard(true,card=>card!=_status.event.getTrigger().card,'he');
-				}
+					player.chooseToDiscard(true,card=>card!=_status.event.getTrigger().card,'he');
+				},
+				subSkill:{
+					lose:{
+						audio:'tianjitu_skill',
+						forced:true,
+						charlotte:true,
+						equipSkill:true,
+						trigger:{
+							player:'loseAfter',
+							global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
+						},
+						filter:(event,player)=>{
+							if(player.countCards('h')>=5) return false;
+							var evt=event.getl(player);
+							return evt&&evt.es.some(card=>card.name=='tianjitu')
+						},
+						content:function(){
+							player.drawTo(5);
+						},
+					},
+				},
 			},
 			taigongyinfu_skill:{
 				equipSkill:true,

card/yongjian.js

@@ -598,7 +598,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					player.showCards(cards,`${get.translation(player)}对${(targets=>{
 						if(get.itemtype(targets)=='player') targets=[targets];
 						if(targets[0]!=player) return get.translation(targets);
-						const selfTargets=targets.slice();
+						var selfTargets=targets.slice();
 						selfTargets[0]='自己';
 						return get.translation(selfTargets);
 					})(logs)}发动了【${get.skillTranslation(event.name,player)}】`);

character/clan.js

@@ -293,7 +293,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var info=get.info(skill);
 					if(info.charlotte) return false;
 					var translation=get.skillInfoTranslation(skill,event.player);
-					if(!translation||translation.match(/“?出牌阶段限一次/g).every(value=>value!='出牌阶段限一次')) return false;
+					if(!translation) return false;
+					var match=translation.match(/“?出牌阶段限一次/g);
+					if(!match||match.every(value=>value!='出牌阶段限一次')) return false;
 					return event.player.countCards('h')>0;
 				},
 				check:function(event,player){
@@ -804,18 +806,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				logTarget:'player',
 				check:function(event,player){
-					if(get.attitude(player,event.player)<4) return false;
-					if(player.countCards('h',function(card){
-						var mod2=game.checkMod(card,player,'unchanged','cardEnabled2',player);
-						if(mod2!='unchanged') return mod2;
-						var mod=game.checkMod(card,player,event.player,'unchanged','cardSavable',player);
-						if(mod!='unchanged') return mod;
-						var savable=get.info(card).savable;
-						if(typeof savable=='function') savable=savable(card,player,event.player);
-						return savable;
-					})>=1-event.player.hp) return false;
-					if(event.player==player||event.player==get.zhu(player)) return true;
-					return !player.hasUnknown();
+					return lib.skill.wanlan.check(event,player);
 				},
 				content:function(){
 					'step 0'
@@ -825,7 +816,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					trigger.player.recover();
 				},
 			},
-			//族王凌
+			//族王淩
 			clanbolong:{
 				audio:2,
 				enable:'phaseUse',
@@ -2365,7 +2356,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			clan_wukuang:'族吴匡',
 			clanlianzhu:'联诛',
 			clanlianzhu_info:'转换技。每名角色Ａ的出牌阶段限一次。阴：Ａ可以重铸一张牌，然后你可以重铸一张牌。若这两张牌颜色不同，则你的手牌上限-1；阳：Ａ可以令你选择一名在你或Ａ攻击范围内的另一名其他角色Ｂ，然后Ａ和你可依次选择是否对Ｂ使用一张【杀】。若这两张【杀】颜色相同，则你的手牌上限+1。',
-			clan_wangling:'族王凌',
+			clan_wangling:'族王淩',
 			clanbolong:'驳龙',
 			clanbolong_info:'出牌阶段限一次。你可以令一名其他角色选择一项：1.你交给其一张牌，然后视为对其使用一张雷【杀】；2.交给你等同于你手牌数的牌，然后视为对你使用一张【酒】。',
 			clanzhongliu:'中流',

character/collab.js

@@ -1025,7 +1025,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							content:function(){
 								var num=lib.skill.ruyijingubang_skill_backup.num;
 								player.storage.ruyijingubang_skill=num;
-								var card=player.getEquips(1);
+								var cards=player.getEquips(1);
 								for(var card of cards){
 									if(card&&card.name=='ruyijingubang'){
 										card.storage.ruyijingubang_skill=num;
@@ -1038,9 +1038,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					},
 				},
 				mod:{
-					attackRange:function(player,range){
-						if(player.storage.ruyijingubang_skill) return range-3+player.storage.ruyijingubang_skill;
-					},
 					cardUsable:function(card,player,num){
 						if(player.storage.ruyijingubang_skill==1&&card.name=='sha') return Infinity;
 					},
@@ -1516,7 +1513,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				subtype:'equip1',
 				skills:['ruyijingubang_skill','ruyijingubang_effect'],
 				equipDelay:false,
-				distance:{attackFrom:-2},
+				distance:{
+					attackFrom:-2,
+					attackRange:(card,player)=>{
+						return (player.storage.ruyijingubang_skill||3);
+					}
+				},
 				onEquip:function(){
 					if(!card.storage.ruyijingubang_skill) card.storage.ruyijingubang_skill=3;
 					player.storage.ruyijingubang_skill=card.storage.ruyijingubang_skill;