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

Merge pull request #1206 from PZ157/PR-Branch 

bug修复，combo添加
This commit is contained in:
Spmario233 2024-04-15 10:52:52 +08:00 committed by GitHub
parent 55bdcced37 11b2c56619
commit 650b714ea7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 172 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
character/clan.js
View File

@ -1468,6 +1468,9 @@ game.import('character',function(){
delete player.getStat().skill.clanguangu;
game.log(player,'重置了','#g【观骨】');
},
ai:{
combo:'clanguangu'
},
mod:{
aiOrder(player,card,num){
if(!player.hasSkill('clanguangu')||!player.getStat().skill.clanguangu) return;
@ -2250,6 +2253,9 @@ game.import('character',function(){
},
content(){
player.recover();
},
ai:{
combo:'clansankuang'
}
},
//族荀淑

17
character/extra.js
View File

@ -1829,6 +1829,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'dcxianjin'
}
},
dcxianjin:{
init(player){
@ -1886,6 +1889,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'dctuoyu'
}
},
dcqijing:{
derivation:'dccuixin',
@ -1937,6 +1943,9 @@ game.import('character', function () {
'step 3'
player.insertPhase();
},
ai:{
combo:'dctuoyu'
}
},
dccuixin:{
audio:2,
@ -3913,6 +3922,7 @@ game.import('character', function () {
skillTagFilter(player,tag,arg){
return arg&&arg.target&&arg.target.hasMark('yingba_mark')
},
combo:'yingba'
},
subSkill:{
usea:{
@ -3959,6 +3969,7 @@ game.import('character', function () {
},
},
ai:{
combo:'yingba',
effect:{
target(card,player,target){
if(get.tag(card,'recover')&&_status.event.type=='phase'&&!player.needsToDiscard()) return 0.2;
@ -5385,6 +5396,9 @@ game.import('character', function () {
player.loseMaxHp();
player.gain(player.getExpansions('chuyuan'),'gain2','fromStorage');
},
ai:{
combo:'chuyuan'
}
},
tianxing:{
audio:2,
@ -5414,6 +5428,9 @@ game.import('character', function () {
'step 2'
player.addSkills(result.control);
},
ai:{
combo:'chuyuan'
}
},
olzhiti:{
audio:'drlt_zhiti',

31
character/huicui.js
View File

@ -576,6 +576,7 @@ game.import('character', function () {
return 13;
}
},
combo:'dcsanshi'
},
},
//王凌
@ -1640,6 +1641,7 @@ game.import('character', function () {
},0);
},
},
combo:'dcqiqin'
},
getWeiWanEffect:(player,cardx,target)=>{
const suit=get.suit(cardx,player);
@ -3264,6 +3266,9 @@ game.import('character', function () {
player.addMark('dcgonghu_'+(trigger.name=='damage'?'damage':'basic'),1,false);
game.log(player,'修改了技能','#g【破锐】');
},
ai:{
combo:'dcporui'
},
subSkill:{
trick:{
audio:'dcgonghu',
@ -3602,6 +3607,9 @@ game.import('character', function () {
}
}
},
ai:{
combo:'dcjizhong'
}
},
dcguangshi:{
audio:2,
@ -3613,6 +3621,9 @@ game.import('character', function () {
content:function(){
player.draw(2);
player.loseHp();
},
ai:{
combo:'dcjizhong'
}
},
//董绾
@ -4214,6 +4225,7 @@ game.import('character', function () {
player.addSkills(['dctaji','dcqinghuang']);
},
ai:{
combo:'dchuiling',
order:function(itemp,player){
if(player.hasCard(card=>{
return get.type(card)!='equip'&&player.getUseValue(card)>1;
@ -4335,6 +4347,9 @@ game.import('character', function () {
player.addTempSkill('dcqinghuang_add');
player.addMark('dcqinghuang_add',1,false);
},
ai:{
combo:'dctaji'
},
subSkill:{
add:{
charlotte:true,
@ -4687,6 +4702,9 @@ game.import('character', function () {
player.gain(trigger.cards.filterInD('d'),'gain2');
}
},
ai:{
combo:'dcyinlu'
}
},
//孙资刘放
dcqinshen:{
@ -5511,6 +5529,9 @@ game.import('character', function () {
content:function(){
player.draw(player.getHistory('useSkill',evt=>['yizan_use','yizan_use_backup'].includes(evt.sourceSkill||evt.skill)).length)
},
ai:{
combo:'yizan_use'
}
},
dclongyuan:{
audio:'xinfu_longyuan',
@ -5532,6 +5553,9 @@ game.import('character', function () {
player.storage.yizan=true;
},
derivation:'yizan_rewrite',
ai:{
combo:'yizan_use'
}
},
//黄皓
dcqinqing:{
@ -9260,6 +9284,9 @@ game.import('character', function () {
sub:true,
},
},
ai:{
combo:'yuanyu'
}
},
//滕胤
chenjian:{
@ -11802,6 +11829,7 @@ game.import('character', function () {
if(player.countCards('h')>3||player==_status.currentPhase) return Math.max(o1,o2)+0.1;
return Math.min(o1,o2)-0.1;
},
combo:'dcmiyun',
respondSha:true,
respondShan:true,
skillTagFilter:function(player,tag,arg){
@ -11956,6 +11984,9 @@ game.import('character', function () {
content:function(){
player.addTempSkill('zhuangdan_mark',{player:'phaseEnd'})
},
ai:{
combo:'zhuangdan'
}
},
zhuangdan_mark:{
mark:true,

3
character/jsrg.js
View File

@ -5906,6 +5906,9 @@ game.import('character', function () {
}
},
},
ai:{
combo:'sbyingmen'
}
},
jsrgchaozheng:{
audio:2,

7
character/mobile.js
View File

@ -2946,6 +2946,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'yichong'
}
},
//张嶷
xinwurong:{
@ -4902,6 +4905,7 @@ game.import('character', function () {
player:1
},
threaten:1.4,
combo:'spdaming'
},
subSkill:{
backup:{},
@ -15400,6 +15404,9 @@ game.import('character', function () {
player.storage.yizan=true;
},
derivation:'yizan_rewrite',
ai:{
combo:'yizan_use'
}
},
xinfu_jingxie:{
audio:2,

13
character/offline.js
View File

@ -2140,6 +2140,7 @@ game.import('character', function () {
},
},
ai:{
combo:'psshiyin',
order:9.9,
result:{
player:function(player){
@ -3372,6 +3373,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'zyshilu'
}
},
//孟达
qiuan:{
@ -3390,6 +3394,9 @@ game.import('character', function () {
player.addToExpansion('gain2',cards).gaintag.add('qiuan');
trigger.cancel();
},
ai:{
combo:'liangfan'
},
intro:{
content:'expansion',
markcount:'expansion',
@ -3411,6 +3418,9 @@ game.import('character', function () {
'step 1'
player.loseHp();
},
ai:{
combo:'qiuan'
}
},
liangfan2:{
audio:'liangfan',
@ -4059,6 +4069,9 @@ game.import('character', function () {
}
}
},
ai:{
neg:true
}
},
yjyongquan:{
audio:2,

1
character/refresh.js
View File

@ -13936,6 +13936,7 @@ game.import('character', function () {
return get.effect(player,{name:'losehp'},player,player);
}
},
neg:true
}
},
zhaxiang:{

14
character/sb.js
View File

@ -1106,6 +1106,7 @@ game.import('character', function () {
return (Array.from({length:6}).map((_,i)=>i+5).includes(list[0])&&info.getEffect(player,list[0])>0)?1:0;
},
result:{player:1},
combo:'sbxingshang'
},
subSkill:{
backup:{},
@ -2001,6 +2002,9 @@ game.import('character', function () {
});
}
},
ai:{
combo:'sbguanxing'
}
},
//卢植
sbzhenliang:{
@ -3618,6 +3622,9 @@ game.import('character', function () {
if(result.bool) player.give(result.cards,target);
'step 3'
if(targets.length) event.goto(1);
},
ai:{
combo:'sbxuanhuo'
}
},
//姜维
@ -4311,6 +4318,9 @@ game.import('character', function () {
},
},
derivation:'sblongdan_shabi',
ai:{
combo:'sblongdan'
}
},
//张飞
sbpaoxiao:{
@ -5167,6 +5177,7 @@ game.import('character', function () {
target.damage('thunder');
},
ai:{
combo:'sbguidao',
order:9,
result:{
target:function(player,target){
@ -5867,6 +5878,9 @@ game.import('character', function () {
name2:'业',
content:'mark',
},
ai:{
combo:'sbzhiheng'
},
subSkill:{
broadcast:{
trigger:{

6
character/shiji.js
View File

@ -3040,7 +3040,7 @@ game.import('character', function () {
}
},
ai:{
combo:'xinmingshi',
combo:'xinlirang',
effect:{
target:function(card,player,target){
if(get.tag(card,'damage')&&target.hasMark('xinlirang')){
@ -4498,6 +4498,9 @@ game.import('character', function () {
if(card) target.gain(card,'gain2');
}
},
ai:{
combo:'mjdingyi'
}
},
mjfubi:{
audio:'fubi',
@ -4569,6 +4572,7 @@ game.import('character', function () {
return 2;
},
},
combo:'mjdingyi'
},
subSkill:{
round:{},

17
character/sp.js
View File

@ -18186,6 +18186,9 @@ game.import('character', function () {
if(num>0) player.gainMaxHp(num);
else player.loseMaxHp(-num);
player.recover();
},
ai:{
combo:'fanghun'
}
},
refuhan:{
@ -19425,6 +19428,9 @@ game.import('character', function () {
if(cards.length) player.gain(cards,'gain2');
},
group:'rejici2',
ai:{
combo:'regushe'
}
},
rejici2:{
audio:'jici',
@ -22148,6 +22154,9 @@ game.import('character', function () {
unique:true,
zhuSkill:true,
locked:true,
ai:{
combo:'canshi'
}
},
canshi:{
audio:2,
@ -22208,6 +22217,7 @@ game.import('character', function () {
trigger.num++;
},
ai:{
neg:true,
effect:{
target:function(card,player,target,current){
if(get.tag(card,'damage')&&target.countCards('h')==0) return [1,-2];
@ -22279,6 +22289,7 @@ game.import('character', function () {
trigger.num++;
},
ai:{
neg:true,
effect:{
target:function(card,player,target,current){
if(card.name=='sha'&&target.countCards('h')==0) return [1,-2];
@ -26240,7 +26251,7 @@ game.import('character', function () {
},
ai:{
threaten:1.4,
combo:'xinfu_dianhua'
combo:'xinfu_zhenyi'
},
},
"xinfu_dianhua":{
@ -26319,6 +26330,7 @@ game.import('character', function () {
game.delayx();
},
ai:{
combo:'xinfu_falu',
threaten:2.2
},
},
@ -26355,9 +26367,6 @@ game.import('character', function () {
player.gain(event.togain,'gain2');
}
},
ai:{
combo:'xinfu_dianhua'
}
},
"zhenyi_spade":{
trigger:{

11
character/sp2.js
View File

@ -2528,6 +2528,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'dcjinjian'
}
},
//赵俨
dcfuning:{
@ -4588,6 +4591,9 @@ game.import('character', function () {
'step 2'
game.delayx();
},
ai:{
combo:'jinghe'
}
},
nhyinbing:{
trigger:{source:'damageBefore'},
@ -8397,6 +8403,7 @@ game.import('character', function () {
}
}
},
combo:'liangying'
},
},
sushou:{
@ -8487,6 +8494,9 @@ game.import('character', function () {
'step 1'
game.delay();
},
ai:{
combo:'cangchu'
}
},
liehou:{
enable:'phaseUse',
@ -10082,6 +10092,7 @@ game.import('character', function () {
}
},
ai:{
combo:'xinfu_lveming',
order:function(){
var player=_status.event.player,num=0;
for(var i=1;i<6;i++){

17
character/tw.js
View File

@ -2117,6 +2117,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'twshenyi'
}
},
//张纮
twquanqian:{
@ -9476,7 +9479,10 @@ game.import('character', function () {
player.addTempSkill('twqiongji_silent');
}
},
ai:{combo:'twxiawei'},
ai:{
combo:'twxiawei',
halfneg:true
},
subSkill:{silent:{charlotte:true}},
},
//卞夫人
@ -11410,6 +11416,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'twzhengjian'
}
},
//田豫
twzhenxi:{
@ -12386,6 +12395,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'twjingce'
}
},
twlihuo:{
trigger:{player:'useCard1'},
@ -14637,6 +14649,9 @@ game.import('character', function () {
player.gain(card,'gain2','log');
}
},
ai:{
combo:'refanghun'
}
},
twqueshi:{
trigger:{

37
character/xianding.js
View File

@ -596,7 +596,7 @@ game.import('character', function () {
await game.asyncDelayx();
}
}
if (target.countCards('h') <= game.countPlayer()) return;
if (target.countCards('h') < game.countPlayer()) return;
player.when({global: 'wuguRemained'}).filter(evt => {
return evt.getParent(3) === event;
}).vars({originalOwner: target}).then(() => {
@ -1655,6 +1655,9 @@ game.import('character', function () {
},
},
},
ai:{
combo:'dczhifou'
}
},
dczhifou:{
audio:2,
@ -1781,6 +1784,9 @@ game.import('character', function () {
'1':{charlotte:true},
'2':{charlotte:true},
},
ai:{
combo:'dclingxi'
}
},
//周瑜
//无 双 万 军 取 首
@ -2823,6 +2829,7 @@ game.import('character', function () {
player.addTempSkill('dczhangcai_all',{player:'phaseBegin'});
},
ai:{
combo:'dczhangcai',
order:15,
result:{
player:function(player){
@ -6102,6 +6109,9 @@ game.import('character', function () {
});
if(card) player.addToExpansion(card,'gain2').gaintag.add('dcwangyuan');
},
ai:{
combo:'dclingyin'
},
marktext:'妄',
intro:{
name:'妄(妄缘/铃音)',
@ -7665,6 +7675,9 @@ game.import('character', function () {
content:function(){
player.addMark('dclingfang',1);
},
ai:{
combo:'dcfengying'
},
marktext:'绞',
intro:{
name:'绞',
@ -7760,6 +7773,7 @@ game.import('character', function () {
}
},
threaten:2,
combo:'dclingfang'
},
subSkill:{
record:{
@ -7805,6 +7819,9 @@ game.import('character', function () {
var card=get.discardPile(card=>get.color(card,false)=='black');
if(card) player.gain(card,'gain2');
player.loseHp();
},
ai:{
combo:'dclingfang'
}
},
//袁姬
@ -8265,6 +8282,9 @@ game.import('character', function () {
else player.marks[name]=player.mark(name,info);
player.updateMarks();
},
ai:{
combo:'dcmengjie'
},
subSkill:{
forceFinish:{charlotte:true},
wuyong:{
@ -8487,6 +8507,9 @@ game.import('character', function () {
}
game.delayx();
event.goto(1);
},
ai:{
combo:'dctongguan'
}
},
//刘晔
@ -9285,7 +9308,7 @@ game.import('character', function () {
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
filter:function(event,player){
if(!player.hasSkill('dcligong')) return false;
if(!player.hasSkill('dchuishu')) return false;
var list=lib.skill.dchuishu.getList(player);
for(var i of list){
if(i>=5) return true;
@ -9434,6 +9457,9 @@ game.import('character', function () {
player.draw(3);
}
},
ai:{
combo:'dchuishu'
}
},
//杜夔
dcfanyin:{
@ -9692,6 +9718,9 @@ game.import('character', function () {
lib.skill.dcwanglu.broadcast(player);
}
},
ai:{
combo:'dcwanglu'
}
},
dcchaixie:{
audio:2,
@ -9725,6 +9754,9 @@ game.import('character', function () {
}
player.draw(num);
},
ai:{
combo:'dcwanglu'
}
},
dagongche_skill:{
trigger:{player:'phaseUseBegin'},
@ -11543,6 +11575,7 @@ game.import('character', function () {
})) return [1,1];
},
},
combo:'xinzhoufu'
},
},
//孙翊