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

v1.9.96.4

This commit is contained in:
Spmario233 2019-12-16 12:57:35 +08:00 committed by GitHub
parent 75184980b2
commit 4fda1d2874
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 87 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
game/game.js
View File

@ -6460,7 +6460,7 @@
Array.prototype.filterInD=function(){ Array.prototype.filterInD=function(){
var list=[]; var list=[];
for(var i=0;i<this.length;i++){ for(var i=0;i<this.length;i++){
if(get.position(this[i])=='d') list.push(this[i]); if(get.position(this[i],true)=='o') list.push(this[i]);
} }
return list; return list;
}; };
@ -9835,6 +9835,28 @@
cards[i].discard(); cards[i].discard();
} }
}, },
orderingDiscard:function(){
var cards=event.relatedEvent.orderingCards;
for(var i=0;i<cards.length;i++){
if(get.position(cards[i],true)!='o') cards.splice(i--,1);
}
if(cards.length) game.cardsDiscard(cards);
},
cardsGotoOrdering:function(){
for(var i=0;i<cards.length;i++){
cards[i].goto(ui.ordering);
}
if(!event.noOrdering){
var evt=event.getParent();
if(!evt.orderingCards){
evt.orderingCards=[];
var next=game.createEvent('orderingDiscard',false,evt.getParent());
next.relatedEvent=evt;
next.setContent('orderingDiscard');
}
evt.orderingCards.addArray(cards);
}
},
cardsGotoSpecial:function(){ cardsGotoSpecial:function(){
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
cards[i].goto(ui.special); cards[i].goto(ui.special);
@ -10701,6 +10723,7 @@
ui.cardPile.innerHTML=''; ui.cardPile.innerHTML='';
ui.discardPile.innerHTML=''; ui.discardPile.innerHTML='';
ui.special.innerHTML=''; ui.special.innerHTML='';
ui.ordering.innerHTML='';
} }
ui.system.firstChild.innerHTML=''; ui.system.firstChild.innerHTML='';
ui.system.lastChild.innerHTML=''; ui.system.lastChild.innerHTML='';
@ -11539,13 +11562,13 @@
player.logSkill(result[0].skill); player.logSkill(result[0].skill);
result[0].cards=lib.skill[result[0].skill].onCompare(player) result[0].cards=lib.skill[result[0].skill].onCompare(player)
}; };
player.lose(result[0].cards,ui.special); player.lose(result[0].cards,ui.ordering);
for(var i=1;i<result.length;i++){ for(var i=1;i<result.length;i++){
if(result[i].skill&&lib.skill[result[i].skill]&&lib.skill[result[i].skill].onCompare){ if(result[i].skill&&lib.skill[result[i].skill]&&lib.skill[result[i].skill].onCompare){
event.list[i].logSkill(result[i].skill); event.list[i].logSkill(result[i].skill);
result[i].cards=lib.skill[result[i].skill].onCompare(event.list[i]); result[i].cards=lib.skill[result[i].skill].onCompare(event.list[i]);
} }
event.list[i].lose(result[i].cards,ui.special); event.list[i].lose(result[i].cards,ui.ordering);
cards.push(result[i].cards[0]); cards.push(result[i].cards[0]);
} }
event.cardlist=cards; event.cardlist=cards;
@ -11625,11 +11648,6 @@
event.goto(3); event.goto(3);
"step 7" "step 7"
event.cards.add(event.card1); 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"
@ -11722,8 +11740,8 @@
event.addToAI=true; event.addToAI=true;
} }
} }
player.lose(event.card1,ui.special); player.lose(event.card1,ui.ordering);
target.lose(event.card2,ui.special); target.lose(event.card2,ui.ordering);
"step 5" "step 5"
game.broadcast(function(){ game.broadcast(function(){
ui.arena.classList.add('thrownhighlight'); ui.arena.classList.add('thrownhighlight');
@ -11794,11 +11812,6 @@
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'
@ -13191,14 +13204,14 @@
return; return;
} }
if(!get.info(card,false).noForceDie) event.forceDie=true; if(!get.info(card,false).noForceDie) event.forceDie=true;
var next=player.lose(cards,'visible').set('type','use'); var next=player.lose(cards,'visible',ui.ordering).set('type','use');
var directDiscard=[]; var directDiscard=[];
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(!next.cards.contains(cards[i])){ if(!next.cards.contains(cards[i])){
directDiscard.push(cards[i]); directDiscard.push(cards[i]);
} }
} }
if(directDiscard.length) game.cardsDiscard(directDiscard); if(directDiscard.length) game.cardsGotoOrdering(directDiscard);
player.using=cards; player.using=cards;
var cardaudio=true; var cardaudio=true;
if(event.skill){ if(event.skill){
@ -13929,6 +13942,7 @@
} }
}, },
respond:function(){ respond:function(){
'step 0'
var cardaudio=true; var cardaudio=true;
if(event.skill){ if(event.skill){
if(lib.skill[event.skill].audio){ if(lib.skill[event.skill].audio){
@ -13968,9 +13982,14 @@
else{ else{
game.log(player,'打出了',card); game.log(player,'打出了',card);
} }
var cards2=cards.slice(0);
if(cards2.length){
var next=player.lose(cards2,ui.ordering,'visible');
if(event.noOrdering) next.noOrdering=true;
cards2.removeArray(next.cards);
if(cards2.length) game.cardsGotoOrdering(cards);
}
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(get.owner(cards[i])==player) player.lose(cards[i],'visible');
else cards[i].discard();
if(event.animate!=false) player.$throw(cards[i]); if(event.animate!=false) player.$throw(cards[i]);
if(event.highlight){ if(event.highlight){
cards[i].clone.classList.add('thrownhighlight'); cards[i].clone.classList.add('thrownhighlight');
@ -13990,6 +14009,7 @@
},cards); },cards);
} }
event.trigger('respond'); event.trigger('respond');
'step 1'
game.delayx(0.5); game.delayx(0.5);
}, },
swapHandcards:function(){ swapHandcards:function(){
@ -14287,6 +14307,16 @@
player.update(); player.update();
game.addVideo('loseAfter',player); game.addVideo('loseAfter',player);
event.num=0; event.num=0;
if(event.position==ui.ordering&&!event.noOrdering){
var evt=event.getParent();
if(!evt.orderingCards){
evt.orderingCards=[];
var next=game.createEvent('orderingDiscard',false,evt.getParent());
next.relatedEvent=evt;
next.setContent('orderingDiscard');
}
evt.orderingCards.addArray(cards);
}
"step 1" "step 1"
if(num<cards.length){ if(num<cards.length){
if(cards[num].original=='e'){ if(cards[num].original=='e'){
@ -14940,7 +14970,10 @@
"step 0" "step 0"
var judgestr=get.translation(player)+'的'+event.judgestr+'判定'; var judgestr=get.translation(player)+'的'+event.judgestr+'判定';
event.videoId=lib.status.videoId++; event.videoId=lib.status.videoId++;
player.judging.unshift(event.directresult||get.cards()[0]); var cardj=event.directresult||get.cards()[0];
var nextj=game.cardsGotoOrdering(cardj);
if(event.position!=ui.discardPile) nextj.noOrdering=true;
player.judging.unshift(cardj);
game.addVideo('judge1',player,[get.cardInfo(player.judging[0]),judgestr,event.videoId]); game.addVideo('judge1',player,[get.cardInfo(player.judging[0]),judgestr,event.videoId]);
game.broadcastAll(function(player,card,str,id,cardid){ game.broadcastAll(function(player,card,str,id,cardid){
var event; var event;
@ -15017,8 +15050,7 @@
} }
else{ else{
if(!get.owner(event.result.card)){ if(!get.owner(event.result.card)){
if(event.position==ui.discardPile) game.cardsDiscard(event.result.card); if(event.position!=ui.discardPile) event.position.appendChild(event.result.card);
else event.position.appendChild(event.result.card);
} }
} }
}, },
@ -17912,6 +17944,7 @@
} }
else if(typeof arguments[i]=='boolean') next.animate=arguments[i]; else if(typeof arguments[i]=='boolean') next.animate=arguments[i];
else if(arguments[i]=='highlight') next.highlight=true; else if(arguments[i]=='highlight') next.highlight=true;
else if(arguments[i]=='noOrdering') next.noOrdering=true;
else if(typeof arguments[i]=='string') next.skill=arguments[i]; else if(typeof arguments[i]=='string') next.skill=arguments[i];
} }
if(next.cards==undefined){ if(next.cards==undefined){
@ -25275,12 +25308,20 @@
var game={ var game={
cardsDiscard:function(cards){ cardsDiscard:function(cards){
var type=get.itemtype(cards); var type=get.itemtype(cards);
if(type!='cards'&&type!='card') return {}; if(type!='cards'&&type!='card') return;
var next=game.createEvent('cardsDiscard'); var next=game.createEvent('cardsDiscard');
next.cards=type=='cards'?cards:[cards]; next.cards=type=='cards'?cards:[cards];
next.setContent('cardsDiscard'); next.setContent('cardsDiscard');
return next; return next;
}, },
cardsGotoOrdering:function(cards){
var type=get.itemtype(cards);
if(type!='cards'&&type!='card') return;
var next=game.createEvent('cardsGotoOrdering');
next.cards=type=='cards'?cards:[cards];
next.setContent('cardsGotoOrdering');
return next;
},
cardsGotoSpecial:function(cards,bool){ cardsGotoSpecial:function(cards,bool){
var type=get.itemtype(cards); var type=get.itemtype(cards);
if(type!='cards'&&type!='card') return; if(type!='cards'&&type!='card') return;
@ -31272,7 +31313,7 @@
else{ else{
if(card.ai.basic.equipValue==undefined) card.ai.basic.equipValue=1; if(card.ai.basic.equipValue==undefined) card.ai.basic.equipValue=1;
} }
if(card.ai.basic.value==undefined) card.ai.basic.value=function(card,player){ if(card.ai.basic.value==undefined) card.ai.basic.value=function(card,player,index,method){
var value=0; var value=0;
var info=get.info(card); var info=get.info(card);
var current=player.getEquip(info.subtype); var current=player.getEquip(info.subtype);
@ -31283,8 +31324,12 @@
if(equipValue==undefined){ if(equipValue==undefined){
equipValue=info.ai.basic.equipValue; equipValue=info.ai.basic.equipValue;
} }
if(typeof equipValue=='function') return equipValue(card,player)-value; if(typeof equipValue=='function'){
if(method=='raw') return equipValue(card,player);
return equipValue(card,player)-value;
}
if(typeof equipValue!='number') equipValue=0; if(typeof equipValue!='number') equipValue=0;
if(method=='raw') return equipValue;
return equipValue-value; return equipValue-value;
} }
card.ai.result.target=(function(name){ card.ai.result.target=(function(name){
@ -31354,6 +31399,7 @@
ui.cardPile.innerHTML=''; ui.cardPile.innerHTML='';
ui.discardPile.innerHTML=''; ui.discardPile.innerHTML='';
ui.special.innerHTML=''; ui.special.innerHTML='';
ui.ordering.innerHTML='';
ui.playerids.remove(); ui.playerids.remove();
game.players.length=0; game.players.length=0;
game.dead.length=0; game.dead.length=0;
@ -41024,6 +41070,7 @@
ui.cardPile=ui.create.div('#cardPile'); ui.cardPile=ui.create.div('#cardPile');
ui.discardPile=ui.create.div('#discardPile'); ui.discardPile=ui.create.div('#discardPile');
ui.special=ui.create.div('#special'); ui.special=ui.create.div('#special');
ui.ordering=ui.create.div('#ordering');
ui.dialogs=[]; ui.dialogs=[];
ui.controls=[]; ui.controls=[];
ui.style={}; ui.style={};
@ -47500,7 +47547,7 @@
} }
return players; return players;
}, },
position:function(card){ position:function(card,ordering){
if(get.itemtype(card)=='player') return parseInt(card.dataset.position); if(get.itemtype(card)=='player') return parseInt(card.dataset.position);
if(card.timeout&&card.destiny){ if(card.timeout&&card.destiny){
if(card.destiny.classList.contains('equips')) return 'e'; if(card.destiny.classList.contains('equips')) return 'e';
@ -47509,6 +47556,7 @@
if(card.destiny.id=='cardPile') return 'c'; if(card.destiny.id=='cardPile') return 'c';
if(card.destiny.id=='discardPile') return 'd'; if(card.destiny.id=='discardPile') return 'd';
if(card.destiny.id=='special') return 's'; if(card.destiny.id=='special') return 's';
if(card.destiny.id=='ordering') return ordering?'o':'d';
return null; return null;
} }
if(!card.parentNode) return; if(!card.parentNode) return;
@ -47518,6 +47566,7 @@
if(card.parentNode.id=='cardPile') return 'c'; if(card.parentNode.id=='cardPile') return 'c';
if(card.parentNode.id=='discardPile') return 'd'; if(card.parentNode.id=='discardPile') return 'd';
if(card.parentNode.id=='special') return 's'; if(card.parentNode.id=='special') return 's';
if(card.parentNode.id=='ordering') return ordering?'o':'d';
return null; return null;
}, },
skillTranslation:function(str,player){ skillTranslation:function(str,player){
@ -49280,7 +49329,7 @@
return cards.length; return cards.length;
}; };
if(typeof value=='function'){ if(typeof value=='function'){
return value(card,player,geti()); return value(card,player,geti(),method);
} }
if(typeof value=='number') return value; if(typeof value=='number') return value;
if(Array.isArray(value)){ if(Array.isArray(value)){

23
game/update.js
View File

@ -1,36 +1,35 @@
window.noname_update={ window.noname_update={
version:'1.9.96.3', version:'1.9.96.4',
update:'1.9.96.2.1', update:'1.9.96.3',
changeLog:[ changeLog:[
'辛毗解禁', '处理区',
'修复BUG', '修复BUG',
], ],
files:[ files:[
//'card/extra.js', //'card/extra.js',
//'card/huanlekapai.js', //'card/huanlekapai.js',
//'card/sp.js', //'card/sp.js',
'card/standard.js', //'card/standard.js',
//'card/swd.js', //'card/swd.js',
'card/yunchou.js',
//'card/guozhan.js', //'card/guozhan.js',
//'card/gwent.js', //'card/gwent.js',
'character/diy.js', //'character/diy.js',
//'character/extra.js', 'character/extra.js',
//'character/hearth.js', //'character/hearth.js',
//'character/gujian.js', //'character/gujian.js',
//'character/gwent.js', //'character/gwent.js',
//'character/mobile.js', 'character/mobile.js',
//'character/mtg.js', //'character/mtg.js',
//'character/old.js', //'character/old.js',
'character/refresh.js', 'character/refresh.js',
'character/shenhua.js', 'character/shenhua.js',
'character/sp.js', 'character/sp.js',
//'character/tw.js', //'character/tw.js',
//'character/standard.js', 'character/standard.js',
//'character/swd.js', //'character/swd.js',
//'character/xianjian.js', //'character/xianjian.js',
'character/xinghuoliaoyuan.js', 'character/xinghuoliaoyuan.js',
//'character/yijiang.js', 'character/yijiang.js',
//'character/yxs.js', //'character/yxs.js',
//'extension/boss/extension.js', //'extension/boss/extension.js',
//'mode/identity.js', //'mode/identity.js',
@ -39,9 +38,9 @@ window.noname_update={
//'mode/single.js', //'mode/single.js',
//'mode/stone.js', //'mode/stone.js',
//'mode/versus.js', //'mode/versus.js',
//'mode/boss.js', 'mode/boss.js',
'game/game.js', 'game/game.js',
'game/config.js', //'game/config.js',
//'game/package.js', //'game/package.js',
//'game/asset.js', //'game/asset.js',
//'game/source.js', //'game/source.js',