YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #215 from mengxinzxz/PR-Branch 

珠联璧合写法优化+族钟会标记显示摸牌数
This commit is contained in:
Spmario233 2023-08-15 01:35:16 +08:00 committed by GitHub
parent 4a05e9727b 6d500003f0
commit 025c782c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
character/clan.js
View File

@ -83,18 +83,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}).set('ai',function(card){
if(_status.event.dying&&_status.event.num>0&&lib.skill.dcweidang.getLength(card)>_status.event.num) return 1/lib.skill.dcweidang.getLength(card);//怂
return lib.skill.dcweidang.getLength(card);//勇
}).set('dying',player.hp+player.countCards('hs',{name:['tao','jiu']})<1).set('num',event.num);
}).set('dying',player.hp+player.countCards('hs',{name:['tao','jiu']})<1).set('num',event.num1);
'step 4'
if(result.bool){
player.logSkill('clanyuzhi');
player.showCards(result.cards,get.translation(player)+'发动了【迂志】');
player.draw(lib.skill.dcweidang.getLength(result.cards[0]));
player.storage.clanyuzhi=lib.skill.dcweidang.getLength(result.cards[0]);
player.markSkill('clanyuzhi');
}
else player.unmarkSkill('clanyuzhi');
},
ai:{
threaten:3,
nokeep:true,
},
onremove:true,
intro:{content:'本轮野心：#张'},
},
clanxieshu:{
audio:2,

6
character/mobile.js
View File

@ -3786,7 +3786,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var suit2=get.suit(i.card);
if(!lib.suit.contains(suit2)) continue;
if(i!=event&&suit2==suit) return false;
list.add(suit2);
if(i.finished) list.add(suit2);
}
return list.length>1&&list.length<5;
},
@ -3799,7 +3799,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(i.getParent('phaseUse')!=evt) continue;
var suit2=get.suit(i.card);
if(!lib.suit.contains(suit2)) continue;
list.add(suit2);
if(i.finished) list.add(suit2);
}
var prompt,filterTarget,ai;
switch(list.length){
@ -13536,7 +13536,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
spqishe_info:'你可以将一张装备牌当做【酒】使用。你的手牌上限+X（X为你装备区内的牌数）。',
sp_maojie:'毛玠',
bingqing:'秉清',
bingqing_info:'当你于出牌阶段内使用的牌结算结束后，若你于本阶段内使用的所有其他牌与此牌花色均不相同，则你可根据X的值执行对应效果：为2，你令一名角色摸两张牌；为3，你弃置一名角色区域内的一张牌；为4，你对一名其他角色造成1点伤害。（X为你本阶段内使用过的牌中包含的花色数）',
bingqing_info:'当你于出牌阶段内使用的牌结算结束后，若你于本阶段内使用的所有已结算结束的其他牌与此牌花色均不相同，则你可根据X的值执行对应效果：为2，你令一名角色摸两张牌；为3，你弃置一名角色区域内的一张牌；为4，你对一名其他角色造成1点伤害。（X为你本阶段内使用过的已结算结束的牌中包含的花色数）',
yingfeng:'迎奉',
yingfeng_info:'准备阶段，你可以令一名角色获得“奉”标记并移除场上所有其他的“奉”标记。有“奉”标记的角色使用牌没有距离限制。',
xin_sunxiu:'手杀孙休',

4
character/sp2.js
View File

@ -8005,10 +8005,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.markAuto('pingjian',[result.control]);
player.addTempSkill(result.control);
player.storage.pingjian_check[result.control]=(trigger.name=='damage'?trigger:'phaseJieshu');
if(trigger.name=='damage'){
var info=lib.translate[result.control+'_info'];
if(info&&info.indexOf('1点伤害')+info.indexOf('一点伤害')!=-2) trigger.num=1;//暂时想到的让多点伤害只执行一次的拙见
}
},
group:'pingjian_use',
phaseUse_special:[],

4
mode/guozhan.js
View File

@ -16050,7 +16050,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
name2=name2.slice(name2.indexOf('_')+1);
}
}
return (lib.perfectPair[name1]&&lib.perfectPair[name1].contains(name2))||(lib.perfectPair[name2]&&lib.perfectPair[name2].contains(name1));
var list=Object.keys(lib.perfectPair).concat(Object.values(lib.perfectPair)).flat(Infinity);
if(!list.contains(name1)||!list.contains(name2)) return false;
return (lib.perfectPair[name1]&&lib.perfectPair[name1].flat(Infinity).contains(name2))||(lib.perfectPair[name2]&&lib.perfectPair[name2].flat(Infinity).contains(name1));
},
siege:function(player){
if(this.identity=='unknown'||this.hasSkill('undist')) return false;