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

fix some other bugs with eslint

This commit is contained in:
kuangshen04 2023-11-07 02:07:27 +08:00
parent a4178cb2b9
commit 8cddd98a5c
35 changed files with 1690 additions and 1737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@ -12,6 +12,7 @@
"no-undef": 0,
"no-redeclare": 0,
"no-prototype-builtins": 0,
"require-yield": 0,
"no-irregular-whitespace": ["error", { "skipStrings": true, "skipTemplates": true }],
"no-constant-condition": ["error", { "checkLoops": false }]/* ,
"comma-dangle": ["error", "only-multiline"],

1
card/yingbian.js
View File

@ -238,7 +238,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
fullskin:true,
type:'equip',
subtype:'equip5',
loseDelay:false,
skills:['tianjitu_skill'],
onLose:function(){
player.addTempSkill('tianjitu_skill_lose')

4
card/zhulu.js
View File

@ -48,7 +48,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
return get.type(card)=='equip'&&!cards.contains(card);
});
if(cardx) cards.push(cardx);
};
}
if(!cards.length){
event.finish();
event.getParent().excluded.addArray(game.players);
@ -701,7 +701,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
player.$throw(card);
game.log(card,'进入了弃牌堆');
delete _status.jinhe[es[i].cardid];
};
}
}
game.broadcastAll(function(jinhe){
_status.jinhe=jinhe;

2
character/clan.js
View File

@ -210,7 +210,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
list.push([get.translation(get.type(name)),'',name]);
if(name=='sha'){
for(var nature of lib.inpile_nature){
if(!player.canUse(get.autoViewAs({name:name,nature,nature},[]),target)) continue;
if(!player.canUse(get.autoViewAs({name:name,nature:nature},[]),target)) continue;
list.push([get.translation(get.type(name)),'',name,nature]);
}
}

4
character/ddd.js
View File

@ -526,7 +526,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var skill={
viewAs:{
name:links[0][2],
isCard:true,
suit:'none',
number:null,
isCard:true,
@ -1697,7 +1696,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
dddxunxun:{
inherit:"xunxun",
audio:"ext:3D8测试包:2",
audio:2,
},
dddfusi:{
mod:{
@ -3381,7 +3380,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
//轲比能
dddxiaoxing:{
audio:2,
forced:true,
trigger:{global:'gameDrawBegin'},
forced:true,
group:'dddxiaoxing_remove',

26
character/diy.js
View File

@ -294,7 +294,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
key_inari:'#bSummer Pockets',
key_saya:'#bLittle Busters!',
key_harukakanata:'#bLittle Busters!',
key_tsumugi:'#bSummer Pockets',
key_yui:'#rAngel Beats!',
key_yoshino:'#bRewrite',
key_kengo:'#bLittle Busters!',
@ -3793,7 +3792,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.chooseButton(['选择获得一张“兴”',player.getExpansions('tenzen_yixing')],true);
'step 1'
if(result.bool){
player.gain(result.links,'gain2');;
player.gain(result.links,'gain2');
}
var next=game.createEvent('tenzen_yixing_insert');
event.next.remove(next);
@ -4958,10 +4957,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
switch(button.link){
case 3:return 4.5;break;
case 4:return 4.4;break;
case 5:return 4.3;break;
case 2:return (3-player.hp)*1.5;break;
case 3:return 4.5;
case 4:return 4.4;
case 5:return 4.3;
case 2:return (3-player.hp)*1.5;
case 1:{
if(game.hasPlayer(function(current){
return (get.realAttitude||get.attitude)(player,current)<0&&get.distance(player,current)>1;
@ -6122,7 +6121,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.popup('花绽',get.groupnature(name.slice(12)));
game.log(player,'发动了技能',lib.translate[name].replace(/魔物/g,'【花绽】'));
player.removeMark(name,1,false);
;game.log(player,'移去了一个',lib.translate[name].replace(/魔物/g,'【魔物】'));
game.log(player,'移去了一个',lib.translate[name].replace(/魔物/g,'【魔物】'));
},
}
}
@ -6388,7 +6387,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{source:'damageBefore'},
forced:true,
charlotte:true,
audio:'abyusa_jueqing',
filter:function(event,player){
return player.storage.abyusa_jueqing_rewrite==true;
},
@ -9106,7 +9104,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
});
},
filterCard:true,
log:false,
filterTarget:function(card,player,target){
return target!=player&&target.hasZhuSkill('akane_yifu',player)&&!target.hasSkill('akane_yifu3');
},
@ -9349,7 +9346,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
for(var i=0;i<targets.length;i++){
if(targets[i].differentSexFrom(player)){
bool=true;break;
};
}
}
if(bool) player.loseHp();
},
@ -9807,10 +9804,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
backup:function(links,player){
return {
filterCard:true,
audio:'haruka_shuangche',
selectCard:-1,
filterCard:function(){return false},
selectCard:-1,
popname:true,
check:function(card){
return 6-get.value(card);
@ -11986,7 +11982,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
})){
event.finish();
return;
};
}
_status.currentPhase.chooseCard(get.translation(trigger.player)+'的'+(trigger.judgestr||'')+'判定为'+
get.translation(trigger.player.judging[0])+'，请打出一张手牌进行改判','h',true,function(card){
var player=_status.event.player;
@ -13140,11 +13136,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(n==1){
player.addTempSkill("releiji",{player:"phaseUseBegin"});
player.markSkill("releiji",{player:"phaseUseBegin"});
};
}
if(n==2){
player.addTempSkill("guidao",{player:"phaseUseBegin"});
player.markSkill("guidao",{player:"phaseUseBegin"});
};
}
},
},
ns_xiandao2:{

58
character/extra.js
View File

@ -135,7 +135,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
identities.add(i);
population=curPopulation;
}
};
}
return identities;
},
group:'jxlianpo_show',
@ -620,7 +620,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
})){
goon=6;
}
}catch(e){}
}catch(e){
console.trace(e);
}
ui.selected.cards.remove(card);
return goon-get.value(card);
},
@ -1756,7 +1758,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return game.hasPlayer(function(current){
return evt.filterTarget(sha,player,current);
})
};
}
})
},
prompt:'将场上的一张坐骑牌当做【杀】或【闪】使用或打出',
@ -1791,8 +1793,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false;
})){
list.push('sha');
};
}catch(e){game.print(e)};
}
}catch(e){game.print(e)}
_status.event=backupx;
if(list.length==1){
event.cardName=list[0];
@ -4400,14 +4402,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var list=[];
for(var i in player.disabledSkills){
if(player.disabledSkills[i].contains(skill)) list.push(i);
};
}
if(list.length){
var str='失效技能：';
for(var i=0;i<list.length;i++){
if(lib.translate[list[i]+'_info']) str+=get.translation(list[i])+'、';
};
}
return str.slice(0,str.length-1);
};
}
},
},
},
@ -5965,7 +5967,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(player.countCards('he',{suit:'heart'})<Math.max(1,player.hp)) return false;
break;
}
default:return true;break;
default:return true;
}
},
maixie:true,
@ -6501,7 +6503,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
else{
player.addTempSkill('nzry_longnu_1','phaseUseAfter');
};
}
},
subSkill:{
'1':{
@ -6607,7 +6609,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
result.targets[0].link(true);
}else{
event.finish();
};
}
},
},
},
@ -6662,8 +6664,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{
result.targets[0].link(true);
player.discardPlayerCard(result.targets[0],1,'hej',true);
};
};
}
}
'step 2'
if(player.countMark('nzry_junlve')>7){
player.chooseBool().set('ai',function(){
@ -6671,7 +6673,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}).set('prompt','是否弃置所有“军略”标记并对所有其他角色造成1点伤害？');
}else{
event.finish();
};
}
'step 3'
if(result.bool){
var players=game.players.slice(0).sortBySeat();
@ -6679,8 +6681,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.removeMark('nzry_junlve',player.countMark('nzry_junlve'));
for(var i=0;i<players.length;i++){
if(players[i]!=player) players[i].damage();
};
};
}
}
},
},
"nzry_dinghuo":{
@ -6833,14 +6835,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var list=[];
for(var i in player.disabledSkills){
if(player.disabledSkills[i].contains(skill)) list.push(i);
};
}
if(list.length){
var str='失效技能：';
for(var i=0;i<list.length;i++){
if(lib.translate[list[i]+'_info']) str+=get.translation(list[i])+'、';
};
}
return str.slice(0,str.length-1);
};
}
},
},
},
@ -6969,7 +6971,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
chooseButton.set('filterButton',function(button){
for(var i=0;i<ui.selected.buttons.length;i++){
if(get.suit(button.link)==get.suit(ui.selected.buttons[i].link)) return false;
};
}
return true;
});
'step 1'
@ -6980,8 +6982,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.list1.push(list[i]);
}else{
event.list2.push(list[i]);
};
};
}
}
if(event.list1.length&&event.list2.length){
game.loseAsync({
lose_list:[
@ -6995,7 +6997,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
target.discard(event.list2);
}
else player.discard(event.list1);
};
}
'step 2'
if(event.list1.length+event.list2.length==4){
if(event.list1.length==0) player.loseMaxHp();
@ -7006,13 +7008,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(evt.name=='phaseUse'){
evt.skipped=true;
break;
};
};
}
}
player.addTempSkill('drlt_poxi1',{player:'phaseAfter'});
};
}
if(event.list1.length==3) player.recover();
if(event.list1.length==4) player.draw(4);
};
}
},
ai:{
order:13,
@ -7123,7 +7125,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var mark=player.countMark('drlt_jieying_mark');
player.removeMark('drlt_jieying_mark',mark);
target.addMark('drlt_jieying_mark',mark);
};
}
},
},
'3':{

2
character/hearth.js
View File

@ -1959,7 +1959,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
case 'jiu':return 3.01;
case 'sha':
if(button.link[3]=='fire') return 2.95;
else if(button.link[3]=='fire') return 2.92;
else if(button.link[3]=='thunder') return 2.92;
else return 2.9;
default:return 2+_status.event.getRand()*2;
}

3
character/huicui.js
View File

@ -4138,7 +4138,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=evt.cards.filterInD();
return get.value(cards,evt.player)*get.attitude(player,evt.player);
}
return 0;
})
'step 1'
if(result.bool){
@ -5781,7 +5780,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
subSkill:{
blocker:{
charlotte:true,
init:function(player,skill){
player.addSkillBlocker(skill);
},
@ -10165,7 +10163,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
characterTitle:{
},
perfectPair:{},
characterFilter:{
},
dynamicTranslate:{

7
character/jsrg.js
View File

@ -384,7 +384,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
onremove:true,
filter:function(event,player){
if(!event.card.storage||!event.card.storage.jsrgzhenfeng) return false;
debugger
// debugger
var str=event.target.getSkills(null,false,false).map(skill=>{
var info=get.info(skill);
if(!info||info.charlotte) return;
@ -1992,7 +1992,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
subSkill:{
undist:{
group:'undist',
charlotte:true,
trigger:{
player:['useCardAfter','damageEnd'],
},
@ -2954,7 +2953,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(count==1) return true;
for(var i=0;i<ui.selected.buttons.length;i++){
if(get.owner(button.link)==get.owner(ui.selected.buttons[i].link)) return false;
};
}
return true;
}).set('count',targets.length).set('ai',button=>{
var player=_status.event.player;
@ -4390,7 +4389,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var ind=skillx.lastIndexOf('_');
if(ind==-1) break;
skillx=skillx.slice(0,ind);
};
}
}
if(popup!=false&&!infox.silent) infox.forced=false;
if(!infox.charlotte&&infox.mod) delete infox.mod;

18
character/offline.js
View File

@ -630,7 +630,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return game.hasPlayer(function(current){
return evt.filterTarget(sha,player,current);
})
};
}
})
},
prompt:'将场上的一张坐骑牌当做【杀】或【闪】使用或打出',
@ -665,8 +665,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false;
})){
list.push('sha');
};
}catch(e){game.print(e)};
}
}catch(e){game.print(e)}
_status.event=backupx;
if(list.length==1){
event.cardName=list[0];
@ -1533,7 +1533,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.addToExpansion(result.cards[0],'give',player).gaintag.add('psshiyin');
var card=player.getExpansions('psshiyin')[0];
if(card) player.gain(card,'gain2');
};
}
},
}
}
@ -1654,7 +1654,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(card.name=='du') addi-=5;
if(get.color(card)=='black') addi-=6;
if(player==event.player){
if(Boolean(event.small)){
if(event.small){
return -getn(card)-get.value(card)/2+addi;
}
return getn(card)-get.value(card)/2+addi;
@ -2670,9 +2670,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return '没有“戮”';
}
},
content:function(storage,player){
return '共有'+get.cnNumber(storage.length)+'张“戮”';
},
// content:function(storage,player){
// return '共有'+get.cnNumber(storage.length)+'张“戮”';
// },
},
group:'zyshilu_zhiheng',
subSkill:{
@ -4601,7 +4601,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(result.bool){
player.logSkill('spyinzhi');
event.goto(1);
};
}
},
},
spmingjian:{

22
character/refresh.js
View File

@ -331,10 +331,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
switch(button.link[2]){
case 'tao':return 5;
case 'jiu':return 3.01;
case 'shan':return 3.01;
case 'sha':
if(button.link[3]=='fire') return 2.95;
else if(button.link[3]=='fire') return 2.92;
else if(button.link[3]=='thunder') return 2.92;
else return 2.9;
case 'shan':return 1;
}
@ -1195,7 +1194,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var color=get.color(card),colors=player.getStorage('olshuangxiong_effect');
for(var i of colors){
if(color!=i) return true;
};
}
return false;
},
prompt:function(){
@ -2305,7 +2304,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return current!=player;
}).sortBySeat(target);
for(var target of players){
if(get.damageEffect(target,player,target,'fire')>=0){num=0;continue};
if(get.damageEffect(target,player,target,'fire')>=0){num=0;continue}
var shao=false;
num++;
if(target.countCards('he',function(card){
@ -6418,7 +6417,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
enable:'phaseUse',
usable:1,
position:'hs',
viewAs:{
name:'sha',
changbiao:true,
@ -7373,7 +7371,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!lib.skill.yongjin.filter(null,player,cards)){
event.finish();
return;
};
}
var next=player.chooseTarget(2,function(card,player,target){
if(ui.selected.targets.length){
var from=ui.selected.targets[0];
@ -7655,7 +7653,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return evt&&evt.cards2&&evt.cards2.filter(function(i){
return get.name(i,evt.hs.contains(i)?player:false)=='sha';
}).length>0;
};
}
if(event.name=='gain'&&event.player==player) return false;
var evt=event.getl(player);
return evt&&evt.cards2&&evt.cards2.length>0;
@ -11158,7 +11156,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(checkx>0) return checkx;
}
return 0;
};
}
if(attitude>0){
return result;
}
@ -11521,7 +11519,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 1;
}
else return 4;
};
}
return 3;
}).set('logSkill',['new_liyu',trigger.player]);
'step 1'
@ -12033,7 +12031,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(get.attitude(_status.event.player,_status.currentPhase)<0&&_status.currentPhase.needsToDiscard()&&card.name!='du') return -1;
for(var i=0;i<ui.selected.cards.length;i++){
if(get.type(ui.selected.cards[i])==get.type(card)||(ui.selected.cards[i].name=='du'&&card.name!='du')) return -1;
};
}
if(card.name=='du') return 20;
return (_status.event.player.countCards('h')-_status.event.player.hp);
},
@ -14312,7 +14310,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!result.bool&&!event.directbool){
//game.cardsDiscard(card);
return;
};
}
player.addToExpansion(card,'gain2').gaintag.add('tuntian');
},
group:'tuntian_dist',
@ -14931,8 +14929,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
refangzhu_info:'当你受到伤害后，你可以令一名其他角色选择一项：摸X张牌并将武将牌翻面，或弃置X张牌并失去1点体力。（X为你已损失的体力值）',
rezaiqi:'再起',
rezaiqi_info:'结束阶段开始时，你可以令至多X名角色选择一项：1.摸一张牌，2.令你回复1点体力（X为本回合进入弃牌堆的红色牌数）。',
ol_jiangwei:'界姜维',
ol_jiangwei_prefix:'界',
ol_caiwenji:'界蔡琰',
ol_caiwenji_prefix:'界',
retuntian:'屯田',

3
character/sb.js
View File

@ -101,6 +101,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return get.damageEffect(target,player,player);
},
},
combo:'nzry_mingren',
},
group:'sbzhenliang_draw',
subSkill:{
@ -129,7 +130,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
},
ai:{combo:'nzry_mingren'},
},
//小乔
sbtianxiang:{
@ -1289,7 +1289,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sblianhuan:{
audio:2,
enable:'phaseUse',
filterCard:{suit:'club'},
filter:(event,player)=>player.hasCard(card=>lib.skill.sblianhuan.filterCard(card,player),lib.skill.sblianhuan.position),
filterTarget:function(card,player,target){
if(player.hasSkill('sblianhuan_blocker')) return false;

57
character/shenhua.js
View File

@ -750,7 +750,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.line(player,trigger.player);
player.logSkill('drlt_zhenrong');
player.addToExpansion(result.links,trigger.player,'give','log').gaintag.add('drlt_zhenrong');
};
}
},
},
"drlt_hongju":{
@ -822,11 +822,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=result.links;
for(var i=0;i<cards.length;i++){
player.storage.drlt_zhenrong.remove(cards[i]);
};
}
player.syncStorage('drlt_zhenrong');
player.$throw(cards);
player.discardPlayerCard(target,'ej',1,true);
};
}
},
ai:{
order:13,
@ -1268,7 +1268,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
else{
player.addTempSkill('drlt_yongsi1',{player:'phaseDiscardAfter'});
};
}
},
},
},
@ -1482,7 +1482,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var num=1;
if(get.type(result.cards[0])=='equip') num=2;
player.draw(num);
};
}
},
},
drlt_wanglie:{
@ -1820,7 +1820,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},'选择一名装备区里牌数大于你的角色').ai=function(target){
return -get.attitude(player,target)
};
};
}
'step 2'
if(result.bool){
event.target=result.targets[0];
@ -1846,7 +1846,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 3'
if(result.bool){
target.give(result.cards,player);
};
}
},
ai:{
order:11,
@ -1958,14 +1958,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else event._result={index:0};
}else{
event.finish();
};
}
'step 2'
player.logSkill('nzry_yili',target);
if(result.index==1){
player.removeMark('nzry_huaiju',1);
}else{
player.loseHp();
};
}
target.addMark('nzry_huaiju',1);
target.addSkill('nzry_huaiju_ai');
},
@ -2024,7 +2024,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var num=0;
for(var i=0;i<targets.length;i++){
num+=targets[i].hp;
};
}
return num+target.hp<=_status.event.num;
}).set('ai',function(target){
if(ui.selected.targets[0]!=undefined) return -1;
@ -2043,7 +2043,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.chooseTarget('请选择〖溃诛〗的目标',[1,event.num]).ai=function(target){
return get.attitude(player,target);
};
};
}
'step 3'
if(result.bool){
var targets=result.targets.sortBySeat();
@ -2056,7 +2056,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var num=0;
for(var i=0;i<targets.length;i++){
num+=targets[i].hp;
};
}
if(num<event.num){
event.bool=false;
event.goto(2);
@ -2066,11 +2066,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.logSkill('nzry_kuizhu',targets);
for(var i=0;i<targets.length;i++){
targets[i].damage();
};
}
//if(targets.length>=2) player.loseHp();
};
};
};
}
}
}
},
},
rechezheng:{
@ -2122,7 +2122,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(result.bool){
player.line(result.targets);
player.discardPlayerCard(result.targets[0],'he',1,true);
};
}
},
group:'rechezheng',
},
@ -2234,7 +2234,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
player.markSkill('nzry_chenglve');
player.addTempSkill('nzry_chenglve1');
};
}
},
ai:{
order:2.7,
@ -2252,13 +2252,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=player.storage.nzry_chenglve1;
for(var i=0;i<cards.length;i++){
if(cards[i]==get.suit(card)) return Infinity;
};
}
},
targetInRange:function(card,player){
var cards=player.storage.nzry_chenglve1;
for(var i=0;i<cards.length;i++){
if(cards[i]==get.suit(card)) return true;
};
}
}
},
onremove:true,
@ -2388,7 +2388,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 2'
if(result.bool){
player.addToExpansion(result.cards[0],player,'give','log').gaintag.add('nzry_mingren');
};
}
},
},
2:{
@ -2425,7 +2425,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.addToExpansion(result.cards[0],'log','give',player).gaintag.add('nzry_mingren');
var card=player.getExpansions('nzry_mingren')[0];
if(card) player.gain(card,'gain2');
};
}
},
},
},
@ -2591,12 +2591,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
else{
event.finish();
};
}
'step 2'
if(result.bool){
player.line(result.targets);
result.targets[0].draw(4-result.targets[0].countCards('h'))
};
}
},
ai:{
order:1,
@ -2633,7 +2633,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger.source.storage.nzry_shenshi1=result.cards[0];
trigger.source.storage.nzry_shenshi2=player;
trigger.source.addSkill('nzry_shenshi1');
};
}
},
},
},
@ -2654,7 +2654,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(player.getCards('he').contains(card)&&4-pl.countCards('h')>0){
pl.draw(4-pl.countCards('h'));
pl.logSkill('nzry_shenshi');
};
}
player.removeSkill('nzry_shenshi1');
delete player.storage.nzry_shenshi1;
delete player.storage.nzry_shenshi2;
@ -3698,7 +3698,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 2'
if(!result.bool&&!event.directbool){
return;
};
}
player.addToExpansion(event.card,'gain2').gaintag.add('tuntian');
},
callback:function(){
@ -3731,7 +3731,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
},
locked:false,
ai:{
effect:{
target:function(card,player,target,current){
@ -7080,7 +7079,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(cards[i]!=card&&get.number(cards[i])==num){
player.loseToDiscardpile(card);
return;
};
}
}
trigger.cancel();
trigger.result={bool:true};

4
character/shiji.js
View File

@ -2053,7 +2053,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!list.contains(type)){
list.push(type);
cards.push(ui.cardPile.childNodes[i])
};
}
}
player.gain(cards,'gain2').gaintag.add('zhangming');
player.addTempSkill('zhangming_keep');
@ -4860,7 +4860,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!list.contains(type)){
list.push(type);
cards.push(ui.cardPile.childNodes[i])
};
}
}
player.gain(cards,'gain2');
}

22
character/sp.js
View File

@ -1937,17 +1937,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
switch(get.sgn(get.attitude(player,target))){
case 0:
return 2;
break;
case 1:
if(num1-1>=num2) return 0;
if(num1+1<=num2) return 1;
return 2;
break;
case -1:
if(num1-2<=num2) return 0;
if(num1+3>=num2) return 1;
return 2;
break;
}
}).set('prompt',get.prompt('olrunwei',trigger.player));
'step 1'
@ -6253,7 +6250,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else used.push(name);
}
else used.push(name);
};
}
if(info.isRound) break;
}
var vcards=[];
@ -7261,7 +7258,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(evt.card.nature) natures.remove(evt.card.nature);
}
else tricks.remove(name);
};
}
if(info.isRound) break;
}
var vcards=[];
@ -12689,10 +12686,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 5-val;
}
switch(button.link){
case 3:return 4.5;break;
case 4:return 4.4;break;
case 5:return 4.3;break;
case 2:return (3-player.hp)*1.5;break;
case 3:return 4.5;
case 4:return 4.4;
case 5:return 4.3;
case 2:return (3-player.hp)*1.5;
case 1:{
if(game.hasPlayer(function(current){
return (get.realAttitude||get.attitude)(player,current)<0&&get.distance(player,current)>1;
@ -12913,7 +12910,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
filterCard:{color:'black'},
position:'hes',
audio:'niluan',
viewAsFilter:function(player){
return player.countCards('hes',lib.skill.spniluan.filterCard)>0;
},
@ -13422,7 +13418,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
backup:function(links,player){
return {
audio:'jingong',
filterCard:true,
popname:true,
position:'hes',
viewAs:{name:links[0][2]},
@ -14707,7 +14702,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
forced:true,
popup:false,
onremove:true,
firstDo:true,
init:function(player,skill){
player.storage[skill]=0;
@ -15627,7 +15621,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
backup:function(links,player){
return {
audio:'jingong',
filterCard:true,
popname:true,
position:'hes',
viewAs:{name:links[0][2]},
@ -20721,7 +20714,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.set('filterButton',function(button){
if(button.link==2){
return _status.event.bool1;
};
}
return true;
});
next.set('bool1',trigger.player.isDamaged());
@ -22621,7 +22614,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"step 4"
target.give(result.cards,player);
},
audio:2,
},
xiongyi:{
skillAnimation:true,

29
character/sp2.js
View File

@ -867,7 +867,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
dcwujie:{
audio:2,
forced:true,
trigger:{
global:['discardBegin','drawBegin'],
},
@ -946,7 +945,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!num) delete player.getStat().skill[skillx];
else player.getStat().skill[skillx]=num;
var bool3=!(bool1&&!bool2);
}catch(e){}
} catch (e) {
console.trace(e);
}
if(!bool1&&!bool2&&get.skillInfoTranslation(skill,player).indexOf('出牌阶段限一次')==-1) return false;
if((bool1||bool2)&&bool3) return false;
}
@ -2231,7 +2232,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
subSkill:{
blocker:{
charlotte:true,
init:function(player,skill){
player.addSkillBlocker(skill);
},
@ -2626,7 +2626,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(eff2>0) return eff1>0;
return player.hp>2&&eff2<eff1;
}
return false;
},
logTarget:'player',
shaRelated:true,
@ -4309,10 +4308,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 5-val;
}
switch(num){
case 'equip3':return 4.5;break;
case 'equip4':return 4.4;break;
case 'equip5':return 4.3;break;
case 'equip2':return (3-player.hp)*1.5;break;
case 'equip3':return 4.5;
case 'equip4':return 4.4;
case 'equip5':return 4.3;
case 'equip2':return (3-player.hp)*1.5;
case 'equip1':{
if(game.hasPlayer(function(current){
return (get.realAttitude||get.attitude)(player,current)<0&&get.distance(player,current)>1;
@ -9143,7 +9142,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{
target.$damagepop('K','thunder');
event.num=13;
};
}
game.log(target,'选择的点数是','#y'+get.strNumber(event.num));
player.storage.xinfu_lveming++;
player.judge(function(card){
@ -9490,7 +9489,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{
player.logSkill('xinfu_zhenxing');
event.num={一张:1,两张:2,三张:3}[result.control];
};
}
'step 2'
event.cards=get.cards(num);
player.chooseButton(['【镇行】：请选择要获得的牌',event.cards]).set('filterButton',function(button){
@ -9528,8 +9527,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var num2=ui.cardPile.childElementCount;
var num3=num2;
if(num1>num2) num3=0;
else if(!player.storage.xinfu_qianxin){}
else{
else if(player.storage.xinfu_qianxin){
for(var i=0;i<num2;i++){
if(player.storage.xinfu_qianxin.contains(ui.cardPile.childNodes[i])){
num3=0;break;
@ -9929,7 +9927,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(player.storage.xinfu_dianhu2&&player.storage.xinfu_dianhu2.isIn()){
if(event.name=='damage') return event.source==player.storage.xinfu_dianhu2;
return true;
};
}
},
content:function(){
'step 0'
@ -10159,9 +10157,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhangwen:'张温（193年—230年），字惠恕，吴郡吴县（今江苏苏州）人。少修节操，容貌奇伟。孙权召拜议郎、选曹尚书，徙太子太傅。黄武三年（224），以辅义中郎将身份出使蜀汉，孙权原先害怕诸葛亮会有意留难张温，但张温不担心。在呈上蜀汉朝廷的文书刻意称颂蜀汉，以表明和解的诚意，重建两国关系。他在蜀汉表现出色，得蜀汉朝廷重视。回东吴后不久，被调进豫章的军队，事业上再无进展。孙权一方面介怀他出使蜀汉时称颂蜀汉，又嫌他声名太盛，恐怕张温不会尽忠地由他任用。当时正好碰上暨艳事件，暨艳是张温引荐的臣子，但他滥用职权，升迁评定等只看自己喜恶。事件被揭发后暨艳及同党徐彪都自杀。孙权见此，于是以张温与暨艳、徐彪等人多有来往而下罪张温，后更将张温发还到家乡吴郡。将军骆统曾上书为张温辩解，但孙权不理会。六年后，张温病逝。',
lisu:'李肃（？－192年），五原（治今内蒙古包头西北）人。永汉三年四月，司徒王允、尚书仆射士孙瑞、卓将吕布共谋诛卓。是时，天子有疾新愈，大会未央殿。布使同郡骑都尉肃等、将亲兵十馀人，伪著卫士服守掖门。布怀诏书。卓至，肃等格卓。卓惊呼布所在。布曰“有诏”，遂杀卓，夷三族。后卓女婿中郎将牛辅典兵别屯陕，分遣校尉李傕、郭汜、张济略陈留、颍川诸县。卓死，吕布使李肃至陕，欲以诏命诛辅。辅等逆与肃战，肃败走弘农，布诛肃。',
xinpi:'辛毗（生卒年不详），字佐治，颍川阳翟人。三国时期曹魏大臣。原居陇西（郡治在今甘肃临洮县），东汉光武帝建武年间，其先人东迁。当初，辛毗跟随其兄事袁绍。曹操任司空时，征召辛毗，他不受命。官渡战后，辛毗事袁绍的儿子袁谭。公元204年，曹操攻下邺城，上表推荐辛毗任议郎，后为丞相长史。公元220年，曹丕即皇帝位，以辛毗为侍中，赐爵关内侯，后赐广平亭侯。魏明帝即位，封辛毗颍乡侯，食邑三百户，后为卫尉。公元234年，诸葛亮屯兵渭南，司马懿上表魏明帝。魏明帝任辛毗为大将军军师，加使持节号。诸葛亮病逝后，辛毗返回，仍任卫尉。不久，逝世，谥肃侯。',
zhangchangpu:"钟会的母亲。《母夫人张氏传》：夫人张氏，字昌蒲，太原兹氏人，太傅定陵成侯之命妇也。",
xugong:"许贡是东汉末官吏。先后任吴郡都尉、太守，欲送密信给曹操，要曹操注意孙策，却被孙策发现而被杀。许贡生前招揽了一些门客，当中有三人不忘故主，千方百计想要手刃仇人。建安五年（公元200年），广陵太守陈登派人秘密联系孙策治下的山贼余党，企图颠覆孙策在江东的统治。孙策决定讨伐陈登，行军到丹徒时，许贡门客终于找到了机会。因为孙策有单骑出猎，在野外思考的习惯，三门客趁孙策轻装外出打猎时，放冷箭射中孙策面颊。这些门客后来在与孙策的搏斗中，被赶到的侍卫杀死。孙策此后因为伤口感染，并且俊美的容貌被毁，终于不治身亡，去世时年仅26岁。",
mangyachang:"南蛮王孟获的部将，使一口截头大刀，骑一匹黄骠马。率军与蜀军交战，战败王平。后被平北将军马岱斩杀。只出现在《三国演义》里，正史中无此人。",
liuzan:'字正明，会稽长山人人，曾任左护军，有两子：留略、留平。少为会稽郡吏，曾参与镇压黄巾起义，后被东吴大将凌统所引用，任屯骑校尉。吴五凤二年（公元255年）留赞任左护军，随孙峻征淮南，因病撤军，被魏将蒋班围困于道，力战而死，时年73岁。',
zhujun:'朱儁（？－195年），字公伟。会稽郡上虞县（今浙江绍兴上虞区）人。东汉末年名将。朱儁出身寒门，赡养母亲，以好义轻财闻名，受乡里敬重。后被太守徐珪举为孝廉，任兰陵令，颇有治绩。再升任交州刺史，以家兵五千大破叛军，平定交州。战后以功封都亭侯，入朝为谏议大夫。光和七年（184年），黄巾起义爆发，朱儁以右中郎将、持节平定三郡之地，以功进封西乡侯，迁镇贼中郎将。又率军讨平黄巾，“威声满天下”。中平二年（185年），进拜右车骑将军，更封钱塘侯。后为河内太守，击退进逼的张燕。权臣董卓秉政时，想任朱儁为副手，遭其婉拒。其后出逃荆州，更屯军中牟，徐州刺史陶谦等欲推举他为太师，并传檄各州牧伯，相邀讨伐李傕、奉迎天子。但朱儁却奉诏入京任太仆。初平三年（192年），升任太尉、录尚书事。兴平元年（194年），行骠骑将军事，持节镇关东，因故未成行。兴平二年（195年），李傕与郭汜相互攻杀，郭汜扣留朱儁作为人质。朱儁性格刚烈，即日发病而死。',
@ -10174,7 +10169,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhangmiao:'张邈（？－195年），字孟卓，东平寿张（今山东东平县）人。东汉大臣、名士，“八厨”之一。举孝廉出身，授骑都尉，出任陈留太守。参与讨伐董卓，参加汴水之战，归附于曹操。兴平元年（194年），趁着曹操讨伐徐州牧陶谦，联合陈宫发动叛乱，迎立吕布为兖州牧。受到曹操讨伐，兵败投奔徐州牧刘备。兴平二年，张邈向袁术借兵途中，被部下所杀。',
duanwei:'段煨（？～209年），字忠明，武威郡姑臧（今甘肃省武威市）人也。东汉末年将领，东汉太尉段颎同族兄弟，与太尉贾诩、张济、宣威侯张绣乃是同乡。原为董卓帐下将领，奉命屯兵华阴，勤劳农业。兴平二年（195年），迎接汉献帝刘协东归洛阳，供给衣食补给，与护驾将领杨定不和，引发激战十余天，听从汉献帝刘协劝解。东汉建安三年（198年），攻打黄白城，击杀李傕，夷其三族，封为镇远将军、闅乡亭侯、北地太守，累迁大鸿胪、金光禄大夫。建安十四年（209年），寿终正寝。',
zhangheng:'张横，生卒年不详，武威郡姑臧人，东汉末年凉州军阀之一。与梁兴、贾诩、段煨乃是同乡。建安三年（198），张横与梁兴、段煨等斩杀李傕。十六年（211），同韩遂、马超联合，起兵反抗曹操，兵败后不知所终。',
tangji:'唐姬，会稽太守唐瑁女，弘农怀王刘辩的妃子。刘辩死后，唐姬回归故里，因节烈不愿改嫁他人，后被汉献帝下诏封为弘农王妃。',
wenqin:'文钦（？~258年），字仲若，沛国谯郡（今安徽省亳州市）人，三国时期曹魏将领，曹操部将文稷之子。魏明帝太和年间文钦任牙门将、五营校督，后拜庐江太守、冠军将军，嘉平元年（249年），曹爽及其同党在高平陵之变中被杀，文钦心中不安，执政的司马氏集团为了安抚文钦，升其为前将军、扬州刺史，任职期间结交镇东将军毌丘俭。击退吴国太傅诸葛恪进攻，取得一定战果。正元二年（255年），文钦与镇东将军毌丘俭在扬州起兵讨伐司马师，兵败后投奔吴国，被封为镇北大将军、幽州牧，封谯侯。甘露二年（257年），文钦随吴军援救起兵反抗司马氏的诸葛诞，此后因被司马昭大军围困，军情告急，文钦与诸葛诞本就有矛盾，对文钦日益不满的诸葛诞遂将文钦杀死。淮南平定之后，文钦遗体被其二子收敛安葬。',
qiuliju:'丘力居，东汉末年的辽西乌丸大人。拉拢中山太守张纯反叛东汉，寇略青、徐、幽、冀四州，杀略吏民。死时认为儿子楼班年幼，于是让从子蹋顿总摄三王部。',
liuba:'刘巴（？－222年），字子初，荆州零陵郡烝阳县（今湖南省衡阳县、邵东县一带）人，东汉末年至三国时期蜀汉时期官员、名士。刘巴少知名，荆州牧刘表多次征用推举，刘巴均不应就。曹操征伐荆州，荆州士人多归刘备，刘巴却北上投靠曹操。后受曹操命令招降荆南三郡，不料先为刘备所得，刘巴不能复命曹操，遂远至交趾，又辗转进入益州。刘备平定益州后，刘巴归附刘备，为左将军西曹掾，法正死后接任尚书令。章武二年（222年）去世。刘巴博学多才，为刘备解决入蜀后的财政困难问题，又与诸葛亮等共制蜀汉的法律文件《蜀科》。为人简朴清高，退无私交，曹魏大臣陈群甚敬重之。所著录于《刘令君集》。',
@ -10209,7 +10203,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
chunyuqiong:'#b对决限定武将',
sp_xuyou:'#g4v4限定武将',
},
perfectPair:{},
characterFilter:{
chunyuqiong:function(mode){
return mode!='identity'&&mode!='guozhan';

4
character/standard.js
View File

@ -1114,9 +1114,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
paoxiao:{
audio:2,
firstDo:true,
audioname2:{old_guanzhang:'old_fuhun'},
audioname:['re_zhangfei','guanzhang','xiahouba'],
audioname2:{
audioname2: {
old_guanzhang:'old_fuhun',
dc_xiahouba:'paoxiao_xiahouba',
},
trigger:{player:'useCard1'},

12
character/tw.js
View File

@ -972,10 +972,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
switch(get.sgn(att)){
case 1:
return [cards,[]];
break;
case 0:
return [cardx,cardy];
break;
case -1:
var num=Math.ceil(cards.length/2)+(cards.length%2==0?1:0);
if(num>1&&player.hasSkill('twchungang')) num--;
@ -985,7 +983,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
cardy.sort((a,b)=>get.value(b)-get.value(a));
cardx.addArray(cardy.slice(num,cardy.length));
return [cardx,cardy.slice(0,num)];
break;
}
}).set('cards',cards);
'step 1'
@ -5736,7 +5733,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false;
});
},
direct:true,
content:function(){
'step 0'
var target=lib.skill.twenyuan1.logTarget(trigger,player)[0];
@ -6018,7 +6014,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
})){
event.finish();
return;
};
}
player.chooseTarget(get.prompt('twzhengrong'),'将一名其他角色的一张牌置于武将牌上，称为“荣”',function(card,player,target){
return target!=player&&target.countCards('he');
}).set('ai',function(target){
@ -6447,7 +6443,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.addToExpansion(result.cards[0],'log','give',player).gaintag.add('twmingren');
var card=player.getExpansions('twmingren')[0];
if(card) player.gain(card,'gain2');
};
}
},
},
},
@ -8839,7 +8835,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 6+get.effect(player,card,target,target);
}
return get.effect(target,{name:'guohe_copy2'},player,player)/2+get.effect(target,card,player,player);
});;
});
'step 1'
if(result.bool){
event.targets=result.targets;
@ -11764,7 +11760,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var checkx=get.color(card,player)==get.color(judging);
if(checkx>0) return checkx;
return 0;
};
}
return result*(attitude>0?1:-1);
}).set('judging',trigger.player.judging[0]);
'step 1'

14
character/xianding.js
View File

@ -4245,7 +4245,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
try{
targetsx=game.filterPlayer(current=>player.inRange(current));
}
catch(e){player.storage.dcyuanmo_range=_tmp};
catch(e){
player.storage.dcyuanmo_range=_tmp
}
player.storage.dcyuanmo_range=_tmp;
targetsx.removeArray(targets);
return targetsx.reduce((p,c)=>{
@ -6061,7 +6063,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcshoutan:{
audio:2,
enable:'phaseUse',
selectCard:-1,
position:'h',
filter:function(event,player){
if(player.hasSkill('dcyaoyi')) return !player.hasSkill('dcshoutan_blocker',null,null,false);
@ -8908,7 +8909,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(blacks.length>0){
dialog.push('<div class="text center">黑色牌</div>');
dialog.push(blacks);
};
}
player.chooseButton(dialog,true).set('ai',function(button){
var player=_status.event.player;
var color=get.color(button.link),cards=player.getExpansions('syjiqiao');
@ -9255,7 +9256,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
switch(button.link){
case 0:
return 2;
break;
case 1:
return Math.max(0.5,player.countCards('hs',function(card){
return get.name(card)=='sha'&&player.hasValueTarget(card);
@ -9264,10 +9264,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}).map(function(target){
return get.damageEffect(target,player,player);
}));
break;
case 2:
return player.needsToDiscard()/4;
break;
case 3:
var num=0;
return 0.8*Math.max.apply(Math,game.filterPlayer(function(current){
@ -9275,7 +9273,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}).map(function(target){
return get.effect(target,{name:'shunshou_copy'},player,player);
}));
break;
case 4:
var num=0;
game.countPlayer(function(current){
@ -9285,7 +9282,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
});
return num*0.8;
break;
}
});
if(player.getDamagedHp()>0) next.set('selectButton',[1,1+player.getDamagedHp()]);
@ -11852,7 +11848,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
//filter:function(event,player){
// return player.storage.gxlianhua&&player.storage.gxlianhua.red+player.storage.gxlianhua.black>0;
//},
forced:true,
content:function(){
var cards=[];
var cards2=[];
@ -12308,7 +12303,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return '当你使用或打出'+(player.hasSkill('dczhangcai_all')?'':'点数为8的')+'牌时，你可以摸X张牌（X为你手牌区里'+(player.hasSkill('dczhangcai_all')?'与此牌点数相同':'点数为8')+'的牌数且至少为1）。';
},
},
perfectPair:{},
characterReplace:{
wenyang:['wenyang','db_wenyang','diy_wenyang'],
gexuan:['gexuan','tw_gexuan'],

2
character/xinghuoliaoyuan.js
View File

@ -811,7 +811,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
limited:true,
enable:"phaseUse",
filter:function(event,player){;
filter:function(event,player){
return player.countCards('e')>0;
},
filterTarget:lib.filter.notMe,

15
character/yijiang.js
View File

@ -2210,7 +2210,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.set('filterButton',function(button){
if(button.link==0){
return _status.event.bool1;
};
}
return true;
});
next.set('bool1',lib.skill.xinbenxi.filterx(trigger,player));
@ -3151,7 +3151,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
for(var i=0;i<storage.length;i++){
str+='、';
str+=get.translation(storage[i]);
};
}
str=str.slice(1);
str2+=('<br><li>已对'+str+'发动过〖残韵〗');
}
@ -4167,7 +4167,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(!player.storage.juexiang_lie){
event.finish();
return;
};
}
player.storage.juexiang_lie--;
}
player.chooseTarget(get.prompt2('juexiang_lie'),function(card,player,target){
@ -5407,8 +5407,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
ai:{
skillTagFilter:function(player){
if(!player.countCards('hes')||player.hasSkill('taoluan3')) return false;
if(!player.storage.taoluan.contains('tao')){}
else if(player.isDying()&&!player.storage.taoluan.contains('jiu')){}
if(!player.storage.taoluan.contains('tao')){ /* empty */ }
else if(player.isDying()&&!player.storage.taoluan.contains('jiu')){ /* empty */ }
else return false;
},
order:4,
@ -6461,7 +6461,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return current!=player;
}).sortBySeat(player);
for(var target of players){
if(get.damageEffect(target,player,target,'fire')>=0){num=0;continue};
if(get.damageEffect(target,player,target,'fire')>=0){num=0;continue}
var shao=false;
num++;
if(target.countCards('he',function(card){
@ -8754,10 +8754,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
switch(button.link[2]){
case 'tao':return 5;
case 'jiu':return 3.01;
case 'shan':return 3.01;
case 'sha':
if(button.link[3]=='fire') return 2.95;
else if(button.link[3]=='fire') return 2.92;
else if(button.link[3]=='thunder') return 2.92;
else return 2.9;
case 'shan':return 1;
}

5
character/yingbian.js
View File

@ -295,7 +295,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
},
logTarget:'target',
marktext:'嫕',
intro:{
markcount:'expansion',
@ -531,7 +530,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(trigger.name=='lose'){
for(var i in trigger.gaintag_map){
if(trigger.gaintag_map[i].contains('huaiyuanx')) num++;
};
}
}
else player.getHistory('lose',function(evt){
if(trigger!=evt.getParent()) return false;
@ -2671,7 +2670,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var type=get.type(card);
return (type=='basic'||type=='trick');
},
log:false,
visible:true,
filterTarget:function(card,player,target){
return target!=player&&target.hasZhuSkill('ruilve',player)&&!target.hasSkill('ruilve3');
@ -3590,7 +3588,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
wangxiang:'王祥（184年，一作180年－268年4月30日），字休徵。琅邪临沂（今山东省临沂市西孝友村）人。三国曹魏及西晋时大臣。王祥于东汉末隐居二十年，在曹魏，先后任县令、大司农、司空、太尉等职，封爵睢陵侯。西晋建立，拜太保，进封睢陵公。泰始四年四月戊戌日（268年4月30日）去世，年八十五（一作八十九），谥号“元”。有《训子孙遗令》一文传世。王祥侍奉后母朱氏极孝，为传统文化中二十四孝之一“卧冰求鲤”的主人翁。',
},
characterTitle:{},
perfectPair:{},
characterFilter:{},
dynamicTranslate:{},
perfectPair:{

15
game/game.js
View File

@ -11492,6 +11492,7 @@
}
}
}
// falls through
default:
return Legacy(item);
}
@ -14588,11 +14589,11 @@
event._result={bool:true};
event._direct=true;
}
else if(info.direct){
else if(info.direct&&player.isOnline()){
event._result={bool:true};
event._direct=true;
}
else if(info.direct&&player.isOnline()){
else if(info.direct){
event._result={bool:true};
event._direct=true;
}
@ -21244,9 +21245,9 @@
if(type=='horse'||type=='equip3_4'){
return player.hasEnabledSlot(3)&&(get.is.mountCombined()||player.hasEnabledSlot(4));
}
else if(type=='equip3_4'){
type='equip3';
}
// else if(type=='equip3_4'){
// type='equip3';
// }
else if(get.is.mountCombined()&&type=='equip4'){
return false;
}
@ -21980,7 +21981,7 @@
txy=to.getXY();
n=Math.abs(fxy[0]-txy[0])+Math.abs(fxy[1]-txy[1]);
}
else if(to.isMin(true)||from.isMin(true)){}
else if(to.isMin(true)||from.isMin(true)){/* empty */}
else{
var length=game.players.length;
var totalPopulation=game.players.length+game.dead.length+1;
@ -25751,7 +25752,7 @@
case 1:this.draw(nodelay?'nodelay':1);break;
case 2:this.recover();break;
case 3:this.changeHujia();break;
case 4:this.tempHide();
case 4:this.tempHide();break;
case 5:this.discard(this.getCards('j')).delay=(!nodelay);break;
case 6:{
if(this.isLinked()) this.link();

3
mode/boss.js
View File

@ -2268,7 +2268,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(current!=player&&current.countCards('e')){
player.line(current);
current.discard(current.getCards('e'));
};
}
});
},
},
@ -8266,7 +8266,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(target.classList.contains('turnedover')) return -1;
return 5-target.getDamagedHp();
}
return 1;
}
"step 1"
if(result.bool){

4
mode/brawl.js
View File

@ -2232,7 +2232,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
translate[i+'_info']=skill[i].prompt2;
}
if(!skill[i].noGlobal) game.addGlobalSkill(i);
};
}
game.addVideo('arrangeLib',null,{
skill:{
_jiazu_wei:{
@ -2858,7 +2858,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
case 2:gain=5;add=1;break;
case 3:gain=6;add=1;break;
default:gain=6;add=2;break;
};
}
source.hp+=add;
source.maxHp+=add;
source.update();

2
mode/chess.js
View File

@ -5435,7 +5435,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
init:function(player){
for(var i=1;i<6;i++){
player.$disableEquip('equip'+i);
};
}
},
check:function(card){
var player=_status.currentPhase;

2
mode/connect.js
View File

@ -50,7 +50,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
event.textnode.textContent='正在连接...';
clearTimeout(event.timeout);
if(e) e.preventDefault();
game.saveConfig('last_ip',node.textContent=node.textContent);
game.saveConfig('last_ip',node.textContent);
game.connect(node.textContent,function(success){
if(!success&&event.textnode){
alert('连接失败');

30
mode/guozhan.js
View File

@ -365,7 +365,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
mode_guozhan:{
guozhan_default:["gz_caocao","gz_simayi","gz_xiahoudun","gz_zhangliao","gz_xuzhu","gz_guojia","gz_zhenji","gz_xiahouyuan","gz_zhanghe","gz_xuhuang","gz_caoren","gz_dianwei","gz_xunyu","gz_caopi","gz_yuejin","gz_liubei","gz_guanyu","gz_zhangfei","gz_zhugeliang","gz_zhaoyun","gz_machao","gz_huangyueying","gz_huangzhong","gz_weiyan","gz_pangtong","gz_sp_zhugeliang","gz_liushan","gz_menghuo","gz_zhurong","gz_ganfuren","gz_sunquan","gz_ganning","gz_lvmeng","gz_huanggai","gz_zhouyu","gz_daqiao","gz_luxun","gz_sunshangxiang","gz_sunjian","gz_xiaoqiao","gz_taishici","gz_zhoutai","gz_re_lusu","gz_zhangzhang","gz_dingfeng","gz_huatuo","gz_lvbu","gz_diaochan","gz_re_yuanshao","gz_yanwen","gz_jiaxu","gz_pangde","gz_zhangjiao","gz_caiwenji","gz_mateng","gz_kongrong","gz_jiling","gz_tianfeng","gz_panfeng","gz_zoushi",],
guozhan_zhen:["gz_dengai","gz_caohong","gz_jiangfei","gz_jiangwei","gz_xusheng","gz_jiangqing","gz_hetaihou","gz_yuji"],
guozhan_shi:[,"gz_re_lidian","gz_zangba","gz_madai","gz_mifuren","gz_sunce","gz_chendong","gz_sp_dongzhuo","gz_zhangren"],
guozhan_shi:["gz_re_lidian","gz_zangba","gz_madai","gz_mifuren","gz_sunce","gz_chendong","gz_sp_dongzhuo","gz_zhangren"],
guozhan_bian:["gz_liqueguosi","gz_zuoci","gz_bianfuren","gz_xunyou","gz_lingtong","gz_lvfan","gz_masu","gz_shamoke",],
guozhan_quan:["gz_cuimao","gz_yujin","gz_wangping","gz_fazheng","gz_wuguotai","gz_lukang","gz_yuanshu","gz_zhangxiu"],
guozhan_jun:["gz_jun_caocao","gz_jun_sunquan","gz_jun_liubei","gz_jun_zhangjiao"],
@ -1911,7 +1911,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return get.suit(card)=='diamond'&&get.type2(card)!='trick'&&player.canUse(get.autoViewAs({name:'lebu'},[card]),event.target);
},'he')||player.hasCard(function(card){
return get.suit(card)=='club'&&get.type2(card)!='trick'&&player.canUse(get.autoViewAs({name:'bingliang'},[card]),event.target,false);
}),'he') return true;
},'he')) return true;
return false;
},
check:function(event,player){
@ -4103,9 +4103,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return '没有“戮”';
}
},
content:function(storage,player){
return '共有'+get.cnNumber(storage.length)+'张“戮”';
},
// content:function(storage,player){
// return '共有'+get.cnNumber(storage.length)+'张“戮”';
// },
},
group:'gzshilu_zhiheng',
subSkill:{
@ -4853,7 +4853,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
});
},
selectTarget:-1,
filterTarget:function(card,player,target){;
filterTarget:function(card,player,target){
if(player==target) return true;
if(player.identity=='unknown'){
var group='shu';
@ -7806,7 +7806,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
trigger.source.chooseJunlingControl(player,result.junling,result.targets).set('prompt','补益').set('choiceList',choiceList).set('ai',function(){
if(get.recoverEffect(trigger.player,player,_status.event.player)>0) return 1;
return (get.attitude(trigger.source,trigger.player)<0&&get.junlingEffect(player,result.junling,trigger.source,result.targets,trigger.source)>=-2)?1:0;
return 0;
});
'step 2'
if(result.index==0) trigger.source.carryOutJunling(player,event.junling,targets);
@ -8800,8 +8799,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
game.log(player,'获得了技能','#g【'+get.translation(result.control)+'】');
game.delay();
},
forceaudio:true,
audio:['xuanhuo',2],
// forceaudio:true,
// audio:['xuanhuo',2],
ai:{
order:8,
result:{player:1},
@ -8809,7 +8808,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
//used:{},
},
audio:['xuanhuo',2],
// audio:['xuanhuo',2],
},
fz_gzpaoxiao:{
audio:true,
@ -11132,7 +11131,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
backup:function(links,player){
return {
filterCard:true,
audio:"qice",
audio:'qice_backup',
selectCard:-1,
position:'h',
selectTarget:function(){
@ -11154,7 +11153,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
return lib.filter.filterTarget(card,player,target);
},
audio:'qice_backup',
popname:true,
viewAs:{name:links[0][2]},
ai1:function(){
@ -11887,7 +11885,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
return false;
})
};
}
if(trigger.name=='lose'){
for(var i of trigger.cards){
if(i.name=='feilongduofeng'&&get.position(i,true)=='d') cards.push(i);
@ -12342,7 +12340,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return player.siege(event.target)&&event.player.siege(event.target);
},
forced:true,
audio:'zniaoxiang',
forceaudio:true,
logTarget:'target',
content:function(){
@ -12661,7 +12658,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
for(var i=0;i<skills.length;i++){
list.add(skills[i]);
var info=lib.skill[skills[i]];
if(info.charlotte){list.splice(i--);continue};
if (info.charlotte) {
list.splice(i--);
continue;
}
if(typeof info.derivation=='string'){
list.add(info.derivation);
}

20
mode/identity.js
View File

@ -592,9 +592,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
switch(_status.mode){
case 'purple':str2='3v3v2 - '+(game.me.identity.indexOf('r')==0?'暖色':'冷色')+lib.translate[game.me.identity+'2'];break;
case 'zhong':str2='忠胆英杰 - '+lib.translate[game.me.identity+'2'];break;
case 'stratagem':str2=get.cnNumber(get.playerNumber())+'人谋攻'+'-'+lib.translate[game.me.identity+'2'];
default:str2=get.cnNumber(get.playerNumber())+'人'+
get.translation(lib.config.mode)+' - '+lib.translate[game.me.identity+'2']
case 'stratagem':str2=get.cnNumber(get.playerNumber())+'人谋攻'+'-'+lib.translate[game.me.identity+'2'];break;
default:str2=get.cnNumber(get.playerNumber())+'人'+get.translation(lib.config.mode)+' - '+lib.translate[game.me.identity+'2']
}
}
var name=[
@ -889,7 +888,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var players=[game.rZhu,game.bZhu];
var list=[];
for(var i=0;i<players.length;i++){
if(true){
var group=event[players[i].identity];
var str='选择角色';
var list2=event.map[group].randomGets(4);
@ -897,7 +895,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
event.map[players[i].playerid]=list2;
list.push([players[i],[str,[list2,'character']],true]);
}
}
game.me.chooseButtonOL(list,function(player,result){
if(game.online||player==game.me){
player.init(result.links[0]);
@ -935,14 +932,12 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var players=game.players.slice(0);
players.removeArray([game.rZhu,game.bZhu]);
for(var i=0;i<players.length;i++){
if(true){
var group=event[players[i].identity.slice(0,1)+'Zhu'];
var str='选择角色';
var list2=event.map[group].randomRemove(event.mapNum[group]);
event.map[players[i].playerid]=list2;
list.push([players[i],[str,[list2,'character']],true]);
}
}
game.me.chooseButtonOL(list,function(player,result){
if(game.online||player==game.me){
player.init(result.links[0]);
@ -1264,8 +1259,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else{
result[i]=result[i].links;
}
if(get.is.double(result[i][0])||
lib.character[result[i][0]]&&lib.character[result[i][0]][1]=='shen'&&!lib.character[result[i][0]][4].contains('hiddenSkill')) shen.push(lib.playerOL[i]);
if(get.is.double(result[i][0])||lib.character[result[i][0]]&&lib.character[result[i][0]][1]=='shen'&&!lib.character[result[i][0]][4].contains('hiddenSkill')) shen.push(lib.playerOL[i]);
}
event.result2=result;
if(shen.length){
@ -1817,7 +1811,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else{
list3.push(i);
}
};
}
var getZhuList=function(){
if(stratagemMode){
list2.sort(lib.sort.character);
@ -2686,7 +2680,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
});
if(player){
player.showIdentity();
};
}
}
});
}
@ -2738,7 +2732,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
});
if(red.length<=1&&blue.length<=1) game.broadcastAll(game.showIdentity);
return;
};
}
if(game.zhu&&game.zhu.isZhu){
if((get.population('zhong')+get.population('nei')==0||
get.population('zhong')+get.population('fan')==0)&&get.population('commoner')==0){
@ -3692,6 +3686,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
case 'commoner':
return 2*get.population('fan')-2;
}
break;
case 'commoner':
switch(identity2){
case 'zhu':
@ -3716,6 +3711,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
case 'commoner':
return from==to?10:(to.hp<=2?-2:0);
}
break;
}
},
situation:function(absolute){