技能写法修改,Bugfix
This commit is contained in:
parent
bbfa0e47e9
commit
1a1accd7a9
|
@ -5543,7 +5543,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
},
|
||||
content(){
|
||||
player.removeMark('baonu',2);
|
||||
player.addTempSkill('wushuang');
|
||||
player.addTempSkills('wushuang');
|
||||
player.popup('无双');
|
||||
game.log(player,'获得了技能','#g【无双】');
|
||||
target.addTempSkill('ol_wuqian_targeted');
|
||||
|
|
|
@ -6439,7 +6439,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
var pos=lib.skill.midu_backup.equip;
|
||||
if(pos<=0) player.enableJudge();
|
||||
else player.enableEquip(pos);
|
||||
player.addTempSkill('rehuomo',{player:'phaseBegin'});
|
||||
player.addTempSkills('rehuomo',{player:'phaseBegin'});
|
||||
},
|
||||
}
|
||||
}
|
||||
|
@ -7151,7 +7151,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
var info=get.info(i);
|
||||
return info&&!get.is.locked(i)&&!info.limited&&!info.juexingji&&!info.zhuSkill&&!info.charlotte;
|
||||
});
|
||||
target.addAdditionalSkill('dcjiezhen_blocker','bazhen');
|
||||
target.addAdditionalSkills('dcjiezhen_blocker','bazhen');
|
||||
target.addSkill('dcjiezhen_blocker');
|
||||
target.markAuto('dcjiezhen_blocker',skills);
|
||||
player.addSkill('dcjiezhen_clear');
|
||||
|
@ -7297,7 +7297,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player.awakenSkill('dczecai');
|
||||
var target=result.targets[0];
|
||||
player.logSkill('dczecai',target);
|
||||
target.addAdditionalSkill('dczecai_effect','rejizhi');
|
||||
target.addAdditionalSkills('dczecai_effect','rejizhi');
|
||||
target.addTempSkill('dczecai_effect','roundStart');
|
||||
if(target==event.target){
|
||||
var evt=trigger._trigger;
|
||||
|
|
|
@ -2029,7 +2029,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
return lib.filter.canBeDiscarded(card,player,target);
|
||||
},'e')){
|
||||
player.discardPlayerCard(target,'e',true);
|
||||
target.addAdditionalSkill('jsrgqingzi_'+player.playerid,'xinshensu');
|
||||
target.addAdditionalSkills('jsrgqingzi_'+player.playerid,'xinshensu');
|
||||
player.markAuto('jsrgqingzi_clear',[target]);
|
||||
}
|
||||
event.num++;
|
||||
|
|
|
@ -5914,7 +5914,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
delete player._mouduan_mark;
|
||||
}
|
||||
},player);
|
||||
player.removeAdditionalSkill('mouduan');
|
||||
player.removeAdditionalSkills('mouduan');
|
||||
},
|
||||
trigger:{player:'loseEnd'},
|
||||
forced:true,
|
||||
|
@ -5930,7 +5930,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player._mouduan_mark.firstChild.innerHTML='文';
|
||||
player._mouduan_mark.info.content='拥有技能【英姿】、【克己】';
|
||||
},player);
|
||||
player.addAdditionalSkill('mouduan',['yingzi','keji']);
|
||||
player.addAdditionalSkills('mouduan',['yingzi','keji']);
|
||||
},
|
||||
group:'mouduan2'
|
||||
},
|
||||
|
@ -5956,7 +5956,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player._mouduan_mark.firstChild.innerHTML='武';
|
||||
player._mouduan_mark.info.content='拥有技能【激昂】、【谦逊】';
|
||||
},player);
|
||||
player.addAdditionalSkill('mouduan',['jiang','qianxun']);
|
||||
player.addAdditionalSkills('mouduan',['jiang','qianxun']);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -1137,7 +1137,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player.addTempSkill('drlt_jueyan2');
|
||||
break;
|
||||
case 'equip5':
|
||||
player.addTempSkill('rejizhi');
|
||||
player.addTempSkills('rejizhi');
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
|
|
@ -14530,7 +14530,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
return -1;
|
||||
};
|
||||
'step 1'
|
||||
if(result.bool) trigger.player.addTempSkill('yuxu');
|
||||
if(result.bool) trigger.player.addTempSkills('yuxu');
|
||||
},
|
||||
ai:{
|
||||
expose:0.25,
|
||||
|
|
|
@ -4239,9 +4239,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
var skill=result.control;
|
||||
if(skill!='cancel2'){
|
||||
event.skills.remove(skill);
|
||||
target.addAdditionalSkill('jinghe_'+player.playerid,skill);
|
||||
target.addAdditionalSkills('jinghe_'+player.playerid,skill);
|
||||
target.popup(skill);
|
||||
game.log(target,'获得了技能','#g【'+get.translation(skill)+'】');
|
||||
}
|
||||
if(event.num<event.targets.length) event.goto(1);
|
||||
if(target!=game.me&&!target.isOnline2()) game.delayx();
|
||||
|
@ -4258,7 +4257,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
clear:{
|
||||
onremove:function(player){
|
||||
game.countPlayer(function(current){
|
||||
current.removeAdditionalSkill('jinghe_'+player.playerid);
|
||||
current.removeAdditionalSkills('jinghe_'+player.playerid);
|
||||
});
|
||||
},
|
||||
},
|
||||
|
|
|
@ -3725,7 +3725,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
})){
|
||||
player.line(target);
|
||||
target.markAuto('twlinglu',[player]);
|
||||
target.addAdditionalSkill('twkunsi_temp','twlinglu');
|
||||
target.addAdditionalSkills('twkunsi_temp','twlinglu');
|
||||
player.markAuto('twkunsi_clear',[target]);
|
||||
player.addTempSkill('twkunsi_clear',{player:'phaseBegin'});
|
||||
}
|
||||
|
|
|
@ -1722,9 +1722,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
else event.finish();
|
||||
'step 2'
|
||||
target.line(player);
|
||||
player.addTempSkill(result.control,'phaseUseEnd');
|
||||
player.addTempSkills(result.control,'phaseUseEnd');
|
||||
player.popup(result.control);
|
||||
game.log(player,'获得了','#g【'+get.translation(result.control)+'】');
|
||||
},
|
||||
ai:{
|
||||
order:function(item,player){
|
||||
|
|
|
@ -1050,9 +1050,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
var target=result.targets[0],skill=event.skill;
|
||||
player.line(target);
|
||||
player.addTempSkill('gzrejinghe_clear',{player:'phaseBegin'});
|
||||
target.addAdditionalSkill('gzrejinghe_'+player.playerid,skill);
|
||||
target.addAdditionalSkills('gzrejinghe_'+player.playerid,skill);
|
||||
target.popup(skill);
|
||||
game.log(target,'获得了技能','#g【'+get.translation(skill)+'】');
|
||||
}
|
||||
},
|
||||
intro:{
|
||||
|
@ -1084,7 +1083,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
clear:{
|
||||
onremove:function(player){
|
||||
game.countPlayer(function(current){
|
||||
current.removeAdditionalSkill('gzrejinghe_'+player.playerid);
|
||||
current.removeAdditionalSkills('gzrejinghe_'+player.playerid);
|
||||
});
|
||||
},
|
||||
},
|
||||
|
@ -2833,8 +2832,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
else player.chooseControl(skills).set('prompt','选择获得一个技能直到回合结束');
|
||||
'step 2'
|
||||
var skill=result.control;
|
||||
player.addTempSkill(skill);
|
||||
game.log(player,'获得了技能','#g【'+get.translation(skill)+'】');
|
||||
player.addTempSkills(skill);
|
||||
player.popup(skill);
|
||||
},
|
||||
derivation:['gzqice','tiaoxin','gzzhiheng','new_chuli','gzsanchen'],
|
||||
ai:{
|
||||
|
@ -4037,9 +4036,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
var skill=result.control;
|
||||
if(skill!='cancel2'){
|
||||
event.skills.remove(skill);
|
||||
target.addAdditionalSkill('gzjinghe_'+player.playerid,skill);
|
||||
target.addAdditionalSkills('gzjinghe_'+player.playerid,skill);
|
||||
target.popup(skill);
|
||||
game.log(target,'获得了技能','#g【'+get.translation(skill)+'】');
|
||||
}
|
||||
if(event.num<event.targets.length) event.goto(1);
|
||||
if(target!=game.me&&!target.isOnline2()) game.delayx();
|
||||
|
@ -4056,7 +4054,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
clear:{
|
||||
onremove:function(player){
|
||||
game.countPlayer(function(current){
|
||||
current.removeAdditionalSkill('gzjinghe_'+player.playerid);
|
||||
current.removeAdditionalSkills('gzjinghe_'+player.playerid);
|
||||
});
|
||||
},
|
||||
},
|
||||
|
@ -5549,7 +5547,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
return player.countMark('gzsuzhi_count')<3;
|
||||
},
|
||||
content:function(){
|
||||
player.addTempSkill('gzfankui',{player:'phaseBegin'});
|
||||
player.addTempSkills('gzfankui',{player:'phaseBegin'});
|
||||
},
|
||||
group:['gzsuzhi_damage','gzsuzhi_draw','gzsuzhi_gain'],
|
||||
preHidden:['gzsuzhi_damage','gzsuzhi_draw','gzsuzhi_gain'],
|
||||
|
@ -9745,8 +9743,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
|||
locked:false,
|
||||
//priority:3,
|
||||
content:function(){
|
||||
player.addTempSkill('baka_yingzi','phaseAfter');
|
||||
player.addTempSkill('baka_yinghun','phaseAfter');
|
||||
player.addTempSkills(['baka_yingzi','baka_yinghun']);
|
||||
},
|
||||
ai:{
|
||||
threaten:function(player,target){
|
||||
|
|
|
@ -7296,12 +7296,13 @@ export class Player extends HTMLDivElement {
|
|||
return this.changeSkills([], Array.isArray(skill) ? skill : [skill]);
|
||||
}
|
||||
changeSkills(addSkill = [], removeSkill = []){
|
||||
const next = game.createEvent('changeSkills', false);
|
||||
next.player = this;
|
||||
if(!Array.isArray(addSkill) || !Array.isArray(removeSkill)){
|
||||
console.warn(`警告:Player[${this.name}].changeSkills的参数错误,应当为数组形式。`);
|
||||
return;
|
||||
}
|
||||
const next = game.createEvent('changeSkills', false);
|
||||
next.player = this;
|
||||
next.forceDie = true;
|
||||
next.addSkill = addSkill.slice(0).unique();
|
||||
next.removeSkill = removeSkill.slice(0).unique();
|
||||
next.setContent('changeSkills');
|
||||
|
@ -7710,14 +7711,14 @@ export class Player extends HTMLDivElement {
|
|||
}
|
||||
this.removeSkillTrigger(skill);
|
||||
if (!info.keepSkill) {
|
||||
this.removeAdditionalSkill(skill);
|
||||
this.removeAdditionalSkills(skill);
|
||||
}
|
||||
}
|
||||
this.enableSkill(skill + '_awake');
|
||||
}
|
||||
return skill;
|
||||
}
|
||||
addTempSkills(skillsToAdd, expire, checkConflict){
|
||||
addTempSkills(skillsToAdd, expire){
|
||||
//请注意,该方法的底层实现并非tempSkill,而是additionalSkills和player.when!
|
||||
if (typeof skillsToAdd == 'string') skillsToAdd = [skillsToAdd];
|
||||
if(!Array.isArray(skillsToAdd) || !skillsToAdd.length){
|
||||
|
@ -7726,7 +7727,7 @@ export class Player extends HTMLDivElement {
|
|||
//确定技能要被移除的时机
|
||||
if (!expire) expire = { global: ['phaseAfter', 'phaseBeforeStart'] };
|
||||
else if (typeof expire == 'string' || Array.isArray(expire)) expire = { global: expire };
|
||||
this.changeSkills(skillsToAdd, []).set('$handle', function(player, addSkills, removeSkills){
|
||||
return this.changeSkills(skillsToAdd, []).set('$handle', function(player, addSkills, removeSkills){
|
||||
if(addSkills.length){
|
||||
game.log(player, '获得了技能', ...addSkills.map(i => {
|
||||
return '#g【' + get.translation(i) + '】';
|
||||
|
|
Loading…
Reference in New Issue