v1.9.123 (#158)

* change lib.init.parsex, Enable 'step' to be used through nesting

* Fixed an issue where nonstandard statement 'step 0' before standard statement 'step 0' would cause an error

* zhangshiping; tw_madai bug fix

* modify all the skills with incorrect "locked" tag

* Change the game.exit function to restart the app for WKWebview users using ios. And added the macintosh field to the judgment of lib.device

* various bug fix

* Revert "various bug fix"

This reverts commit ca7a363.

* various bug fix

* some sudio

* unlock zhenghun, fix sbdiaochan

* add and adjust some audio, fix some bugs

* add trigger "useSkill" and "logSkillBegin"

* brand new wuxie

* Update standard.js

* update 武安国

* iriya!

* Add character lushi; fix clansankuang

* add 魏关羽/涛神，unlock 关宁/向朗/谋孙策/谋大乔/谋刘表，add related audio

* fix: adjust the edit box style to fix the text overflow problem 🐛

* fix 修文 and some other small bugs

* 伊莉雅·罗日杰斯特文斯卡娅

* Fix the issue of "game.getDB" and "game. deleteDB" reporting errors without "lib.db"

* Some browsers do not support "autoplay", so "onconplay" listening has been added

* sunwukong

* more zooms

* unlock 周善, modify 卢氏/卞喜/刘虞/黄祖/李采薇/张翼/笮融/孙寒华/TW董昭, fix some bug, add omitted audio

* change the number of 如意金箍棒 to 9 instead of 5; fix 夏侯尚's bug; add audio for sunwukong & donghailongwang

* Add the default accept value of '*/*' to the HTML selection file label

* longwang

* add&modify some audio

* add 族王凌/界SP黄月英/界张松/武诸葛亮，fix 晖云's bug; resolve conflicts, bring 武诸葛 up to date, fix 龙王's bug

* add 阮籍, add a skillTag in "jiu2" named jiuSustain for ruanji

* add some audio, sort some characters in sp

* sync 界SP黄月英

* add some character intros

* make 谋弈 play audio correctly

* revert some skills back to new ones

* v1.9.122.3

* Update update.js

* Add files via upload

* Add files via upload

* UI fix, Pinyin

* 李白

* Add files via upload

* Add files via upload

* collab pack, shen_dengai

* 朱铁雄, 小约翰可汗, 铜雀台补全

* small change

* 新增阮籍语音，修复阮籍的一个bug

* 添加族王凌和界孙登的语音

* 调整火攻和雌雄剑效果为只有1牌/0牌的时候直接亮出/令摸牌；新增一些语音

* 添加武诸葛、神邓艾配音

* 更新武诸葛、袁姬技能，bug修复

* 新增严纲、公孙范、乐蔡文姬、OL王朗，bug修复，添加相关语音

* 添加十周年地主相关语音，修复张世平的一个AIbug

* 修改intro的一个问题

* collab AI

* 新增OL界二张、甘夫人糜夫人，线下小杀小闪小酒小桃小乐；解禁刘宠骆俊

* v1.9.123 update info

---------

Co-authored-by: shijian <[email protected]>
Co-authored-by: copcap <[email protected]>
Co-authored-by: copcap <[email protected]>
Co-authored-by: PBK-B <[email protected]>
Co-authored-by: lieren2023 <[email protected]>

card/extra.js

@@ -176,7 +176,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				enable:true,
 				//cardnature:'fire',
 				filterTarget:function(card,player,target){
-					if(player!=game.me&&player.countCards('h')<2) return false;
+					//if(player!=game.me&&player.countCards('h')<2) return false;
 					return target.countCards('h')>0;
 				},
 				content:function(){
@@ -185,7 +185,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						event.finish();
 						return;
 					}
-					target.chooseCard(true).ai=function(card){
+					else if(target.countCards('h')==1) event._result={cards:target.getCards('h')};
+					else target.chooseCard(true).ai=function(card){
 						if(_status.event.getRand()<0.5) return Math.random();
 						return get.value(card);
 					};

card/standard.js

@@ -901,7 +901,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					return target.isHealthy();
 				},
 				content:function(){
-					target.recover();
+					target.recover(event.baseDamage||1);
 				},
 				ai:{
 					basic:{
@@ -2084,9 +2084,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					"step 0"
-					trigger.target.chooseToDiscard('弃置一张手牌，或令'+get.translation(player)+'摸一张牌').set('ai',function(card){
+					if(!trigger.target.countCards('h')) event._result={bool:false};
+					else trigger.target.chooseToDiscard('弃置一张手牌，或令'+get.translation(player)+'摸一张牌').set('ai',function(card){
 						var trigger=_status.event.getTrigger();
-						return -get.attitude(trigger.target,trigger.player)-get.value(card);
+						return -get.attitude(trigger.target,trigger.player)-get.value(card)-Math.max(0,4-trigger.target.hp)*2;
 					});
 					"step 1"
 					if(result.bool==false) player.draw();
@@ -2453,8 +2454,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					event._info_map=map;
 					var card=trigger.card;
 					var state=true;
-					if(trigger.name=='phaseJudge'&&get.itemtype(card)=='card'&&card.viewAs){
-						card=get.autoViewAs({name:card.viewAs},[card]);
+					if(trigger.name=='phaseJudge'){
+						if(get.itemtype(card)=='card'&&card.viewAs) card=get.autoViewAs({name:card.viewAs},[card]);
 						map.target=trigger.player;
 						map.isJudge=true;
 					}
@@ -2464,6 +2465,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						map.target=trigger.target;
 						map.targets=trigger.targets;
 						map.tempnowuxie=(trigger.targets&&trigger.targets.length>1&&!trigger.multitarget);
+						map.noai=Boolean(trigger.getParent().noai);
 						//如果对拼无懈，获取历史数据
 						if(card.name=='wuxie'){
 							var evt=event;

card/yongjian.js

@@ -30,7 +30,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					'step 0'
-					target.recover();
+					target.recover(event.baseDamage||1);
 					'step 1'
 					if(target.hasCard(function(card){
 						return _status.connectMode||get.name(card,target)=='du';

card/zhulu.js

@@ -659,12 +659,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			jinhe_lose:{
 				trigger:{
 					player:['loseAfter','equipAfter'],
+					global:'loseAsyncAfter',
 				},
 				equipSkill:true,
 				forced:true,
 				filter:function(event,player){
 					if(event.getl===false) return false;
-					if(event.name=='lose'&&event.position!=ui.discardPile||!_status.jinhe||event.getParent(2).name=='jinhe_skill'&&event.getParent(2).player==player) return false;
+					if(!event.getd(player).length||!_status.jinhe||event.getParent(2).name=='jinhe_skill'&&event.getParent(2).player==player) return false;
 					var evt=event.getl(player);
 					if(!evt) return false;
 					for(var i=0;i<evt.es.length;i++){

character/clan.js

@@ -37,15 +37,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				content:function(){
 					'step 0'
 					var num=player.countCards('h');
-					var str='是否交给其'+get.cnNumber(num)+'张牌，然后视为你对其使用一张【酒】？或者点击“取消”，令其交给你一张牌，然后其视为对你使用一张【杀】。';
+					var str='是否交给其'+get.cnNumber(num)+'张牌，然后视为你对其使用一张【酒】？或者点击“取消”，令其交给你一张牌，然后其视为对你使用一张雷【杀】。';
 					target.chooseCard(get.translation(player)+'对你发动了【驳龙】',str,num,'he').set('ai',card=>{
-						if(_status.event.canGive) return 5-get.value(card);
+						if(_status.event.canGive) return 5+Math.max(0,3-_status.event.player.hp)/1.5-get.value(card);
 						return 0;
 					}).set('canGive',function(){
 						if(get.attitude(target,player)>1) return true;
 						if(!player.hasSha()&&player.countCards('h')<=4) return true;
+						var sha={name:'sha',nature:'thunder',isCard:true};
 						if(game.hasPlayer(current=>{
-							return player.canUse('sha',current,true,true)&&get.effect(current,{name:'sha'},player,target)<0&&!current.countCards('hs',['shan','caochuan']);
+							return player.canUse(sha,current,true,true)&&get.effect(current,sha,player,target)<0&&!current.countCards('hs',['shan','caochuan']);
 						})) return false;
 						return true;
 					}());
@@ -57,13 +58,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						event.finish();
 					}
 					else{
-						player.chooseCard('驳龙：交给'+get.translation(target)+'一张牌',get.translation(target)+'拒绝给牌，请交给其一张牌然后视为对其使用一张【杀】',true,'he');
+						player.chooseCard('驳龙：交给'+get.translation(target)+'一张牌',get.translation(target)+'拒绝给牌，请交给其一张牌然后视为对其使用一张雷【杀】',true,'he');
 					}
 					'step 2'
 					if(result.bool){
 						var cards=result.cards;
 						player.give(cards,target);
-						if(player.canUse('sha',target,false,false)) player.useCard({name:'sha',isCard:true},target,false);
+						var sha={name:'sha',nature:'thunder',isCard:true};
+						if(player.canUse(sha,target,false,false)) player.useCard(sha,target,false);
 					}
 				},
 				ai:{
@@ -83,6 +85,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			clanzhongliu:{
 				audio:2,
+				audioname:['clan_wangling'],
 				trigger:{player:'useCard'},
 				forced:true,
 				clanSkill:true,
@@ -1240,7 +1243,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audioname:['clan_xunshu','clan_xunchen','clan_xuncai','clan_xuncan'],
 				trigger:{player:'useCardAfter'},
 				filter:function(event,player){
-					return get.type(event.card,null,false)=='trick'&&!get.tag(event.card,'damage')&&event.cards.filterInD('d').length>0&&player.getHistory('useCard',evt=>{
+					return get.type(event.card,null,false)=='trick'&&!get.tag(event.card,'damage')&&event.cards.filterInD().length>0&&player.getHistory('useCard',evt=>{
 						return get.type(evt.card,null,false)=='trick'&&!get.tag(evt.card,'damage');
 					}).indexOf(event)==0;
 				},
@@ -1601,7 +1604,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			clanlianzhu_info:'转换技。每名角色Ａ的出牌阶段限一次。阴：Ａ可以重铸一张牌，然后你可以重铸一张牌。若这两张牌颜色不同，则你的手牌上限-1；阳：Ａ可以令你选择一名在你或Ａ攻击范围内的另一名其他角色Ｂ，然后Ａ和你可依次选择是否对Ｂ使用一张【杀】。若这两张【杀】颜色相同，则你的手牌上限+1。',
 			clan_wangling:'族王凌',
 			clanbolong:'驳龙',
-			clanbolong_info:'出牌阶段限一次。你可以令一名其他角色选择一项：1.你交给其一张牌，然后视为对其使用一张【杀】；2.交给你等同于你手牌数的牌，然后视为对你使用一张【酒】。',
+			clanbolong_info:'出牌阶段限一次。你可以令一名其他角色选择一项：1.你交给其一张牌，然后视为对其使用一张雷【杀】；2.交给你等同于你手牌数的牌，然后视为对你使用一张【酒】。',
 			clanzhongliu:'中流',
 			clanzhongliu_info:'宗族技，锁定技。当你使用牌时，若此牌对应的实体牌不全为同族角色的手牌，你重置武将牌上的技能。',