From 5b5e91082db1c1178655107219a0cb5e4920568c Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Sun, 28 Jan 2024 23:29:30 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BE=A0=E5=85=B3=E7=BE=BD=E3=80=90?=
=?UTF-8?q?=E5=BF=A0=E4=B9=89=E3=80=91bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/tw.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/character/tw.js b/character/tw.js
index 8029cfcad..4616c4c71 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -605,12 +605,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return (player.hp+player.countCards('hs',card=>player.canSaveCard(card,player))-num2>0&&num>num2)?'背水！':'回血';
}).set('num',num).set('num2',num2);
if(control!='cancel2'){
- if(control=='背水'){
+ if(control=='背水！'){
await player.loseHp(num2);
player.getHistory('custom').push({twzhongyi:true});
}
if(control!='回血') await player.draw(num);
- if(control!='摸牌') await player.recover(num2);
+ if(control!='摸牌') await player.recover(num);
}
},
},
@@ -15686,7 +15686,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
twdengjianx:'剑法',
twdengjian_info:'①其他角色的弃牌阶段结束时，你可以弃置一张牌并随机获得本回合所有造成伤害的牌对应的实体牌的其中一张与你本轮以此法获得的牌的颜色均不同的【杀】，称为“剑法”。②你使用“剑法”牌不计入次数限制。',
twxinshou:'心授',
- twxinshou_info:'当你于出牌阶段使用【杀】时，若此【杀】与你本回合使用的所有其他【杀】的颜色均不相同，则你可以选择执行以下一项本回合未执行过的项：⒈摸一张牌；⒉交给一名其他角色一张牌。若这两项本回合均已被选择过，则你可以令〖登剑①〗失效并令一名其他角色获得〖登剑〗，你的下个回合开始时，其失去〖登剑〗，若其这期间使用【杀】造成过伤害，则你结束〖登剑①〗的失效状态',
+ twxinshou_info:'当你于出牌阶段使用【杀】时，若此【杀】与你本回合使用的所有其他【杀】的颜色均不相同，则你可以选择执行以下一项本回合未执行过的项：⒈摸一张牌；⒉交给一名其他角色一张牌。若这两项本回合均已被选择过，则你可以令〖登剑①〗失效并令一名其他角色获得〖登剑〗，你的下个回合开始时，其失去〖登剑〗，若其这期间使用【杀】造成过伤害，则你结束〖登剑①〗的失效状态。',
tw_mobile:'海外服·稀有专属',
tw_yunchouzhi:'运筹帷幄·智',
From 7101e38dc93a0cfc8bd74a9a43c34b1b635bbf5b Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Sun, 28 Jan 2024 23:32:40 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=AE=B5=E5=B7=A7=E7=AC=91=E3=80=90?=
=?UTF-8?q?=E5=BD=A9=E5=A6=86=E3=80=91bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/xianding.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/character/xianding.js b/character/xianding.js
index b0b189cc4..af190e73a 100644
--- a/character/xianding.js
+++ b/character/xianding.js
@@ -3812,7 +3812,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},'he');
},
complexCard:true,
- selectCard:[1,4],
+ selectCard:[1,Infinity],
position:'he',
filterCard:true,
check:function(card){
@@ -14006,7 +14006,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcjijiao_info:'限定技。出牌阶段，你可以令一名角色获得所有弃牌堆中你于本局游戏内使用或弃置过的普通锦囊牌，且这些牌不能被【无懈可击】响应。一名角色的回合结束后，若本回合牌堆洗过牌或有角色死亡，你重置〖继椒〗。',
duanqiaoxiao:'段巧笑',
dccaizhuang:'彩妆',
- dccaizhuang_info:'出牌阶段限一次。你可以弃置任意张牌。然后若你手牌中的花色数小于你以此法弃置的牌数，你摸一张牌并重复此流程。',
+ dccaizhuang_info:'出牌阶段限一次，你可以弃置任意张牌。然后若你手牌中的花色数小于你以此法弃置的牌数，你摸一张牌并重复此流程。',
dchuayi:'华衣',
dchuayi_info:'结束阶段，你可以判定，然后你获得如下效果直到你下回合开始时：红色，一名角色的回合结束时，你摸一张牌；黑色，当你受到伤害后，你摸两张牌。',
wu_zhugeliang:'武诸葛亮',
From 225df4ec7f024048773a645375375a991c27ac86 Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Mon, 29 Jan 2024 02:52:55 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=8E=89=E7=9C=9F=E5=AD=90+=E8=AF=84?=
=?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/rank.js | 2 +
character/tw.js | 316 +++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 317 insertions(+), 1 deletion(-)
diff --git a/character/rank.js b/character/rank.js
index d617ba494..eb436de45 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -132,6 +132,7 @@ window.noname_character_rank={
'mb_chengui',
'jsrg_guozhao',
'sb_caopi',
+ 'xia_yuzhenzi',
],
a:[
'xia_shitao',
@@ -1661,6 +1662,7 @@ window.noname_character_rank={
],
rarity:{
legend:[
+ 'xia_yuzhenzi',
'xia_guanyu',
'swd_muyun',
'swd_zhaoyun',
diff --git a/character/tw.js b/character/tw.js
index 4616c4c71..68dc405cb 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -12,7 +12,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
tw_yunchouyong:['tw_zongyu','tw_chendong','tw_sunyi'],
tw_yunchouyan:['tw_jiangqing'],
tw_zhu:['tw_beimihu','tw_ol_sunjian','ol_liuyu','tw_menghuo'],
- tw_swordsman:['xia_shie','xia_shitao','xia_guanyu','xia_liubei','xia_xiahousone','xia_xiahoudun','xia_zhangwei','xia_xushu','xia_wangyue','xia_liyàn','xia_tongyuan','xia_lusu','xia_dianwei','xia_zhaoe','xia_xiahouzie'],
+ tw_swordsman:['xia_yuzhenzi','xia_shie','xia_shitao','xia_guanyu','xia_liubei','xia_xiahousone','xia_xiahoudun','xia_zhangwei','xia_xushu','xia_wangyue','xia_liyàn','xia_tongyuan','xia_lusu','xia_dianwei','xia_zhaoe','xia_xiahouzie'],
tw_mobile:['nashime','tw_gexuan','tw_zhugeguo'],
tw_mobile2:['tw_chengpu','tw_guohuai','old_quancong','tw_caoxiu','tw_guanqiujian','tw_re_fazheng','tw_madai','tw_zhangfei','tw_guyong','tw_handang','tw_xuezong','tw_yl_luzhi'],
tw_yijiang:['tw_caoang','tw_caohong','tw_zumao','tw_dingfeng','tw_maliang','tw_xiahouba'],
@@ -20,6 +20,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
character:{
+ xia_yuzhenzi:['male','qun',3,['twhuajing','twtianshou']],
xia_shie:['male','wei',4,['twdengjian','twxinshou']],
xia_shitao:['male','qun',4,['twjieqiu','twenchou']],
xia_guanyu:['male','qun',4,['twzhongyi','twchue']],
@@ -130,6 +131,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
kaisa:["male","western",4,["zhengfu"]],
},
characterIntro:{
+ yuzhenzi:'评书三国中的人物，其人有徒弟兼义子童渊、徒弟并州李彦，有徒孙常山赵子龙、北地枪王张绣、张任等人。',
shie:'三国人物，善剑术。桓、灵间，有虎贲王越以剑术称于京师，阿得其法。魏帝曹丕曾从阿学剑术。曹丕在《典论·自叙》中说：“余又学击剑，阅师多矣，四方之法各异，唯京师为善。桓、灵之间，有虎贲王越善斯术，称於京师。河南史阿言昔与越游，具得其法，余从阿学精熟。尝与平虏将军刘勋、奋威将军邓展等共饮，宿闻展善有手臂，晓五兵，又称其能空手入白刃。余与论剑良久，谓将军非法也，余顾尝好之，又得善术，因求与余对。',
shitao:'石韬，字广元，即石广元，颍川（今河南禹州）人，仕魏，官拜典农校尉、郡守。初平年间，石韬与徐庶一同来到荆州，在荆州时与诸葛亮和庞统等人相善。与崔州平（名钧）、孟公威（名建）、徐元直（名庶）为“诸葛四友”。',
xiahousone:'夏侯子萼，游卡桌游《三国杀阵面对决》中虚构的人物。在《阵面对决》中，设定为在貂蝉不在时血婆娑的实际首领。在海外服中，设定为夏侯惇的养女，继承了夏侯紫萼的血婆娑，之后“夏侯紫萼”这个名字就被隐匿于历史之中，而“夏侯子萼”则成为了血婆娑的首领“血蔷薇”的固定名号。',
@@ -289,6 +291,301 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
skill:{
+ //玉真子
+ twhuajing:{
+ audio:2,
+ getSkills(player){
+ let skills=player.getSkills(false,null,false).filter(skill=>{
+ const info=get.info(skill);
+ return info&&info.equipSkill&&info.equipSkill=='equip1';
+ });
+ skills.addArray(player.getCards('e',card=>get.subtype(card)=='equip1').reduce((list,card)=>{
+ const info=get.info(card);
+ if(info&&info.skills) return list.addArray(info.skills);
+ return list;
+ },[]));
+ return skills;
+ },
+ trigger:{global:'phaseBefore',player:'enterGame'},
+ filter(event,player){
+ return event.name!='phase'||game.phaseNumber==0;
+ },
+ forced:true,
+ locked:false,
+ async content(event,trigger,player){
+ const skills=lib.skill.twhuajing.derivation;
+ for(const eff of skills){
+ player.addMark(eff,1);
+ player.unmarkSkill(eff);
+ }
+ player.markSkill('twhuajing');
+ },
+ global:'twhuajing_global',
+ group:'twhuajing_use',
+ derivation:['twhuajing_jian','twhuajing_dao','twhuajing_fu','twhuajing_qiang','twhuajing_ji','twhuajing_gong'],
+ marktext:'武',
+ intro:{
+ markcount(storage,player){
+ return lib.skill.twhuajing.derivation.filter(skill=>player.hasMark(skill)).length;
+ },
+ content(storage,player){
+ const skills=lib.skill.twhuajing.derivation.filter(skill=>player.hasMark(skill));
+ if(!skills.length) return '功力已消耗殆尽';
+ let str='当前武功：';
+ for(const eff of skills){
+ str+='
';
+ str+=lib.translate[eff];
+ str+='：';
+ str+=lib.translate[eff+'_info'];
+ }
+ return str;
+ },
+ },
+ subSkill:{
+ global:{
+ mod:{
+ attackRange(player,num){
+ const skills=lib.skill.twhuajing.derivation.filter(skill=>player.hasMark(skill)||player.hasSkill(skill));
+ if(skills.length) return num+skills.length*game.countPlayer(target=>target.hasSkill('twhuajing'));
+ },
+ },
+ },
+ use:{
+ audio:'twhuajing',
+ enable:'phaseUse',
+ filter(event,player){
+ return lib.skill.twhuajing.derivation.some(skill=>player.hasMark(skill));
+ },
+ filterCard:true,
+ selectCard:[1,4],
+ position:'h',
+ complexCard:true,
+ discard:false,
+ lose:false,
+ delay:false,
+ check(card){
+ const player=get.event('player'),skills=lib.skill.twhuajing.derivation.filter(skill=>player.hasMark(skill));
+ if(ui.selected.cards.some(cardx=>get.suit(cardx,player)==get.suit(card,player))) return 0;
+ return skills.length-ui.selected.cards.length;
+ },
+ usable:1,
+ prompt:'展示至多四张手牌，然后根据这些牌含有的花色数于本回合获得等量你拥有的“武”标记的效果',
+ async content(event,trigger,player){
+ await player.showCards(event.cards,get.translation(player)+'发动了【经合】');
+ const skills=lib.skill.twhuajing.derivation.filter(skill=>player.hasMark(skill));
+ const gainSkills=skills.randomGets(Math.min(skills.length,event.cards.reduce((list,cardx)=>list.add(get.suit(cardx,player)),[]).length));
+ for(const eff of gainSkills) player.popup(eff);
+ player.addTempSkill(gainSkills);
+ player.addTempSkill('twhuajing_blocker');
+ player.getHistory('custom').push({twhuajing_skills:gainSkills});
+ },
+ },
+ jian:{
+ charlotte:true,
+ mark:true,
+ marktext:'剑',
+ intro:{
+ name:'化境·剑',
+ name2:'剑',
+ content:()=>lib.translate.twhuajing_jian_info,
+ },
+ nopop:true,
+ trigger:{player:'useCardToPlayered'},
+ filter(event,player){
+ return event.card.name=='sha'&&event.target.countCards('he');
+ },
+ forced:true,
+ logTarget:'target',
+ async content(event,trigger,player){
+ const target=trigger.target;
+ const cards=target.getDiscardableCards(player,'he');
+ target.discard(cards.randomGets(Math.min(2,cards.length))).discarder=player;
+ },
+ },
+ dao:{
+ charlotte:true,
+ mark:true,
+ marktext:'刀',
+ intro:{
+ name:'化境·刀',
+ name2:'刀',
+ content:()=>lib.translate.twhuajing_dao_info,
+ },
+ nopop:true,
+ inherit:'guding_skill',
+ equipSkill:false,
+ },
+ fu:{
+ charlotte:true,
+ mark:true,
+ marktext:'斧',
+ intro:{
+ name:'化境·斧',
+ name2:'斧',
+ content:()=>lib.translate.twhuajing_fu_info,
+ },
+ nopop:true,
+ trigger:{player:'shaMiss'},
+ forced:true,
+ logTarget:'target',
+ async content(event,trigger,player){
+ trigger.target.damage();
+ },
+ ai:{
+ directHit_ai:true,
+ skillTagFilter(player,tag,arg){
+ if(!arg||!arg.card||arg.card.name!='sha'||!arg.baseDamage||arg.baseDamage<=1) return false;
+ return true;
+ },
+ },
+ },
+ qiang:{
+ charlotte:true,
+ mark:true,
+ marktext:'枪',
+ intro:{
+ name:'化境·枪',
+ name2:'枪',
+ content:()=>lib.translate.twhuajing_qiang_info,
+ },
+ nopop:true,
+ trigger:{player:'useCardAfter'},
+ filter(event,player){
+ return event.card.name=='sha'&&get.color(event.card)=='black';
+ },
+ forced:true,
+ async content(event,trigger,player){
+ const card=get.cardPile(card=>card.name=='shan');
+ if(card) player.gain(card,'gain2');
+ },
+ },
+ ji:{
+ charlotte:true,
+ mark:true,
+ marktext:'戟',
+ intro:{
+ name:'化境·戟',
+ name2:'戟',
+ content:()=>lib.translate.twhuajing_ji_info,
+ },
+ nopop:true,
+ trigger:{source:'damageBegin3'},
+ filter(event,player){
+ return event.card&&event.card.name=='sha';
+ },
+ forced:true,
+ async content(event,trigger,player){
+ player.draw(trigger.num);
+ },
+ },
+ gong:{
+ charlotte:true,
+ mark:true,
+ marktext:'弓',
+ intro:{
+ name:'化境·弓',
+ name2:'弓',
+ content:()=>lib.translate.twhuajing_gong_info,
+ },
+ nopop:true,
+ trigger:{source:'damageSource'},
+ filter(event,player){
+ return event.card&&event.card.name=='sha'&&event.player.countDiscardableCards(player,'e');
+ },
+ forced:true,
+ logTarget:'player',
+ async content(event,trigger,player){
+ trigger.player.discard(trigger.player.countDiscardableCards(player,'e').randomGets(1)).discarder=player;
+ },
+ },
+ blocker:{
+ charlotte:true,
+ init(player,skill){
+ player.disableSkill(skill,lib.skill.twhuajing.getSkills(player));
+ },
+ mod:{
+ attackRange(player,num){
+ const sum=player.getCards('e',card=>get.subtype(card)=='equip1').reduce((sum,card)=>{
+ const info=get.info(card);
+ if(info&&info.distance&&info.distance.attackFrom){
+ return sum+info.distance.attackFrom;
+ }
+ return sum;
+ },0);
+ if(sum) return num+sum;
+ },
+ },
+ trigger:{
+ player:'loseAfter',
+ global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
+ },
+ filter(event,player){
+ if(event.name=='equip'&&event.player==player&&get.subtype(event.card)=='equip1') return true;
+ const evt=event.getl(player);
+ return evt&&evt.player==player&&evt.es&&evt.es.some(card=>get.subtype(card)=='equip1');
+ },
+ forced:true,
+ popup:false,
+ firstDo:true,
+ async content(event,trigger,player){
+ await player.enableSkill('twhuajing_blocker');
+ await player.disableSkill('twhuajing_blocker',lib.skill.twhuajing.getSkills(player));
+ },
+ },
+ },
+ },
+ twtianshou:{
+ audio:2,
+ trigger:{player:'phaseEnd'},
+ filter(event,player){
+ return player.getHistory('sourceDamage',evt=>{
+ return evt.card&&evt.card.name=='sha';
+ }).length&&player.getHistory('custom',evt=>{
+ return evt.twhuajing_skills;
+ }).reduce((list,evt)=>list.addArray(evt.twhuajing_skills),[]).some(skill=>player.hasMark(skill));
+ },
+ forced:true,
+ async content(event,trigger,player){
+ const {result:{bool,targets}}=await player.chooseTarget(lib.filter.notMe,true)
+ .set('prompt','天授：令一名其他角色获得1枚“武”并获得此标记的效果')
+ .set('ai',target=>{
+ const player=get.event('player'),att=get.attitude(player,target);
+ const card=new lib.element.VCard({name:'sha'});
+ if(att>0) return game.countPlayer(aim=>{
+ return target.canUse(card,target)&&get.effect(aim,card,target,player)>0&&get.effect(aim,card,target,target)>0;
+ })+10;
+ if(att==0) return 1.5+Math.random();
+ return 0.1+Math.random();
+ });
+ if(bool){
+ const target=targets[0];
+ const skills=player.getHistory('custom',evt=>{
+ return evt.twhuajing_skills;
+ }).reduce((list,evt)=>list.addArray(evt.twhuajing_skills),[]).filter(skill=>player.hasMark(skill));
+ var choiceList=skills.map(i=>{
+ return '【'+get.translation(lib.translate[i+'_ab']||get.translation(i).slice(0,2))+'】
' +
+ ''+get.skillInfoTranslation(i,player)+'
';
+ });
+ const {result:{control}}=await player.chooseControl(skills)
+ .set('prompt','选择令'+get.translation(target)+'获得的“武”')
+ .set('choiceList',choiceList).set('displayIndex',false).set('ai',()=>get.event('controls').randomGet());
+ if(control){
+ player.removeMark(control,1);
+ player.markSkill('twhuajing');
+ player.popup(control,'metal');
+ target.addMark(control,1);
+ target.addSkill(control,{player:'phaseAfter'});
+ target.addSkill('twhuajing_blocker',{player:'phaseAfter'});
+ target.when('phaseAfter').then(()=>{
+ if(player.hasMark(control)) player.removeMark(control,1);
+ }).vars({control:control});
+ target.getHistory('custom').push({twhuajing_skills:[control]});
+ await player.draw();
+ }
+ }
+ },
+ ai:{combo:'twhuajing'},
+ },
//史阿
twdengjian:{
audio:2,
@@ -15687,6 +15984,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){
twdengjian_info:'①其他角色的弃牌阶段结束时，你可以弃置一张牌并随机获得本回合所有造成伤害的牌对应的实体牌的其中一张与你本轮以此法获得的牌的颜色均不同的【杀】，称为“剑法”。②你使用“剑法”牌不计入次数限制。',
twxinshou:'心授',
twxinshou_info:'当你于出牌阶段使用【杀】时，若此【杀】与你本回合使用的所有其他【杀】的颜色均不相同，则你可以选择执行以下一项本回合未执行过的项：⒈摸一张牌；⒉交给一名其他角色一张牌。若这两项本回合均已被选择过，则你可以令〖登剑①〗失效并令一名其他角色获得〖登剑〗，你的下个回合开始时，其失去〖登剑〗，若其这期间使用【杀】造成过伤害，则你结束〖登剑①〗的失效状态。',
+ xia_yuzhenzi:'玉真子',
+ twhuajing:'化境',
+ twhuajing_info:'①游戏开始时，你获得6个效果各不相同的无效果“武”标记。②一名拥有“武”标记的角色的攻击范围+X（X为其拥有的“武”标记数）。③出牌阶段限一次，你可以展示至多四张手牌，然后根据这些牌含有的花色数于本回合获得等量你拥有的“武”标记的效果。④拥有“武”标记效果的角色的武器牌失效（武器牌不提供攻击范围且武器技能失效）。',
+ twhuajing_jian:'剑',
+ twhuajing_jian_info:'当你使用【杀】指定目标后，你随机弃置目标角色两张牌。',
+ twhuajing_dao:'刀',
+ twhuajing_dao_info:'当你使用【杀】对没有手牌的目标角色造成伤害时，此伤害+1。',
+ twhuajing_fu:'斧',
+ twhuajing_fu_info:'当你使用的【杀】被【闪】响应后，你对目标角色造成1点伤害。',
+ twhuajing_qiang:'枪',
+ twhuajing_qiang_info:'当你使用黑色【杀】结算完毕后，你从牌堆或弃牌堆中获得一张【闪】。',
+ twhuajing_ji:'戟',
+ twhuajing_ji_info:'当你使用【杀】造成伤害时，你摸一张牌。',
+ twhuajing_gong:'弓',
+ twhuajing_gong_info:'当你使用【杀】造成伤害后，你随机弃置受伤角色装备区里的一张牌。',
+ twtianshou:'天授',
+ twtianshou_info:'锁定技，回合结束时，若你本回合使用【杀】造成过伤害，且你拥有本回合获得过效果的“武”标记，则你须将其中一个“武”标记交给一名其他角色并令其获得此标记的效果直到其回合结束，然后你摸一张牌。',
tw_mobile:'海外服·稀有专属',
tw_yunchouzhi:'运筹帷幄·智',
From 5ba4498dfd63bd4c3d6aa1b06b766541b6958d4c Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Mon, 29 Jan 2024 03:18:29 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=8E=89=E7=9C=9F=E5=AD=90=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0unequip=5Fequip1=E4=B8=BA=E6=B2=A1=E6=9C=89addSkill?=
=?UTF-8?q?=E6=97=B6=E6=9C=BA=E7=9A=84=E8=A7=86=E4=B8=BA=E8=A3=85=E5=A4=87?=
=?UTF-8?q?=E6=AD=A6=E5=99=A8=E6=8A=80=E8=83=BD=E4=BD=BF=E7=94=A8=EF=BC=8C?=
=?UTF-8?q?=E5=B9=B6=E4=B8=BA=E6=9D=8E=E5=BC=82=E3=80=90=E8=98=B8=E9=87=91?=
=?UTF-8?q?=E3=80=91=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/sp.js | 5 +++--
character/tw.js | 13 +++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/character/sp.js b/character/sp.js
index 9bd3ffa87..28aaed999 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -853,7 +853,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
equipSkill:true,
trigger:{player:['shaMiss','eventNeutralized']},
filter:function(event,player){
- if(!player.hasEmptySlot(1)||!lib.card.guanshi) return false;
+ if(!player.hasEmptySlot(1)||!lib.card.guanshi||player.hasSkillTag('unequip_equip1')) return false;
if(event.type!='card'||event.card.name!='sha'||!event.target.isIn()) return false;
return player.countCards('he')>=2;
},
@@ -889,7 +889,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ai:{
directHit_ai:true,
skillTagFilter:function(player,tag,arg){
- if(player._olzhanjin_guanshi_temp||!player.hasEmptySlot(1)||!lib.card.guanshi) return;
+ if(player._olzhanjin_guanshi_temp||!player.hasEmptySlot(1)||!lib.card.guanshi||player.hasSkillTag('unequip_equip1')) return;
player._guanshi_temp=true;
var bool=(get.attitude(player,arg.target)<0&&arg.card&&arg.card.name=='sha'&&player.countCards('he',card=>{
return card!=arg.card&&(!arg.card.cards||!arg.card.cards.includes(card))&&get.value(card)<5;
@@ -899,6 +899,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
effect:{
target:function(card,player,target){
+ if(player.hasSkillTag('unequip_equip1')) return;
if(player==target&&get.subtype(card)=='equip1'){
if(get.equipValue(card)<=get.equipValue({name:'guanshi'})) return 0;
}
diff --git a/character/tw.js b/character/tw.js
index 68dc405cb..aea80de68 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -295,16 +295,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
twhuajing:{
audio:2,
getSkills(player){
- let skills=player.getSkills(false,null,false).filter(skill=>{
- const info=get.info(skill);
- return info&&info.equipSkill&&info.equipSkill=='equip1';
- });
- skills.addArray(player.getCards('e',card=>get.subtype(card)=='equip1').reduce((list,card)=>{
+ return player.getCards('e',card=>get.subtype(card)=='equip1').reduce((list,card)=>{
const info=get.info(card);
if(info&&info.skills) return list.addArray(info.skills);
return list;
- },[]));
- return skills;
+ },[]);
},
trigger:{global:'phaseBefore',player:'enterGame'},
filter(event,player){
@@ -517,9 +512,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
trigger:{
player:'loseAfter',
- global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'],
+ global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter','phaseBefore'],
},
filter(event,player){
+ if(event.name=='phase') return true;
if(event.name=='equip'&&event.player==player&&get.subtype(event.card)=='equip1') return true;
const evt=event.getl(player);
return evt&&evt.player==player&&evt.es&&evt.es.some(card=>get.subtype(card)=='equip1');
@@ -531,6 +527,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
await player.enableSkill('twhuajing_blocker');
await player.disableSkill('twhuajing_blocker',lib.skill.twhuajing.getSkills(player));
},
+ ai:{unequip_equip1:true},
},
},
},
From 7b7a196dd5bd868845cc119a60741942210d9c6b Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Mon, 29 Jan 2024 03:22:32 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=89=E7=9C=9F?=
=?UTF-8?q?=E5=AD=90=E4=BA=8C=E6=8A=80=E8=83=BD=E7=BB=99=E4=BA=88=E7=9A=84?=
=?UTF-8?q?=E6=A0=87=E8=AE=B0=E4=B8=8D=E6=B6=88=E5=A4=B1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/tw.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/character/tw.js b/character/tw.js
index aea80de68..792c2d91e 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -571,8 +571,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.markSkill('twhuajing');
player.popup(control,'metal');
target.addMark(control,1);
- target.addSkill(control,{player:'phaseAfter'});
- target.addSkill('twhuajing_blocker',{player:'phaseAfter'});
+ target.addTempSkill(control,{player:'phaseAfter'});
+ target.addTempSkill('twhuajing_blocker',{player:'phaseAfter'});
target.when('phaseAfter').then(()=>{
if(player.hasMark(control)) player.removeMark(control,1);
}).vars({control:control});
From 16ca8fe4ec5a47905015827344d9d0d4bdb5bd12 Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Mon, 29 Jan 2024 03:30:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E6=95=88?=
=?UTF-8?q?=E6=AD=A6=E5=99=A8=E6=8A=80=E8=83=BD=E4=B8=8D=E6=81=A2=E5=A4=8D?=
=?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/tw.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/character/tw.js b/character/tw.js
index 792c2d91e..ab8f8ee93 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -498,6 +498,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
init(player,skill){
player.disableSkill(skill,lib.skill.twhuajing.getSkills(player));
},
+ onremove(player,skill){
+ player.enableSkill(skill);
+ },
mod:{
attackRange(player,num){
const sum=player.getCards('e',card=>get.subtype(card)=='equip1').reduce((sum,card)=>{
From 7b66ecefe6bf684760a1833d6c68d42dc8595a89 Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Mon, 29 Jan 2024 03:44:32 +0800
Subject: [PATCH 7/7] =?UTF-8?q?bugfix+=E5=86=99=E6=B3=95=E7=AE=80=E5=8C=96?=
=?UTF-8?q?+=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/tw.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/character/tw.js b/character/tw.js
index ab8f8ee93..cd1a79b0a 100644
--- a/character/tw.js
+++ b/character/tw.js
@@ -366,7 +366,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
usable:1,
prompt:'展示至多四张手牌，然后根据这些牌含有的花色数于本回合获得等量你拥有的“武”标记的效果',
async content(event,trigger,player){
- await player.showCards(event.cards,get.translation(player)+'发动了【经合】');
+ await player.showCards(event.cards,get.translation(player)+'发动了【化境】');
const skills=lib.skill.twhuajing.derivation.filter(skill=>player.hasMark(skill));
const gainSkills=skills.randomGets(Math.min(skills.length,event.cards.reduce((list,cardx)=>list.add(get.suit(cardx,player)),[]).length));
for(const eff of gainSkills) player.popup(eff);
@@ -382,6 +382,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{
name:'化境·剑',
name2:'剑',
+ markcount:()=>0,
content:()=>lib.translate.twhuajing_jian_info,
},
nopop:true,
@@ -404,6 +405,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{
name:'化境·刀',
name2:'刀',
+ markcount:()=>0,
content:()=>lib.translate.twhuajing_dao_info,
},
nopop:true,
@@ -417,6 +419,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{
name:'化境·斧',
name2:'斧',
+ markcount:()=>0,
content:()=>lib.translate.twhuajing_fu_info,
},
nopop:true,
@@ -441,6 +444,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{
name:'化境·枪',
name2:'枪',
+ markcount:()=>0,
content:()=>lib.translate.twhuajing_qiang_info,
},
nopop:true,
@@ -461,6 +465,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{
name:'化境·戟',
name2:'戟',
+ markcount:()=>0,
content:()=>lib.translate.twhuajing_ji_info,
},
nopop:true,
@@ -480,6 +485,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
intro:{
name:'化境·弓',
name2:'弓',
+ markcount:()=>0,
content:()=>lib.translate.twhuajing_gong_info,
},
nopop:true,
@@ -490,7 +496,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
forced:true,
logTarget:'player',
async content(event,trigger,player){
- trigger.player.discard(trigger.player.countDiscardableCards(player,'e').randomGets(1)).discarder=player;
+ trigger.player.discard(trigger.player.getDiscardableCards(player,'e').randomGets(1)).discarder=player;
},
},
blocker:{
@@ -573,12 +579,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.removeMark(control,1);
player.markSkill('twhuajing');
player.popup(control,'metal');
- target.addMark(control,1);
target.addTempSkill(control,{player:'phaseAfter'});
target.addTempSkill('twhuajing_blocker',{player:'phaseAfter'});
- target.when('phaseAfter').then(()=>{
- if(player.hasMark(control)) player.removeMark(control,1);
- }).vars({control:control});
target.getHistory('custom').push({twhuajing_skills:[control]});
await player.draw();
}