fix 孔融
This commit is contained in:
parent
4b291cb03a
commit
151b058ff2
|
@ -10725,7 +10725,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
});
|
});
|
||||||
'step 1'
|
'step 1'
|
||||||
if(!result.bool) player.draw();
|
if(!result.bool) player.draw();
|
||||||
else player.chooseUseTarget({name:result.links[0][2],isCard:true,nature:result.links[0][3]});
|
else player.chooseUseTarget({name:result.links[0][2],isCard:true,nature:result.links[0][3]},true);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
zhiyi:{
|
zhiyi:{
|
||||||
|
|
|
@ -4259,15 +4259,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
lib.skill.pingjian.initList();
|
lib.skill.pingjian.initList();
|
||||||
}
|
}
|
||||||
_status.characterlist.randomSort();
|
_status.characterlist.randomSort();
|
||||||
var bool=false;
|
|
||||||
for(var i=0;i<_status.characterlist.length;i++){
|
for(var i=0;i<_status.characterlist.length;i++){
|
||||||
var name=_status.characterlist[i];
|
let name=_status.characterlist[i];
|
||||||
if(name.indexOf('zuoci')!=-1||name.indexOf('key')==0||lib.skill.rehuashen.banned.contains(name)||player.storage.huashen.owned[name]) continue;
|
if(name.indexOf('zuoci')!=-1||name.indexOf('key_')==0||name.indexOf('sp_key_')==0||lib.skill.rehuashen.banned.includes(name)||player.storage.huashen.owned[name]) continue;
|
||||||
var skills=lib.character[name][3];
|
let skills=lib.character[name][3].filter(skill=>{
|
||||||
for(var j=0;j<skills.length;j++){
|
const categories=get.skillCategoriesOf(skill);
|
||||||
var info=lib.skill[skills[j]];
|
return !categories.some(type=>lib.skill.rehuashen.bannedType.includes(type));
|
||||||
if(info.charlotte||(info.unique&&!info.gainable)||info.juexingji||info.limited||info.zhuSkill||info.hiddenSkill||info.dutySkill) skills.splice(j--,1);
|
})
|
||||||
}
|
|
||||||
if(skills.length){
|
if(skills.length){
|
||||||
player.storage.huashen.owned[name]=skills;
|
player.storage.huashen.owned[name]=skills;
|
||||||
_status.characterlist.remove(name);
|
_status.characterlist.remove(name);
|
||||||
|
|
|
@ -302,7 +302,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
else playerx.chooseButton([
|
else playerx.chooseButton([
|
||||||
`请选择要视为对${get.translation(player)}使用的牌`,
|
`请选择要视为对${get.translation(player)}使用的牌`,
|
||||||
[names,'vcard'],
|
[names,'vcard'],
|
||||||
]).set('ai',(button)=>{
|
],true).set('ai',(button)=>{
|
||||||
return button.link[0][2]==_status.event.choice;
|
return button.link[0][2]==_status.event.choice;
|
||||||
}).set('choice',function(){
|
}).set('choice',function(){
|
||||||
var list=names.map(name=>{
|
var list=names.map(name=>{
|
||||||
|
|
10
game/game.js
10
game/game.js
|
@ -16292,7 +16292,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(event.isMine()){
|
if(event.isMine()){
|
||||||
if(event.direct&&num==selectButton[0]||event.forceDirect){
|
if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){
|
||||||
|
ui.click.cancel();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if(event.direct&&num==selectButton[0]||event.forceDirect){
|
||||||
var buttons=buttonsx.slice(0,num);
|
var buttons=buttonsx.slice(0,num);
|
||||||
event.result={
|
event.result={
|
||||||
bool:true,
|
bool:true,
|
||||||
|
@ -16305,10 +16309,6 @@
|
||||||
game.check();
|
game.check();
|
||||||
game.pause();
|
game.pause();
|
||||||
}
|
}
|
||||||
if(event.hsskill&&!event.forced&&_status.prehidden_skills.contains(event.hsskill)){
|
|
||||||
ui.click.cancel();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if(event.isOnline()){
|
else if(event.isOnline()){
|
||||||
if(event.direct&&num==1||event.forceDirect){
|
if(event.direct&&num==1||event.forceDirect){
|
||||||
|
|
|
@ -2399,11 +2399,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
|
||||||
var effect=0,c,shown;
|
var effect=0,c,shown;
|
||||||
var info=get.info(card);
|
var info=get.info(card);
|
||||||
if(info.ai&&info.ai.expose){
|
if(info.ai&&info.ai.expose){
|
||||||
if(_status.event.name=='_wuxie'){
|
if(_status.event.name=='_wuxie'&&card.name=='wuxie'){
|
||||||
if(_status.event.source&&_status.event.source.ai.shown){
|
const infomap=_status.event._info_map;
|
||||||
|
if(infomap){
|
||||||
|
if(this!=infomap.target&&infomap.player&&infomap.player.ai.shown){
|
||||||
this.ai.shown+=0.2;
|
this.ai.shown+=0.2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else{
|
else{
|
||||||
this.ai.shown+=info.ai.expose;
|
this.ai.shown+=info.ai.expose;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue