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

v1.9.91

This commit is contained in:
Spmario233 2019-08-03 21:29:18 +08:00 committed by GitHub
parent 1b798620e3
commit c511282408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 220 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
card/sp.js
View File

@ -746,7 +746,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
if(!muniu.cards) return false; if(!muniu.cards) return false;
lib.skill.muniu_skill.sync(muniu); lib.skill.muniu_skill.sync(muniu);
for(var i=0;i<muniu.cards.length;i++){ for(var i=0;i<muniu.cards.length;i++){
if(event.filterCard(muniu.cards[i],player,event)) return true; if(event.filterCard(muniu.cards[i],player,event)&&lib.filter.cardRespondable(muniu.cards[i],player,event)) return true;
} }
return false; return false;
}, },
@ -756,7 +756,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
player.chooseButton(['木牛流马',player.getEquip(5).cards]).set('filterButton',function(button){ player.chooseButton(['木牛流马',player.getEquip(5).cards]).set('filterButton',function(button){
var evt=_status.event.getTrigger(); var evt=_status.event.getTrigger();
if(evt&&evt.filterCard){ if(evt&&evt.filterCard){
return evt.filterCard(button.link,_status.event.player,evt); return evt.filterCard(button.link,_status.event.player,evt)&&lib.filter.cardRespondable(button.link,_status.event.player,evt);
} }
return true; return true;
}).set('ai',function(button){ }).set('ai',function(button){

16
character/refresh.js
View File

@ -49,7 +49,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:"qiangxi", audio:"qiangxi",
enable:"phaseUse", enable:"phaseUse",
filterCard:function (card){ filterCard:function (card){
return get.type(card)=='equip'; return get.subtype(card)=='equip1';
}, },
selectCard:function (){ selectCard:function (){
return [0,1]; return [0,1];
@ -293,9 +293,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
cards2.push(result.links[i]); cards2.push(result.links[i]);
cards.remove(result.links[i]); cards.remove(result.links[i]);
} }
for(var i=0;i<cards.length;i++){ game.cardsDiscard(cards);
cards[i].discard();
}
event.card2=cards2[0]; event.card2=cards2[0];
} }
var time=1000-(get.utc()-event.time); var time=1000-(get.utc()-event.time);
@ -604,20 +602,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}; };
"step 1" "step 1"
if(result.bool){ if(result.bool){
var cards2=[];
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(get.type(cards[i])!='basic'&&cards[i].name!='juedou'&& if(get.type(cards[i])!='basic'&&cards[i].name!='juedou'&&
(get.type(cards[i])!='equip'||get.subtype(cards[i])!='equip1')){ (get.type(cards[i])!='equip'||get.subtype(cards[i])!='equip1')){
cards[i].discard(); cards2.push(cards[i]);
cards.splice(i--,1); cards.splice(i--,1);
} }
} }
player.gain(cards,'gain2'); player.gain(cards,'gain2');
game.cardsDiscard(cards2);
player.addTempSkill('reluoyi2',{player:'phaseBefore'}); player.addTempSkill('reluoyi2',{player:'phaseBefore'});
trigger.cancel(); trigger.cancel();
} }
else for(var i=0;i<cards.length;i++){ else game.cardsDiscard(cards);
cards[i].discard();
}
}, },
}, },
"new_rewusheng":{ "new_rewusheng":{
@ -1783,7 +1781,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},trigger.player.judging[0]); },trigger.player.judging[0]);
game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone])); game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone]));
} }
trigger.player.judging[0].discard(); game.cardsDiscard(trigger.player.judging[0]);
trigger.player.judging[0]=result.cards[0]; trigger.player.judging[0]=result.cards[0];
if(!get.owner(result.cards[0],'judge')){ if(!get.owner(result.cards[0],'judge')){
trigger.position.appendChild(result.cards[0]); trigger.position.appendChild(result.cards[0]);

49
character/shenhua.js
View File

@ -540,8 +540,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return !player.storage.drlt_poshi&&((player.storage.disableEquip!=undefined&&player.storage.disableEquip.length==5)||player.hp==1); return !player.storage.drlt_poshi&&((player.storage.disableEquip!=undefined&&player.storage.disableEquip.length==5)||player.hp==1);
}, },
content:function(){ content:function(){
"step 0"
player.storage.drlt_poshi=true; player.storage.drlt_poshi=true;
player.loseMaxHp(); player.loseMaxHp();
"step 1"
var num=player.maxHp-player.countCards('h'); var num=player.maxHp-player.countCards('h');
if(num>0) player.draw(num); if(num>0) player.draw(num);
player.removeSkill('drlt_jueyan'); player.removeSkill('drlt_jueyan');
@ -2862,7 +2864,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.node=result.node; event.node=result.node;
} }
else{ else{
if(bool2) result.card.discard(); if(bool2) game.cardsDiscard(result.card);
event.finish(); event.finish();
} }
"step 2" "step 2"
@ -3183,7 +3185,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:["guzheng_count"], group:["guzheng_count"],
subSkill:{ subSkill:{
count:{ count:{
trigger:{global:'discardAfter'}, trigger:{global:['discardAfter','cardsDiscardAfter']},
forced:true, forced:true,
silent:true, silent:true,
popup:false, popup:false,
@ -3784,13 +3786,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.showCards(event.cards); player.showCards(event.cards);
"step 1" "step 1"
var num=0; var num=0;
var cards2=[];
for(var i=0;i<event.cards.length;i++){ for(var i=0;i<event.cards.length;i++){
if(get.suit(event.cards[i])=='heart'){ if(get.suit(event.cards[i])=='heart'){
num++; num++;
event.cards[i].discard(); cards2.push(event.cards[i]);
event.cards.splice(i--,1); event.cards.splice(i--,1);
} }
} }
game.cardsDiscard(cards2);
if(num){ if(num){
player.recover(num); player.recover(num);
} }
@ -3876,36 +3880,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{global:'die'}, trigger:{global:'die'},
priority:5, priority:5,
filter:function(event){ filter:function(event){
if(!event.playerCards||!event.playerCards.length) return false; return event.player.countCards('he')>0;
for(var i=0;i<event.playerCards.length;i++){
if(!get.owner(event.playerCards[i])||get.owner(event.playerCards[i])==event.player) return true;
}
return false;
},
check:function(event){
for(var i=0;i<event.playerCards.length;i++){
if(event.playerCards[i].name=='du') return false;
}
return true;
}, },
content:function(){ content:function(){
"step 0" "step 0"
event.togain=[]; event.togain=trigger.player.getCards('he');
event.shown=[]; event.shown=trigger.player.getCards('e');
for(var i=0;i<trigger.playerCards.length;i++){ var num=event.togain.length-event.shown.length;
if(!get.owner(trigger.playerCards[i])||get.owner(trigger.playerCards[i])==trigger.player){
event.togain.push(trigger.playerCards[i]);
if(trigger.es.contains(trigger.playerCards[i])) event.shown.push(trigger.playerCards[i]);
}
}
player.gain(event.togain); player.gain(event.togain);
trigger.player.$give(event.togain.length-event.shown.length,player); if(num) trigger.player.$give(num,player);
if(event.shown.length) trigger.player.$give(event.shown,player); if(event.shown.length) trigger.player.$give(event.shown,player);
game.delay(); game.delay();
"step 1"
for(var i=0;i<event.togain.length;i++){
trigger.cards.remove(event.togain[i]);
}
}, },
}, },
fangzhu:{ fangzhu:{
@ -5713,7 +5698,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.target.damage(trigger.source,'nocard').type='retianxiang'; event.target.damage(trigger.source,'nocard').type='retianxiang';
event.target.addSkill('retianxiang2'); event.target.addSkill('retianxiang2');
if(get.position(event.card)=='s'){ if(get.position(event.card)=='s'){
event.card.discard(); game.cardsDiscard(event.card);
} }
} }
} }
@ -5743,7 +5728,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
onremove:function(player){ onremove:function(player){
var card=player.storage.retianxiang3; var card=player.storage.retianxiang3;
if(get.position(card)=='s'){ if(get.position(card)=='s'){
card.discard(); game.cardsDiscard(card);
} }
delete player.storage.retianxiang3; delete player.storage.retianxiang3;
} }
@ -6085,9 +6070,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
onunmark:function(storage,player){ onunmark:function(storage,player){
if(storage&&storage.length){ if(storage&&storage.length){
player.$throw(storage); player.$throw(storage);
for(var i=0;i<storage.length;i++){ game.cardsDiscard(storage);
storage[i].discard();
}
delete player.storage.buqu; delete player.storage.buqu;
} }
} }
@ -6464,7 +6447,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"drlt_jueyan":"决堰", "drlt_jueyan":"决堰",
"drlt_jueyan_info":"出牌阶段限一次，你可以废除一个装备栏，然后执行对应一项：武器栏，本回合内你可以多使用三张【杀】；防具栏，摸三张牌，本回合手牌上限+3；2个坐骑栏，本回合你使用的牌无距离限制；宝物栏，本回合获得技能集智", "drlt_jueyan_info":"出牌阶段限一次，你可以废除一个装备栏，然后执行对应一项：武器栏，本回合内你可以多使用三张【杀】；防具栏，摸三张牌，本回合手牌上限+3；2个坐骑栏，本回合你使用的牌无距离限制；宝物栏，本回合获得技能集智",
"drlt_poshi":"破势", "drlt_poshi":"破势",
"drlt_poshi_info":"觉醒技，准备阶段开始时，若你的装备栏均已被废除或体力值为1，则你扣减一点体力上限，失去技能“决堰”并获得技能“怀柔”", "drlt_poshi_info":"觉醒技，准备阶段开始时，若你的装备栏均已被废除或体力值为1，则你扣减一点体力上限，将手牌摸至体力上限，失去技能“决堰”并获得技能“怀柔”",
"drlt_huairou":"怀柔", "drlt_huairou":"怀柔",
"drlt_huairou_info":"出牌阶段，你可以重铸装备牌", "drlt_huairou_info":"出牌阶段，你可以重铸装备牌",
"drlt_zhenggu":"镇骨", "drlt_zhenggu":"镇骨",

