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

Merge pull request #754 from mengxinzxz/PR-Branch 

技能调整
This commit is contained in:
Spmario233 2024-01-01 23:45:45 +08:00 committed by GitHub
parent 4039dd5bf9 d2cc6d6cfa
commit 89678be1fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
character/onlyOL.js
View File

@ -5,13 +5,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
connect:true,
character:{
ol_sb_jiangwei:['male','shu',4,['olsbzhuri','olsbranji']],
ol_caozhang:['male','wei',4,['oljiangchi']],
ol_caozhang:['male','wei',4,['oljiangchi'],['die_audio:xin_caozhang']],
ol_jianyong:['male','shu',3,['olqiaoshui','jyzongshi'],['tempname:re_jianyong','die_audio:re_jianyong']],
ol_lingtong:['male','wu',4,['olxuanfeng'],['die_audio:re_lingtong']],
},
characterSort:{
onlyOL:{
onlyOL_yijiang1:['ol_caozhang','ol_jianyong','ol_lingtong'],
onlyOL_yijiang1:['ol_jianyong','ol_lingtong'],
onlyOL_yijiang2:['ol_caozhang'],
onlyOL_sb:['ol_sb_jiangwei'],
},
},
@ -185,7 +186,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
//界曹彰
oljiangchi:{
audio:2,
audio:'rejiangchi',
trigger:{player:'phaseDrawEnd'},
direct:true,
content:function*(event,map){
@ -355,6 +356,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
kunfenx_info:'结束阶段开始时，你可以失去1点体力，然后摸两张牌。',
onlyOL_yijiang1:'OL专属·将1',
onlyOL_yijiang2:'OL专属·将2',
onlyOL_sb:'OL专属·上兵伐谋',
},
};

10
character/refresh.js
View File

@ -10008,13 +10008,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
repojun3:{
audio:'repojun',
trigger:{source:'damageBegin1'},
filter:function(event,player){
var target=event.player;
return event.card&&event.card.name=='sha'&&player.countCards('h')>=target.countCards('h')&&player.countCards('e')>=target.countCards('e');
},
forced:true,
locked:false,
logTarget:'player',
filter:function(event,player){
var target=event.player;
return event.getParent().name=='sha'&&player.countCards('h')>=target.countCards('h')&&player.countCards('e')>=target.countCards('e');
},
content:function(){
trigger.num++;
},
@ -15021,7 +15021,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
repojun:'破军',
repojun2:'破军',
repojun3:'破军',
repojun_info:'当你使用【杀】指定目标后，你可以将其的至多X张牌置于其武将牌上（X为其体力值），然后其于当前回合结束时获得这些牌。当你因执行【杀】的效果而对一名角色造成伤害时，若该角色的手牌数和装备区内的牌数均不大于你，则此伤害+1。',
repojun_info:'当你使用【杀】指定目标后，你可以将其的至多X张牌置于其武将牌上（X为其体力值），然后其于当前回合结束时获得这些牌。当你使用【杀】对一名角色造成伤害时，若该角色的手牌数和装备区内的牌数均不大于你，则此伤害+1。',
rexianzhen:'陷阵',
rexianzhen_info:'出牌阶段限一次，你可以和一名其他角色拼点。若你赢，你本回合内对其使用牌没有次数和距离限制且无视其防具。若你没赢，你本回合内不能使用【杀】。若你以此法失去的拼点牌为【杀】，则你的【杀】不计入本回合的手牌上限。',
rejinjiu:'禁酒',

11
character/xianding.js
View File

@ -277,16 +277,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter:function(event,player){
if(!player.getHp()) return false;
if(event.name=='loseAsync'&&event.type!='gain') return false;
if(player.hasSkill('dcsbmengmou_true')&&player.hasSkill('dcsbmengmou_false')) return false;
var cards1=event.getl(player).cards2,cards2=event.getg(player);
return (!player.hasSkill('dcsbmengmou_true')&&game.hasPlayer(function(current){
return game.hasPlayer(function(current){
if(current==player) return false;
var cardsx=event.getg(current);
return cardsx.some(i=>cards1.includes(i));
}))||(!player.hasSkill('dcsbmengmou_false')&&game.hasPlayer(function(current){
})||game.hasPlayer(function(current){
if(current==player) return false;
var cardsx=event.getl(current).cards2;
return cards2.some(i=>cardsx.includes(i));
}));
});
},
direct:true,
content:function*(event,map){
@ -296,12 +297,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var targets=[],num=player.getHp();
var cards1=trigger.getl(player).cards2;
var cards2=trigger.getg(player);
if(!player.hasSkill('dcsbmengmou_true')) targets.addArray(game.filterPlayer(function(current){
targets.addArray(game.filterPlayer(function(current){
if(current==player) return false;
var cardsx=trigger.getg(current);
return cardsx.some(i=>cards1.includes(i));
}));
if(!player.hasSkill('dcsbmengmou_false')) targets.addArray(game.filterPlayer(function(current){
targets.addArray(game.filterPlayer(function(current){
if(current==player) return false;
var cardsx=trigger.getl(current).cards2;
return cards2.some(i=>cardsx.includes(i));