v1.9.94.3(Final Part)

This commit is contained in:
Spmario233 2019-10-31 12:44:31 +08:00 committed by GitHub
parent 6003184bc7
commit 0957fd2cf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 36 deletions

View File

@ -13319,28 +13319,6 @@
}
}
"step 3"
var info=get.info(card);
if(info.contentBefore){
var next=game.createEvent(card.name+'ContentBefore');
next.setContent(info.contentBefore);
next.targets=targets;
next.card=card;
next.cards=cards;
next.player=player;
next.type='precard';
if(event.forceDie) next.forceDie=true;
}
else if(info.reverseOrder&&get.is.versus()&&targets.length>1){
var next=game.createEvent(card.name+'ContentBefore');
next.setContent('reverseOrder');
next.targets=targets;
next.card=card;
next.cards=cards;
next.player=player;
next.type='precard';
if(event.forceDie) next.forceDie=true;
}
"step 4"
event.sortTarget=function(animate){
var info=get.info(card);
if(num==0&&targets.length>1){
@ -13361,12 +13339,13 @@
}
event.sortTarget();
event.getTriggerTarget=function(list1,list2){
for(var i=0;i<list1.length;i++){
if(!list2.contains(list1[i])) return list1[i];
var listx=list1.slice(0).sortBySeat();
for(var i=0;i<listx.length;i++){
if(!list2.contains(listx[i])) return list1[i];
}
return null;
}
"step 5"
"step 4"
if(!event.triggeredTargets1) event.triggeredTargets1=[];
var target=event.getTriggerTarget(targets,event.triggeredTargets1);
if(target){
@ -13381,7 +13360,7 @@
if(event.forceDie) next.forceDie=true;
event.redo();
}
"step 6"
"step 5"
if(!event.triggeredTargets2) event.triggeredTargets2=[];
var target=event.getTriggerTarget(targets,event.triggeredTargets2);
if(target){
@ -13396,7 +13375,7 @@
if(event.forceDie) next.forceDie=true;
event.redo();
}
"step 7"
"step 6"
if(!event.triggeredTargets3) event.triggeredTargets3=[];
var target=event.getTriggerTarget(targets,event.triggeredTargets3);
if(target){
@ -13411,7 +13390,7 @@
if(event.forceDie) next.forceDie=true;
event.redo();
}
"step 8"
"step 7"
if(!event.triggeredTargets4) event.triggeredTargets4=[];
var target=event.getTriggerTarget(targets,event.triggeredTargets4);
if(target){
@ -13426,6 +13405,28 @@
if(event.forceDie) next.forceDie=true;
event.redo();
}
"step 8"
var info=get.info(card);
if(info.contentBefore){
var next=game.createEvent(card.name+'ContentBefore');
next.setContent(info.contentBefore);
next.targets=targets;
next.card=card;
next.cards=cards;
next.player=player;
next.type='precard';
if(event.forceDie) next.forceDie=true;
}
else if(info.reverseOrder&&get.is.versus()&&targets.length>1){
var next=game.createEvent(card.name+'ContentBefore');
next.setContent('reverseOrder');
next.targets=targets;
next.card=card;
next.cards=cards;
next.player=player;
next.type='precard';
if(event.forceDie) next.forceDie=true;
}
"step 9"
if(num==0&&targets.length>1){
event.sortTarget(true);
@ -13889,7 +13890,8 @@
game.log(player,'打出了',card);
}
for(var i=0;i<cards.length;i++){
player.lose(cards[i]);
if(get.owner(cards[i])==player) player.lose(cards[i]);
else cards[i].discard();
if(event.animate!=false) player.$throw(cards[i]);
if(event.highlight){
cards[i].clone.classList.add('thrownhighlight');
@ -14874,6 +14876,7 @@
"step 1"
event.result={
card:player.judging[0],
name:player.judging[0].name,
number:get.number(player.judging[0]),
suit:get.suit(player.judging[0]),
color:get.color(player.judging[0]),
@ -17524,6 +17527,9 @@
if(arguments[i]=='noai'){
next.noai=true;
}
else if(arguments[i]=='nowuxie'){
next.nowuxie=true;
}
else{
next.skill=arguments[i];
}

View File

@ -1,24 +1,24 @@
window.noname_update={
version:'1.9.94.2',
update:'1.9.94.1.2',
version:'1.9.94.3',
update:'1.9.94.2',
changeLog:[
'BUG修复',
],
files:[
//'card/extra.js',
'card/extra.js',
//'card/sp.js',
//'card/standard.js',
'card/standard.js',
//'card/swd.js',
//'card/guozhan.js',
'character/diy.js',
//'character/diy.js',
'character/extra.js',
//'character/mobile.js',
//'character/old.js',
//'character/refresh.js',
'character/refresh.js',
'character/shenhua.js',
'character/sp.js',
//'character/tw.js',
//'character/standard.js',
'character/standard.js',
'character/xinghuoliaoyuan.js',
'character/yijiang.js',
//'mode/doudizhu.js',