167
character/sp.js
View File

@ -833,7 +833,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},trigger.player.judging[0]); },trigger.player.judging[0]);
game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone])); game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone]));
} }
trigger.player.judging[0].discard(); game.cardsDiscard(trigger.player.judging[0]);
trigger.player.judging[0]=result.cards[0]; trigger.player.judging[0]=result.cards[0];
if(!get.owner(result.cards[0],'judge')){ if(!get.owner(result.cards[0],'judge')){
trigger.position.appendChild(result.cards[0]); trigger.position.appendChild(result.cards[0]);
@ -1470,10 +1470,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 3' 'step 3'
if(result.links){ if(result.links){
player.$throw(result.links); player.$throw(result.links);
for(var i=0;i<result.links.length;i++){ player.storage.new_xingwu=[];
player.storage.new_xingwu.remove(result.links[i]); game.cardsDiscard(result.links);
result.links[i].discard();
}
player.syncStorage(); player.syncStorage();
if(!player.storage.new_xingwu.length) player.unmarkSkill('new_xingwu'); if(!player.storage.new_xingwu.length) player.unmarkSkill('new_xingwu');
player.chooseTarget(function(card,player,target){ player.chooseTarget(function(card,player,target){
@ -1592,7 +1590,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.target.damage(trigger.source).type='retianxiang'; event.target.damage(trigger.source).type='retianxiang';
event.target.addSkill('retianxiang2'); event.target.addSkill('retianxiang2');
if(get.position(event.card)=='s'){ if(get.position(event.card)=='s'){
event.card.discard(); game.cardsDiscard(event.card);
} }
} }
} }
@ -2631,7 +2629,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
subSkill:{ subSkill:{
count:{ count:{
trigger:{player:'useCard'}, trigger:{player:'useCardAfter'},
silent:true, silent:true,
filter:function(event,player){ filter:function(event,player){
if(event.targets){ if(event.targets){
@ -5637,10 +5635,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1' 'step 1'
event.basic=[]; event.basic=[];
event.nonbasic=[]; event.nonbasic=[];
event.todis=[];
for(var i=0;i<event.cards.length;i++){ for(var i=0;i<event.cards.length;i++){
if(get.type(event.cards[i])=='basic'){ if(get.type(event.cards[i])=='basic'){
if(event.cards[i].name=='tao'){ if(event.cards[i].name=='tao'){
event.cards[i].discard(); event.todis.push(event.cards[i]);
} }
else{ else{
event.basic.push(event.cards[i]); event.basic.push(event.cards[i]);
@ -5651,6 +5650,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.nonbasic.push(event.cards[i]); event.nonbasic.push(event.cards[i]);
} }
} }
game.cardsDiscard(event.todis);
var num=event.nonbasic.length; var num=event.nonbasic.length;
if(num==0){ if(num==0){
if(event.basic.length==0){ if(event.basic.length==0){
@ -5706,9 +5706,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.storage.zhaolie.gain(event.basic,'gain2','log'); player.storage.zhaolie.gain(event.basic,'gain2','log');
} }
else{ else{
for(var i=0;i<event.basic.length;i++){ game.cardsDiscard(event.basic);
event.basic[i].discard();
}
} }
delete player.storage.zhaolie; delete player.storage.zhaolie;
} }
@ -5967,9 +5965,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.addTempSkill('tuifeng3'); player.addTempSkill('tuifeng3');
player.$throw(player.storage.tuifeng.slice(0),1000); player.$throw(player.storage.tuifeng.slice(0),1000);
player.storage.tuifeng3=player.storage.tuifeng.length; player.storage.tuifeng3=player.storage.tuifeng.length;
while(player.storage.tuifeng.length){ game.cardsDiscard(player.storage.tuifeng);
player.storage.tuifeng.shift().discard(); player.storage.tuifeng=[];
}
player.unmarkSkill('tuifeng') player.unmarkSkill('tuifeng')
} }
}, },
@ -6180,13 +6177,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
chat:['粗鄙之语','天地不容','谄谀之臣','皓首匹夫，苍髯老贼','二臣贼子','断脊之犬','我从未见过有如此厚顔无耻之人！'], chat:['粗鄙之语','天地不容','谄谀之臣','皓首匹夫，苍髯老贼','二臣贼子','断脊之犬','我从未见过有如此厚顔无耻之人！'],
callback:function(){ callback:function(){
'step 0' 'step 0'
if(event.num1>event.num2){ if(event.num1<=event.num2){
target.chooseToDiscard('he','弃置一张牌，或令'+get.translation(player)+'摸一张牌').set('ai',function(card){
if(_status.event.goon) return 6-get.value(card);
return 0;
}).set('goon',get.attitude(target,player)<0);
}
else{
target.chat(lib.skill.gushe.chat[player.storage.gushe]); target.chat(lib.skill.gushe.chat[player.storage.gushe]);
game.delay(); game.delay();
player.storage.gushe++; player.storage.gushe++;
@ -6194,15 +6185,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(player.storage.gushe>=7){ if(player.storage.gushe>=7){
player.die(); player.die();
} }
else{
player.chooseToDiscard('弃置一张牌，或摸一张牌').set('ai',function(){return -1;});
//event.finish();
}
} }
'step 1' 'step 1'
if(event.num1>=event.num2){
target.chooseToDiscard('he','弃置一张牌，或令'+get.translation(player)+'摸一张牌').set('ai',function(card){
if(_status.event.goon) return 6-get.value(card);
return 0;
}).set('goon',get.attitude(target,player)<0);
}
else event.goto(3);
'step 2'
if(!result.bool){ if(!result.bool){
player.draw(); player.draw();
} }
'step 3'
if(event.num1<=event.num2){
player.chooseToDiscard('弃置一张牌，或摸一张牌').set('ai',function(){return -1;});
}
else event.finish();
'step 4'
if(!result.bool) player.draw();
}, },
ai:{ ai:{
order:7, order:7,
@ -6437,7 +6439,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var index=player.storage.shefu2.indexOf(trigger.card.name); var index=player.storage.shefu2.indexOf(trigger.card.name);
if(index!=-1){ if(index!=-1){
var card=player.storage.shefu[index]; var card=player.storage.shefu[index];
card.discard(); game.cardsDiscard(card);
player.$throw(card); player.$throw(card);
player.storage.shefu.splice(index,1); player.storage.shefu.splice(index,1);
player.storage.shefu2.splice(index,1); player.storage.shefu2.splice(index,1);
@ -6925,15 +6927,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
'step 2' 'step 2'
var gained=[]; var gained=[];
var tothrow=[];
for(var i=0;i<event.cards.length;i++){ for(var i=0;i<event.cards.length;i++){
if(get.type(event.cards[i],'trick')=='trick'){ if(get.type(event.cards[i],'trick')=='trick'){
gained.push(event.cards[i]); gained.push(event.cards[i]);
} }
else{ else{
event.cards[i].discard(); tothrow.push(event.cards[i]);
} }
} }
player.gain(gained,'gain2'); player.gain(gained,'gain2');
game.cardsDiscard(tothrow);
}, },
ai:{ ai:{
threaten:1.5 threaten:1.5
@ -7346,8 +7350,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=event.cards||result.links; var cards=event.cards||result.links;
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
player.storage.yinling.remove(cards[i]); player.storage.yinling.remove(cards[i]);
cards[i].discard();
} }
game.cardsDiscard(cards);
player.$throw(cards); player.$throw(cards);
player.syncStorage('yinling'); player.syncStorage('yinling');
if(player.storage.yinling.length==0){ if(player.storage.yinling.length==0){
@ -7793,9 +7797,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:'cards', content:'cards',
onunmark:function(storage,player){ onunmark:function(storage,player){
if(storage&&storage.length){ if(storage&&storage.length){
for(var i=0;i<storage.length;i++){ game.cardsDiscard(storage);
storage[i].discard();
}
player.$throw(storage); player.$throw(storage);
delete player.storage.yinbing; delete player.storage.yinbing;
} }
@ -7828,7 +7830,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1' 'step 1'
var card=result.links[0]; var card=result.links[0];
player.storage.yinbing.remove(card); player.storage.yinbing.remove(card);
card.discard(); game.cardsDiscard(card);
player.$throw(card); player.$throw(card);
game.log(player,'将',card,'置入弃牌堆'); game.log(player,'将',card,'置入弃牌堆');
player.syncStorage('yinbing'); player.syncStorage('yinbing');
@ -7885,9 +7887,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.$throw(player.storage.yinbing,1000); player.$throw(player.storage.yinbing,1000);
var num=player.maxHp-player.countCards('h'); var num=player.maxHp-player.countCards('h');
if(num>0) player.draw(num); if(num>0) player.draw(num);
while(player.storage.yinbing.length){ game.cardsDiscard(player.storage.yinbing);
player.storage.yinbing.shift().discard(); player.storage.yinbing=[];
}
player.syncStorage('yinbing'); player.syncStorage('yinbing');
player.unmarkSkill('yinbing'); player.unmarkSkill('yinbing');
} }
@ -8146,8 +8147,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.$throw(result.links); player.$throw(result.links);
for(var i=0;i<result.links.length;i++){ for(var i=0;i<result.links.length;i++){
player.storage.fentian.remove(result.links[i]); player.storage.fentian.remove(result.links[i]);
result.links[i].discard();
} }
game.cardsDiscard(player.storage.fentian);
player.syncStorage('fentian'); player.syncStorage('fentian');
target.loseHp(); target.loseHp();
} }
@ -8286,7 +8287,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.logSkill('shuliang',trigger.player); player.logSkill('shuliang',trigger.player);
player.storage.tunchu.remove(result.links[0]); player.storage.tunchu.remove(result.links[0]);
player.$throw(result.links); player.$throw(result.links);
result.links[0].discard(); game.cardsDiscard(result.links);
player.syncStorage('tunchu'); player.syncStorage('tunchu');
if(player.storage.tunchu.length==0){ if(player.storage.tunchu.length==0){
player.unmarkSkill('tunchu'); player.unmarkSkill('tunchu');
@ -9136,7 +9137,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger.source.judge(ui.special); trigger.source.judge(ui.special);
"step 1" "step 1"
if(result.color=='black'){ if(result.color=='black'){
result.card.discard(); game.cardsDiscard(result.card);
trigger.num++; trigger.num++;
} }
else{ else{
@ -9428,34 +9429,39 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:'manjuan', audio:'manjuan',
forced:true, forced:true,
priority:15, priority:15,
trigger:{player:'gainEnd'}, trigger:{player:'gainBefore'},
filter:function(event,player){ filter:function(event,player){
return event.type!='xinmanjuan'; return event.type!='xinmanjuan';
}, },
content:function(){ content:function(){
"step 0" "step 0"
event.cards=trigger.cards.slice(0); if(trigger.delay==false) game.delay();
player.discard(event.cards);
if(_status.currentPhase!=player) event.finish();
"step 1" "step 1"
trigger.cancel();
event.cards=trigger.cards.slice(0);
game.cardsDiscard(event.cards);
player.$throw(event.cards,1000);
game.log(player,'将',event.cards,'置入了弃牌堆')
if(_status.currentPhase!=player) event.finish();
"step 2"
event.card=event.cards.shift(); event.card=event.cards.shift();
event.togain=[]; event.togain=[];
var number=get.number(event.card); var number=get.number(event.card);
for(var i=0;i<ui.discardPile.childNodes.length;i++){ for(var i=0;i<ui.discardPile.childNodes.length;i++){
var current=ui.discardPile.childNodes[i]; var current=ui.discardPile.childNodes[i];
if(current!=event.card&&get.number(current)==number) event.togain.push(current); if((!trigger.cards.contains(current))&&get.number(current)==number) event.togain.push(current);
} }
if(!event.togain.length) event.goto(4); if(!event.togain.length) event.goto(4);
"step 2" "step 3"
player.chooseButton(['是否获得其中的一张牌？',event.togain]).ai=function(button){ player.chooseButton(['是否获得其中的一张牌？',event.togain]).ai=function(button){
return get.value(button.link); return get.value(button.link);
}; };
"step 3" "step 4"
if(result.bool){ if(result.bool){
player.gain(result.links[0],'gain2').type='xinmanjuan'; player.gain(result.links[0],'gain2').type='xinmanjuan';
} }
"step 4" "step 5"
if(event.cards.length) event.goto(1); if(event.cards.length) event.goto(2);
}, },
ai:{ ai:{
threaten:4.2, threaten:4.2,
@ -9534,15 +9540,24 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
"step 0" "step 0"
player.storage.zuixiang=get.cards(3); player.storage.zuixiang=get.cards(3);
event.trigger('addCardToStorage');
player.showCards(player.storage.zuixiang); player.showCards(player.storage.zuixiang);
player.markSkill('zuixiang'); player.markSkill('zuixiang');
player.syncStorage('zuixiang'); player.syncStorage('zuixiang');
"step 1" "step 1"
var cards=player.storage.zuixiang; var cards=player.storage.zuixiang;
if(cards[0].number==cards[1].number|| var bool=false;
cards[0].number==cards[2].number|| for(var i=0;i<cards.length;i++){
cards[2].number==cards[1].number){ for(var j=i+1;j<cards.length;j++){
player.gain(player.storage.zuixiang,'draw2'); if(cards[i].number==cards[j].number){
bool=true;
break;
}
}
if(bool) break;
}
if(bool){
player.gain(player.storage.zuixiang,'draw2').type='xinmanjuan';
player.storage.zuixiang=[]; player.storage.zuixiang=[];
player.awakenSkill('zuixiang'); player.awakenSkill('zuixiang');
delete player.storage.zuixiang2; delete player.storage.zuixiang2;
@ -9604,20 +9619,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.finish(); event.finish();
} }
else{ else{
for(var i=0;i<player.storage.zuixiang.length;i++){ player.storage.zuixiang.addArray(get.cards(3));
player.storage.zuixiang[i].discard(); event.trigger('addCardToStorage');
}
player.storage.zuixiang=get.cards(3);
player.showCards(player.storage.zuixiang); player.showCards(player.storage.zuixiang);
player.markSkill('zuixiang'); player.markSkill('zuixiang');
player.syncStorage('zuixiang'); player.syncStorage('zuixiang');
} }
"step 1" "step 1"
var cards=player.storage.zuixiang; var cards=player.storage.zuixiang;
if(cards[0].number==cards[1].number|| var bool=false;
cards[0].number==cards[2].number|| for(var i=0;i<cards.length;i++){
cards[2].number==cards[1].number){ for(var j=i+1;j<cards.length;j++){
player.gain(player.storage.zuixiang,'draw2'); if(cards[i].number==cards[j].number){
bool=true;
break;
}
}
if(bool) break;
}
if(bool){
player.gain(player.storage.zuixiang,'draw2').type='xinmanjuan';
player.storage.zuixiang=[]; player.storage.zuixiang=[];
player.awakenSkill('zuixiang'); player.awakenSkill('zuixiang');
delete player.storage.zuixiang2; delete player.storage.zuixiang2;
@ -10203,9 +10224,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}).set('enemy',get.value(event.togive[0])<0); }).set('enemy',get.value(event.togive[0])<0);
} }
else{ else{
for(var i=0;i<event.cards.length;i++){ game.cardsDiscard(event.cards);
event.cards[i].discard();
}
event.finish(); event.finish();
} }
"step 3" "step 3"
@ -10219,9 +10238,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
event.goto(1); event.goto(1);
} }
else{ else{
for(var i=0;i<event.cards.length;i++){ game.cardsDiscard(event.cards);
event.cards[i].discard();
}
event.finish(); event.finish();
} }
}, },
@ -11331,9 +11348,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=[]; var cards=[];
if(ui.cardPile.childNodes.length<2){ if(ui.cardPile.childNodes.length<2){
var discardcards=get.cards(2); var discardcards=get.cards(2);
for(var i=0;i<discardcards.length;i++){ game.cardsDiscard(discardcards);
discardcards[i].discard();
}
} }
for(var i=0;i<2;i++){ for(var i=0;i<2;i++){
cards.push(ui.cardPile.childNodes[i]); cards.push(ui.cardPile.childNodes[i]);
@ -11370,9 +11385,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=[]; var cards=[];
if(ui.cardPile.childNodes.length<2){ if(ui.cardPile.childNodes.length<2){
var discardcards=get.cards(2); var discardcards=get.cards(2);
for(var i=0;i<discardcards.length;i++){ game.cardsDiscard(discardcards);
discardcards[i].discard();
}
} }
for(var i=0;i<2;i++){ for(var i=0;i<2;i++){
cards.push(ui.cardPile.childNodes[i]); cards.push(ui.cardPile.childNodes[i]);
@ -11533,7 +11546,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},trigger.player.judging[0]); },trigger.player.judging[0]);
game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone])); game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone]));
} }
trigger.player.judging[0].discard(); game.cardsDiscard(trigger.player.judging[0]);
trigger.player.judging[0]=event.card; trigger.player.judging[0]=event.card;
if(!get.owner(event.card,'judge')){ if(!get.owner(event.card,'judge')){
trigger.position.appendChild(event.card); trigger.position.appendChild(event.card);
@ -11647,7 +11660,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audioname:['re_gongsunzan'], audioname:['re_gongsunzan'],
forced:true, forced:true,
filter:function(event,player){ filter:function(event,player){
return get.sgn(player.hp-2)!=get.sgn(player.hp-2-event.num); return get.sgn(player.hp-2.5)!=get.sgn(player.hp-2.5-event.num);
}, },
content:function (){}, content:function (){},
mod:{ mod:{
@ -11752,7 +11765,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.gain(player.storage.bifa[0],'draw2','log','fromStorage'); player.gain(player.storage.bifa[0],'draw2','log','fromStorage');
} }
else{ else{
player.storage.bifa[0].discard(); game.cardsDiscard(player.storage.bifa[0]);
game.log(player.storage.bifa[0],'进入弃牌堆'); game.log(player.storage.bifa[0],'进入弃牌堆');
player.$throw(player.storage.bifa[0],1000); player.$throw(player.storage.bifa[0],1000);
player.loseHp(); player.loseHp();
@ -12756,7 +12769,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
kuangfu:'狂斧', kuangfu:'狂斧',
kuangfu_info:'每当你使用杀造成伤害，可以将对方的一张装备牌移到你的装备区或弃置之。', kuangfu_info:'每当你使用杀造成伤害，可以将对方的一张装备牌移到你的装备区或弃置之。',
xintan:'心惔', xintan:'心惔',
xintan_info:'出牌阶段限一次，你可以移去两张“焚”并选择一名角色，该角色失去一点体', xintan_info:'出牌阶段限一次，你可以移去两张“焚”并选择一名角色，该角色失去一点体力',
fentian:'焚天', fentian:'焚天',
fentian_info:'锁定技，结束阶段开始时，若你的手牌数少于体力值，你须选择一名攻击范围内的角色，将其一张牌置于你的武将牌上，称为“焚”。锁定技，你的攻击范围+X（X为“焚”的数量）', fentian_info:'锁定技，结束阶段开始时，若你的手牌数少于体力值，你须选择一名攻击范围内的角色，将其一张牌置于你的武将牌上，称为“焚”。锁定技，你的攻击范围+X（X为“焚”的数量）',
zhiri:'炙日', zhiri:'炙日',
@ -12947,8 +12960,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
taichen_info:'出牌阶段限一次，你可以自减一点体力，视为对一名角色使用一张杀（不计入回合内出杀限制）', taichen_info:'出牌阶段限一次，你可以自减一点体力，视为对一名角色使用一张杀（不计入回合内出杀限制）',
manjuan_info:'其他角色的卡牌因弃置而进入弃牌堆后，你可以弃置一张花色与之不同的牌，然后获得之', manjuan_info:'其他角色的卡牌因弃置而进入弃牌堆后，你可以弃置一张花色与之不同的牌，然后获得之',
xinmanjuan:'漫卷', xinmanjuan:'漫卷',
xinmanjuan_info:'每当你将获得任何一张牌，将之置于弃牌堆。若此情况处于你的回合中，你可依次将与该牌点数相同的一张牌从弃牌堆置于你手上。', xinmanjuan_info:'锁定技，当你不因【漫卷】或【醉乡】而获得牌时，你将此牌置入弃牌堆。然后若此时处于你的回合内，则你可以从弃牌堆中选择获得一张与此牌点数相同的其他牌。',
zuixiang_info:'限定技，准备阶段开始时，你可以展示牌库顶的3张牌并置于你的武将牌上，你不可使用或打出与该些牌同类的牌，所有同类牌对你无效。之后每个你的准备阶段，你须重复展示一次，直至该些牌中任意两张点数相同时，将你武将牌上的全部牌置于你的手上。', zuixiang_info:'限定技，准备阶段开始时，你可以展示牌堆顶的3张牌并置于你的武将牌上。你不可使用或打出与该些牌同类的牌，所有同类牌对你无效。之后每个你的准备阶段，你须重复展示一次，直至这些牌中任意两张点数相同时，将你武将牌上的全部牌置于你的手上。',
naman_info:'你可以获得其他角色打出的杀', naman_info:'你可以获得其他角色打出的杀',
xiemu_info:'每当你成为其他角色的黑色牌的目标，可以弃置一张杀并摸两张牌', xiemu_info:'每当你成为其他角色的黑色牌的目标，可以弃置一张杀并摸两张牌',
spmengjin_info:'每当你使用一张杀，可以弃置目标一张牌', spmengjin_info:'每当你使用一张杀，可以弃置目标一张牌',

2
character/standard.js
View File

@ -227,7 +227,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},trigger.player.judging[0]); },trigger.player.judging[0]);
game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone])); game.addVideo('deletenode',player,get.cardsInfo([trigger.player.judging[0].clone]));
} }
trigger.player.judging[0].discard(); game.cardsDiscard(trigger.player.judging[0]);
trigger.player.judging[0]=result.cards[0]; trigger.player.judging[0]=result.cards[0];
if(!get.owner(result.cards[0],'judge')){ if(!get.owner(result.cards[0],'judge')){
trigger.position.appendChild(result.cards[0]); trigger.position.appendChild(result.cards[0]);

34
character/xinghuoliaoyuan.js
View File

@ -1235,31 +1235,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{global:'die'}, trigger:{global:'die'},
priority:5, priority:5,
filter:function(event){ filter:function(event){
if(!event.playerCards||!event.playerCards.length) return false; return event.player.countCards('he')>0;
for(var i=0;i<event.playerCards.length;i++){
if(!get.owner(event.playerCards[i])||get.owner(event.playerCards[i])==event.player) return true;
}
return false;
},
check:function(event){
for(var i=0;i<event.playerCards.length;i++){
if(event.playerCards[i].name=='du') return false;
}
return true;
}, },
content:function(){ content:function(){
"step 0" "step 0"
event.togain=[]; event.togain=trigger.player.getCards('he');
for(var i=0;i<trigger.playerCards.length;i++){ event.shown=trigger.player.getCards('e');
if(!get.owner(trigger.playerCards[i])||get.owner(trigger.playerCards[i])==trigger.player) event.togain.push(trigger.playerCards[i]); var num=event.togain.length-event.shown.length;
}
player.gain(event.togain); player.gain(event.togain);
trigger.player.$give(event.togain.length,player); if(num) trigger.player.$give(num,player);
if(event.shown.length) trigger.player.$give(event.shown,player);
game.delay(); game.delay();
"step 1"
for(var i=0;i<event.togain.length;i++){
trigger.cards.remove(event.togain[i]);
}
}, },
}, },
"xinfu_fujian":{ "xinfu_fujian":{
@ -2443,7 +2429,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
delete player.storage.xinfu_yanyu2; delete player.storage.xinfu_yanyu2;
}, },
trigger:{ trigger:{
global:"loseEnd", global:["loseEnd","cardsDiscardEnd"],
}, },
direct:true, direct:true,
filter:function (event,player){ filter:function (event,player){
@ -2956,9 +2942,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(event.gains.length) player.gain(event.gains,'gain2'); if(event.gains.length) player.gain(event.gains,'gain2');
if(event.discards.length){ if(event.discards.length){
player.$throw(event.discards); player.$throw(event.discards);
for(var i=0;i<event.discards.length;i++){ game.cardsDiscard(event.discards);
event.discards[i].discard();
}
} }
} }
}, },
@ -3371,7 +3355,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(result.bool){ if(result.bool){
player.$throw(result.links); player.$throw(result.links);
var card=result.links[0]; var card=result.links[0];
card.discard(); game.cardsDiscard(card);
player.storage.xinfu_zengdao2.remove(card); player.storage.xinfu_zengdao2.remove(card);
player.syncStorage('xinfu_zengdao2'); player.syncStorage('xinfu_zengdao2');
player.updateMarks('xinfu_zengdao2'); player.updateMarks('xinfu_zengdao2');

80
character/yijiang.js
View File

@ -855,7 +855,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.chooseToCompare(trigger.player); player.chooseToCompare(trigger.player);
'step 1' 'step 1'
if(result.bool){ if(result.bool){
trigger.skipShan=true; trigger.cancel();
} }
} }
} }
@ -872,10 +872,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2, audio:2,
trigger:{player:'chooseCardBegin'}, trigger:{player:'chooseCardBegin'},
check:function(event,player){ check:function(event,player){
return player.hasCard(function(card){ return !player.hasCard(function(card){
var val=get.value(card); var val=get.value(card);
return val<0||(val<=4&&card.number>=11); return val<0||(val<=4&&card.number>=11);
}); },'h');
}, },
filter:function(event){ filter:function(event){
return event.type=='compare'&&!event.directresult; return event.type=='compare'&&!event.directresult;
@ -1648,9 +1648,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
} }
if(event.togain.length){ if(event.togain.length){
for(var i=0;i<dialog.buttons.length;i++){ game.cardsDiscard(event.togain);
event.togain[i].discard();
}
} }
game.broadcast(function(id){ game.broadcast(function(id){
var dialog=get.idDialog(id); var dialog=get.idDialog(id);
@ -3416,15 +3414,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=get.cards(2); var cards=get.cards(2);
target.viewCards('督粮',cards); target.viewCards('督粮',cards);
event.cards2=[]; event.cards2=[];
event.tothrow=[];
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(get.type(cards[i])=='basic'){ if(get.type(cards[i])=='basic'){
ui.special.appendChild(cards[i]); ui.special.appendChild(cards[i]);
event.cards2.push(cards[i]); event.cards2.push(cards[i]);
} }
else{ else{
cards[i].discard(); event.tothrow.push(cards[i]);
} }
} }
game.cardsDiscard(event.tothrow);
} }
else{ else{
target.addSkill('duliang2'); target.addSkill('duliang2');
@ -3590,43 +3590,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1' 'step 1'
ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild); ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild);
game.updateRoundNumber(); game.updateRoundNumber();
var n1=target.getCards('he',function(card){ 'step 2'
if(!lib.filter.cardDiscardable(card,player)) return false; target.chooseToDiscard(true).prompt='请弃置一张锦囊牌，或依次弃置两张非锦囊牌。';
return get.type(card,'trick')=='trick'; 'step 3'
}); if((!result.cards||get.type(result.cards[0],'trick')!='trick')&&target.countCards('he',{type:['trick','delay']})){
var n2=target.getCards('he',function(card){ target.chooseToDiscard(true,function(card){
if(!lib.filter.cardDiscardable(card,player)) return false; return get.type(card,'trick')!='trick';
return get.type(card,'trick')!='trick'; }).prompt='请弃置第二张非锦囊牌';
});
if(n1.length>1||n2.length>2||(n1.length==1&&n2.length==2)){
target.chooseToDiscard('弃置一张锦囊牌，或两张非锦囊牌',true,'he',function(card,player){
if(!lib.filter.cardDiscardable(card,player)) return false;
if(!_status.event.nontrick){
return get.type(card,'trick')=='trick';
}
if(ui.selected.cards.length){
return get.type(card,'trick')!='trick';
}
return true;
}).set('ai',function(card){
if(get.type(card,'trick')=='trick'){
return 8-get.value(card);
}
return -get.value(card);
}).set('selectCard',function(){
if(ui.selected.cards.length==1&&get.type(ui.selected.cards[0],'trick')=='trick'){
return 1;
}
return 2;
}).set('nontrick',n2.length>=2).set('complexCard',true);
}
else{
if(n1.length){
target.discard(n1);
}
else if(n2.length){
target.discard(n2);
}
} }
}, },
ai:{ ai:{
@ -4019,7 +3989,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.logSkill('chunlao'); player.logSkill('chunlao');
player.$throw(result.links); player.$throw(result.links);
player.storage.chunlao.remove(result.links[0]); player.storage.chunlao.remove(result.links[0]);
result.links[0].discard(); game.cardsDiscard(result.links[0]);
player.syncStorage('chunlao'); player.syncStorage('chunlao');
target.useCard({name:'jiu'},target); target.useCard({name:'jiu'},target);
if(!player.storage.chunlao.length){ if(!player.storage.chunlao.length){
@ -5989,7 +5959,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
player.$throw(player.storage.xinpojun2,1000); player.$throw(player.storage.xinpojun2,1000);
for(var i=0;i<player.storage.xinpojun2.length;i++){ for(var i=0;i<player.storage.xinpojun2.length;i++){
player.storage.xinpojun2[i].discard(); game.cardsDiscard(player.storage.xinpojun2);
} }
game.log(player,'弃置了',player.storage.xinpojun2); game.log(player,'弃置了',player.storage.xinpojun2);
delete player.storage.xinpojun2; delete player.storage.xinpojun2;
@ -6030,9 +6000,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"step 0" "step 0"
player.draw(); player.draw();
"step 1" "step 1"
for(var i=0;i<cards.length;i++){ game.cardsDiscard(cards);
cards[i].discard();
}
}, },
ai:{ ai:{
basic:{ basic:{
@ -7091,7 +7059,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.chooseCardButton(player.storage.quanji,true); player.chooseCardButton(player.storage.quanji,true);
"step 1" "step 1"
var card=result.links[0]; var card=result.links[0];
card.discard(); game.cardsDiscard(card);
player.$throw(card); player.$throw(card);
player.storage.quanji.remove(card); player.storage.quanji.remove(card);
if(!player.storage.quanji.length){ if(!player.storage.quanji.length){
@ -9072,9 +9040,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
cards2.push(result.links[i]); cards2.push(result.links[i]);
cards.remove(result.links[i]); cards.remove(result.links[i]);
} }
for(var i=0;i<cards.length;i++){ game.cardsDiscard(cards);
cards[i].discard();
}
event.cards2=cards2; event.cards2=cards2;
} }
else{ else{
@ -9241,9 +9207,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:'cards', content:'cards',
onunmark:function(storage,player){ onunmark:function(storage,player){
if(storage&&storage.length){ if(storage&&storage.length){
for(var i=0;i<storage.length;i++){ game.cardsDiscard(storage);
storage[i].discard();
}
player.$throw(storage); player.$throw(storage);
player.storage.xiansi.length=0; player.storage.xiansi.length=0;
} }
@ -9327,9 +9291,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
} }
event.target.$throw(links); event.target.$throw(links);
game.log(event.target,'被移去了',links); game.log(event.target,'被移去了',links);
for(var i=0;i<links.length;i++){ game.cardsDiscard(links);
links[i].discard();
}
player.useCard({name:'sha'},event.target); player.useCard({name:'sha'},event.target);
} }
}, },

2
character/yxs.js
View File

@ -2824,7 +2824,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
enable:'phaseUse', enable:'phaseUse',
usable:1, usable:1,
filterTarget:function(card,player,target){ filterTarget:function(card,player,target){
return player!=target&&target.hasCard(function(card){ return target.hasCard(function(card){
return !get.info(card).unique; return !get.info(card).unique;
},'e'); },'e');
}, },

77
game/game.js
View File

@ -9302,6 +9302,11 @@
}, },
element:{ element:{
content:{ content:{
cardsDiscard:function(){
for(var i=0;i<cards.length;i++){
cards[i].discard();
}
},
chooseToEnable:function(){ chooseToEnable:function(){
'step 0' 'step 0'
var list=[]; var list=[];
@ -10946,12 +10951,13 @@
}; };
"step 2" "step 2"
var cards=[]; var cards=[];
player.lose(result[0].cards); player.lose(result[0].cards,ui.special);
for(var i=1;i<result.length;i++){ for(var i=1;i<result.length;i++){
event.list[i].lose(result[i].cards); event.list[i].lose(result[i].cards,ui.special);
cards.push(result[i].cards[0]); cards.push(result[i].cards[0]);
} }
event.cardlist=cards; event.cardlist=cards;
event.cards=cards;
event.card1=result[0].cards[0]; event.card1=result[0].cards[0];
event.num1=event.card1.number; event.num1=event.card1.number;
event.iwhile=0; event.iwhile=0;
@ -10976,7 +10982,7 @@
game.delay(0,1500); game.delay(0,1500);
} }
else{ else{
event.finish(); event.goto(7);
} }
"step 4" "step 4"
event.result.num1[event.iwhile]=event.num1; event.result.num1[event.iwhile]=event.num1;
@ -11025,6 +11031,13 @@
game.broadcastAll(ui.clear); game.broadcastAll(ui.clear);
event.iwhile++; event.iwhile++;
event.goto(3); event.goto(3);
"step 7"
event.cards.add(event.card1);
var cards2=[];
for(var i=0;i<event.cards.length;i++){
if(!get.owner(event.cards[i])) cards2.push(event.cards[i]);
}
game.cardsDiscard(cards2);
}, },
chooseToCompare:function(){ chooseToCompare:function(){
"step 0" "step 0"
@ -11097,8 +11110,8 @@
event.addToAI=true; event.addToAI=true;
} }
} }
player.lose(event.card1); player.lose(event.card1,ui.special);
target.lose(event.card2); target.lose(event.card2,ui.special);
"step 5" "step 5"
game.broadcast(function(){ game.broadcast(function(){
ui.arena.classList.add('thrownhighlight'); ui.arena.classList.add('thrownhighlight');
@ -11169,6 +11182,11 @@
else if(event.preserve=='lose'){ else if(event.preserve=='lose'){
event.preserve=!event.result.bool; event.preserve=!event.result.bool;
} }
"step 8"
var cards=[];
if(!get.owner(event.card1)) cards.push(event.card1);
if(!get.owner(event.card2)) cards.push(event.card2);
game.cardsDiscard(cards);
}, },
chooseSkill:function(){ chooseSkill:function(){
'step 0' 'step 0'
@ -13885,10 +13903,6 @@
else{ else{
game.log(player,'阵亡') game.log(player,'阵亡')
} }
event.cards=player.getCards('hej');
event.playerCards=player.getCards('he');
event.es=player.getCards('e');
event.hs=player.getCards('h');
if(!game.reserveDead){ if(!game.reserveDead){
for(var mark in player.marks){ for(var mark in player.marks){
@ -13986,14 +14000,14 @@
if(player.dieAfter) player.dieAfter(source); if(player.dieAfter) player.dieAfter(source);
event.trigger('die'); event.trigger('die');
"step 1" "step 1"
if(event.cards.length){ if(player.isDead()){
player.$throw(event.cards,1000); event.cards=player.getCards('hej');
game.log(player,'弃置了',event.cards,event.logvid); if(event.cards.length){
for(var i=0;i<event.cards.length;i++){ player.$throw(event.cards,1000);
event.cards[i].discard(); game.log(player,'弃置了',event.cards,event.logvid);
game.cardsDiscard(event.cards);
} }
} }
if(typeof _status.coin=='number'&&source&&!_status.auto){ if(typeof _status.coin=='number'&&source&&!_status.auto){
if(source==game.me||source.isUnderControl()){ if(source==game.me||source.isUnderControl()){
_status.coin+=10; _status.coin+=10;
@ -14066,7 +14080,7 @@
"step 4" "step 4"
if(player.isMin() || player.countCards('e',{subtype:get.subtype(card)})){ if(player.isMin() || player.countCards('e',{subtype:get.subtype(card)})){
event.finish(); event.finish();
card.discard(); game.cardsDiscard(card);
delete player.equiping; delete player.equiping;
return; return;
} }
@ -14129,7 +14143,7 @@
delete cards[0]._transform; delete cards[0]._transform;
var viewAs=typeof card=='string'?card:card.name; var viewAs=typeof card=='string'?card:card.name;
if(!lib.card[viewAs]||!lib.card[viewAs].effect){ if(!lib.card[viewAs]||!lib.card[viewAs].effect){
cards[0].discard(); game.cardsDiscard(cards[0]);
} }
else{ else{
cards[0].style.transform=''; cards[0].style.transform='';
@ -14250,7 +14264,10 @@
game.addVideo('judge2',null,event.videoId); game.addVideo('judge2',null,event.videoId);
ui.arena.classList.remove('thrownhighlight'); ui.arena.classList.remove('thrownhighlight');
game.log(player,'的判定结果为',event.result.card); game.log(player,'的判定结果为',event.result.card);
if(!get.owner(event.result.card)) event.position.appendChild(event.result.card); if(!get.owner(event.result.card)){
if(event.position==ui.discardPile) game.cardsDiscard(event.result.card);
else event.position.appendChild(event.result.card);
}
}, },
turnOver:function(){ turnOver:function(){
game.log(player,'翻面'); game.log(player,'翻面');
@ -14770,7 +14787,7 @@
}, },
uninit:function(){ uninit:function(){
for(var i=1;i<6;i++){ for(var i=1;i<6;i++){
this.enableEquip(i); if(this.isDisabled(i)) this.enableEquip(i);
} }
this.node.avatar.hide(); this.node.avatar.hide();
@ -17600,7 +17617,7 @@
target=target.next; target=target.next;
} }
if(target==this){ if(target==this){
card.discard(); game.cardsDiscard(card);
} }
else{ else{
if(card.name!=name){ if(card.name!=name){
@ -18054,9 +18071,7 @@
if(info.intro.onunmark=='throw'){ if(info.intro.onunmark=='throw'){
if(get.itemtype(this.storage[name])=='cards'){ if(get.itemtype(this.storage[name])=='cards'){
this.$throw(this.storage[name]); this.$throw(this.storage[name]);
while(this.storage[name].length){ game.cardsDiscard(this.storage[name]);
this.storage[name].shift().discard();
}
} }
} }
else if(typeof info.intro.onunmark=='function'){ else if(typeof info.intro.onunmark=='function'){
@ -18747,9 +18762,7 @@
this.$throw(cards); this.$throw(cards);
} }
if(this.onremove=='discard'||this.onremove=='lose'){ if(this.onremove=='discard'||this.onremove=='lose'){
for(var i=0;i<cards.length;i++){ game.cardsDiscard(cards);
cards[i].discard();
}
delete this.storage[skill]; delete this.storage[skill];
} }
} }
@ -23191,9 +23204,7 @@
player.draw(); player.draw();
} }
"step 1" "step 1"
for(var i=0;i<cards.length;i++){ game.cardsDiscard(cards);
cards[i].discard();
}
}, },
ai:{ ai:{
basic:{ basic:{
@ -24235,6 +24246,14 @@
}, },
}; };
var game={ var game={
cardsDiscard:function(cards){
var type=get.itemtype(cards);
if(type!='cards'&&type!='card') return {};
var next=game.createEvent('cardsDiscard');
next.cards=type=='cards'?cards:[cards];
next.setContent('cardsDiscard');
return next;
},
online:false, online:false,
onlineID:null, onlineID:null,
onlineKey:null, onlineKey:null,

16
game/update.js
View File

@ -1,22 +1,20 @@
window.noname_update={ window.noname_update={
version:'1.9.90.5', version:'1.9.91',
update:'1.9.90.4', update:'1.9.90.5',
changeLog:[ changeLog:[
'SP庞统技能还原', '添加cardsDiscard的新时机',
'BUG修复', 'BUG修复',
], ],
files:[ files:[
'card/guozhan.js', 'card/sp.js',
'card/standard.js',
'character/extra.js',
'character/refresh.js', 'character/refresh.js',
'character/shenhua.js', 'character/shenhua.js',
'character/sp.js', 'character/sp.js',
'character/standard.js', 'character/standard.js',
'character/xinghuoliaoyuan.js', 'character/xinghuoliaoyuan.js',
'mode/boss.js', 'character/yijiang.js',
'mode/guozhan.js', 'character/yxs.js',
'game/config.js', 'mode/versus.js',
'game/game.js', 'game/game.js',
] ]
}; };

20
mode/versus.js
View File

@ -5467,6 +5467,12 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
content:{ content:{
replacePlayer:function(){ replacePlayer:function(){
"step 0" "step 0"
var cards=source.getCards('hej');
if(cards.length){
source.$throw(cards,1000);
game.cardsDiscard(cards);
}
"step 1"
var list=(source.side==game.me.side)?_status.friend:_status.enemy; var list=(source.side==game.me.side)?_status.friend:_status.enemy;
if(list.length==0){ if(list.length==0){
// if(game.friend.contains(source)){ // if(game.friend.contains(source)){
@ -5509,7 +5515,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else{ else{
event.character=list[Math.floor(Math.random()*list.length)]; event.character=list[Math.floor(Math.random()*list.length)];
} }
"step 1" "step 2"
game.uncheck(); game.uncheck();
_status.friend.remove(event.character); _status.friend.remove(event.character);
_status.enemy.remove(event.character); _status.enemy.remove(event.character);
@ -5539,13 +5545,18 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
game.onSwapControl(); game.onSwapControl();
} }
game.triggerEnter(source); game.triggerEnter(source);
"step 2" "step 3"
// if(_status.currentPhase==source){ // if(_status.currentPhase==source){
// source.skip('phase'); // source.skip('phase');
// } // }
}, },
replacePlayerTwo:function(){ replacePlayerTwo:function(){
'step 0' 'step 0'
var cards=source.getCards('hej');
if(cards.length){
source.$throw(cards,1000);
game.cardsDiscard(cards);
}
game.delay(); game.delay();
'step 1' 'step 1'
source.revive(null,false); source.revive(null,false);
@ -5574,6 +5585,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}, },
replacePlayerOL:function(){ replacePlayerOL:function(){
'step 0' 'step 0'
var cards=source.getCards('hej');
if(cards.length){
source.$throw(cards,1000);
game.cardsDiscard(cards);
}
game.delay(); game.delay();
'step 1' 'step 1'
if(event.source.side==game.me.side){ if(event.source.side==game.me.side){