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

v1.9.87.1

This commit is contained in:
Spmario233 2019-06-14 21:59:07 +08:00 committed by GitHub
parent 1ec748a61e
commit 20bec06c47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 149 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
audio/skill/drlt_congjian1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_congjian2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_duorui1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_duorui2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_hongju1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_hongju2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_huairou1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_huairou2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_jieying1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_jieying2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_jueyan1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_jueyan2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_poshi1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_poshi2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_poxi1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_poxi2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_qianjie1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_qianjie2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_qingce1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_qingce2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_wanglie1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_wanglie2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_xiongluan1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_xiongluan2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_zhenggu1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_zhenggu2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_zhenrong1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_zhenrong2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_zhiti1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/drlt_zhiti2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/kongsheng1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/kongsheng2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/liangyin1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/liangyin2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_dianhu1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_dianhu2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_jianji1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_jianji2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_lianpian1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_lianpian2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_xingzhao.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_xingzhao2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_zuilun1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xinfu_zuilun2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xz_xunxun1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/xz_xunxun2.mp3 Normal file
View File

Binary file not shown.

3
card/sp.js
View File

@ -242,7 +242,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
},
onLose:function(){
player.unmarkSkill('muniu_skill6');
if(event.parent.type!='equip'&&card&&card.cards&&card.cards.length){
if((event.getParent(2)&&event.getParent(2).name!='swapEquip')&&event.parent.type!='equip'&&card&&card.cards&&card.cards.length){
player.$throw(card.cards,1000);
player.popup('muniu');
game.log(card,'掉落了',card.cards);
@ -678,6 +678,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
game.broadcast(function(muniu,cards){
muniu.cards=cards;
},muniu,muniu.cards);
event.trigger("addCardToStorage");
var players=game.filterPlayer(function(current){
if(!current.getEquip(5)&&current!=player&&!current.isTurnedOver()&&
get.attitude(player,current)>=3&&get.attitude(current,player)>=3){

12
character/extra.js
View File

@ -2073,7 +2073,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:["drlt_zhiti_1","drlt_zhiti_2","drlt_zhiti_3","drlt_zhiti_4","drlt_zhiti_5"],
subSkill:{
'1':{
audio:2,
audio:"drlt_zhiti",
trigger:{
global:'juedouAfter'
},
@ -2099,7 +2099,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
'2':{
audio:2,
audio:"drlt_zhiti",
trigger:{
player:'juedouAfter',
},
@ -2125,7 +2125,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
'3':{
audio:2,
audio:"drlt_zhiti",
trigger:{
player:'chooseToCompareAfter'
},
@ -2151,7 +2151,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
'4':{
audio:2,
audio:"drlt_zhiti",
trigger:{
global:'chooseToCompareAfter'
},
@ -2177,7 +2177,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
'5':{
audio:2,
audio:"drlt_zhiti",
trigger:{
player:['damageEnd']
},
@ -2402,7 +2402,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
translate:{
"shen_luxun":"神陆逊",
"nzry_junlve":"军略",
"nzry_junlve_info":"锁定技，当你受到或造成伤害后，你获得一个“军略”标记",
"nzry_junlve_info":"锁定技，当你受到或造成伤害后，你获得X个“军略”标记(X为伤害点数)",
"nzry_cuike":"摧克",
"nzry_cuike_info":"出牌阶段开始时，若“军略”标记的数量为奇数，你可以对一名角色造成一点伤害;若“军略”标记的数量为偶数，你可以横置一名角色并弃置其区域内的一张牌。若“军略”标记的数量超过7个，你可以移去全部“军略”标记并对所有其他角色造成一点伤害",
"nzry_dinghuo":"绽火",

6
character/old.js
View File

@ -39,6 +39,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
skill:{
old_zuilun:{
audio:'xinfu_zuilun',
subSkill:{
e:{},
h:{},
@ -81,6 +82,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
"old_jijun":{
marktext:"方",
audio:"xinfu_jijun",
intro:{
content:"cards",
},
@ -104,11 +106,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.storage.old_jijun.addArray(cards);
player.markSkill('old_jijun');
},
ai:{order:1,result:{player:1}},
},
"old_fangtong":{
trigger:{
player:"phaseEnd",
},
audio:"xinfu_fangtong",
forced:true,
skillAnimation:true,
filter:function (event,player){
@ -575,7 +579,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
old_machao:'旧马超',
old_bulianshi:'旧步练师',
old_zhugezhan:"旧诸葛瞻",
zhangliang:'张梁',
zhangliang:'旧张梁',
"old_jijun":"集军",
"old_jijun_info":"出牌阶段，你可以将任意张手牌置于你的武将牌上。（均称为“方”）",

8
character/refresh.js
View File

@ -2357,8 +2357,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
forced:true,
audio:2,
content:function(){
player.draw(3);
var num=trigger.num;
player.draw(3*num);
if(_status.currentPhase==player){
if(!player.storage.zhaxiang2) player.storage.zhaxiang2=0;
player.storage.zhaxiang2+=num;
player.addTempSkill('zhaxiang2',{player:'phaseAfter'});
}
else{
@ -2375,9 +2378,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(card.name=='sha'&&get.color(card)=='red') return true;
},
cardUsable:function(card,player,num){
if(card.name=='sha') return num+1;
if(card.name=='sha') return num+player.storage.zhaxiang2;
}
},
onremove:true,
trigger:{player:'shaBegin'},
forced:true,
filter:function(event,player){

56
character/shenhua.js
View File

@ -214,14 +214,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
unique:true,
derivation:['drlt_qingce'],
init:function(player){
player.storage.zbaijiang=false;
player.storage.drlt_hongju=false;
},
filter:function(event,player){
return !player.storage.zbaijiang&&player.storage.drlt_zhenrong&&player.storage.drlt_zhenrong.length>=3&&game.dead.length>0;
return !player.storage.drlt_hongju&&player.storage.drlt_zhenrong&&player.storage.drlt_zhenrong.length>=3&&game.dead.length>0;
},
content:function(){
'step 0'
player.storage.zbaijiang=true;
player.awakenSkill('drlt_hongju'),
player.storage.drlt_hongju=true;
var num=player.storage.drlt_zhenrong.length;
if(num>player.countCards('h')) num=player.countCards('h');
player.chooseCard('h',[1,num],'请选择需要替换“荣”的手牌').set('ai',function(card){
@ -673,19 +674,28 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
'step 0'
event.cards=trigger.cards;
event.logged=false;
event.gived=[];
'step 1'
player.chooseTarget('是否将 '+get.translation(event.cards[0])+' 给予其他群雄角色？',function(card,player,target){
return target!=player&&target.group=='qun';
if(!game.hasPlayer(function(target){
return target!=player&&target.group=='qun'&&!event.gived.contains(target);
})) event.finish();
else player.chooseTarget('是否将 '+get.translation(event.cards[0])+' 给予其他群雄角色？',function(card,player,target){
return target!=player&&target.group=='qun'&&!event.gived.contains(target);
}).ai=function(target){
if(event.cards[0].name=='du') return -get.attitude(player,target);
return get.attitude(player,target);
};
'step 2'
if(result.bool){
player.logSkill('drlt_weidi',result.targets);
if(!event.logged){
player.logSkill('drlt_weidi');
event.logged=true;
}
player.line(result.targets);
player.$give(event.cards[0],result.targets[0]);
result.targets[0].gain(event.cards[0],player);
event.gived.add(result.targets[0]);
};
event.cards.remove(event.cards[0]);
if(event.cards.length>0) event.goto(1);
@ -1361,10 +1371,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var targets=result.targets;
if(event.control==event.str1){
player.line(targets);
player.logSkill('nzry_kuizhu');
for(var i=0;i<targets.length;i++){
targets[i].draw();
};
player.logSkill('nzry_kuizhu',targets);
game.asyncDraw(targets);
}else{
var num=0;
for(var i=0;i<targets.length;i++){
@ -1585,21 +1593,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"2":{
audio:2,
trigger:{
player:['useCardAfter','respondAfter'],
player:['useCard','respond'],
},
filter:function (event,player){
return (event.name=='respond'&&event.card.name!='sha'||event.name=='useCard')&&event.cards.length>0&&player.storage.nzry_shicai!=undefined&&!player.storage.nzry_shicai.contains(get.type(event.card));
return (event.name=='respond'&&event.card.name!='sha'||event.name=='useCard')&&event.cards.length>0&&player.storage.nzry_shicai!=undefined&&!player.storage.nzry_shicai.contains(get.type(event.card,'trick'));
},
check:function (event,player){
return get.type(event.card)!='equip'&&event.card.name!='lebu'&&event.card.name!='bingliang';
},
content:function(){
player.storage.nzry_shicai.push(get.type(trigger.card));
player.storage.nzry_shicai.push(get.type(trigger.card,'trick'));
if(trigger.name=='useCard'&&['equip','delay'].contains(get.type(trigger.card))) trigger.cancel();
for(var i=0;i<trigger.cards.length;i++){
ui.cardPile.insertBefore(trigger.cards[i],ui.cardPile.firstChild);
if(ui.cardPileNumber) ui.cardPileNumber.innerHTML=game.roundNumber+'轮 剩余牌: '+ui.cardPile.childNodes.length;
game.log(player,'将',trigger.cards[i],'置于牌堆顶');
player.lose(trigger.cards[i],ui.special);
if(get.position(trigger.cards[i])=='d'){
ui.cardPile.insertBefore(trigger.cards[i],ui.cardPile.firstChild);
if(ui.cardPileNumber) ui.cardPileNumber.innerHTML=game.roundNumber+'轮 剩余牌: '+ui.cardPile.childNodes.length;
game.log(player,'将',trigger.cards[i],'置于牌堆顶');
}
};
player.draw();
},
@ -2999,10 +3009,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
jiang:{
audio:2,
trigger:{player:['shaBefore','juedouBefore'],target:['shaBefore','juedouBefore']},
trigger:{global:['useCard']},
filter:function(event,player){
if(event.card.name=='juedou') return true;
return get.color(event.card)=='red';
if(!(event.card.name=='juedou'||(event.card.name=='sha'&&get.color(event.card)=='red'))) return false;
return player==event.player||event.targets.contains(player);
},
frequent:true,
content:function(){
@ -6308,7 +6318,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"nzry_chenglve":"成略",
"nzry_chenglve_info":"转换技，出牌阶段限一次，①你可以摸一张牌，然后弃置两张手牌。②你可以摸两张牌，然后弃置一张手牌。若如此做，直到本回合结束，你使用与弃置牌花色相同的牌无距离和次数限制",
"nzry_shicai":"恃才",
"nzry_shicai_info":"当你使用一张牌结算后，若此牌与你本回合使用的牌类型均不同（包括装备牌），你可以将此牌置于牌堆顶，然后摸一张牌",
"nzry_shicai_info":"当你使用牌指定目标时，若此牌与你本回合使用的牌类型均不同（包括装备牌），则你可以将此牌置于牌堆顶，然后摸一张牌",
"nzry_cunmu":"寸目",
"nzry_cunmu_info":"锁定技，当你摸牌时，改为从牌堆底摸牌",
"nzry_kuizhu":"溃诛",
@ -6355,7 +6365,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"drlt_yongsi":"庸肆",
"drlt_yongsi_info":"锁定技，摸牌阶段，你改为摸X张牌（X为存活势力数）；弃牌阶段，若你本回合：1.没有造成伤害，将手牌摸至当前体力值；2.造成的伤害超过1点，本回合手牌上限改为已损失体力值",
"drlt_weidi":"伪帝",
"drlt_weidi_info":"主公技，你于弃牌阶段弃置的牌可以以任意方式交给其他群雄角色",
"drlt_weidi_info":"主公技，你于弃牌阶段弃置的牌可以交给其他群雄角色各一张。",
"drlt_qianjie":"谦节",
"drlt_qianjie_info":"锁定技，你不能被横置，且不能成为延时类锦囊的目标。你不能成为其他角色拼点的目标。",
"drlt_jueyan":"决堰",
@ -6371,7 +6381,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"drlt_hongju":"鸿举",
"drlt_hongju_info":"觉醒技，准备阶段，若“荣”的数量大于或等于3且场上有角色死亡，则你可以用任意张手牌替换等量的“荣”，然后扣减一点体力上限并获得技能“清侧”",
"drlt_qingce":"清侧",
"drlt_qingce_info":"出牌阶段，你可以移去一张“荣”，然后弃置场上的一张牌",
"drlt_qingce_info":"出牌阶段，你可以移去一张“荣”，然后弃置一名角色区域内的一张牌",
jianchu:'鞬出',
jianchu_info:'当你使用【杀】指定一名角色为目标后，你可以弃置其一张牌，若以此法弃置的牌为装备牌，此【杀】不可被【闪】响应，若不为装备牌，该角色获得此【杀】',

2
character/sp.js
View File

@ -52,7 +52,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhugedan:['male','wei',4,['gongao','juyi']],
sp_jiangwei:['male','wei',4,['kunfen','fengliang']],
sp_machao:['male','qun',4,['zhuiji','ol_shichou']],
sunhao:['male','wu',5,['canshi','chouhai','guiming']],
sunhao:['male','wu',5,['canshi','chouhai','guiming'],['zhu']],
shixie:['male','qun',3,['biluan','lixia']],
mayunlu:['female','shu',4,['fengpo','mashu']],
zhanglu:['male','qun',3,['yishe','bushi','midao']],

4
character/xinghuoliaoyuan.js
View File

@ -892,7 +892,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
"xinfu_xingzhao":{
inherit:"xingzhao2",
audio:true,
group:["xz_xunxun","xinfu_xingzhao2"],
mark:true,
intro:{
@ -929,6 +929,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
"xinfu_xingzhao2":{
audio:true,
trigger:{
player:"phaseDiscardBefore",
},
@ -945,6 +946,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
"xinfu_dianhu":{
audio:2,
trigger:{
global:"gameDrawAfter",
},

20
character/yijiang.js
View File

@ -7511,7 +7511,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
zhenlie:{
audio:2,
filter:function(event,player){
return event.player!=player&&event.card&&(event.card.name=='sha'||get.type(event.card)=='trick');
return event.player!=player&&event.targets&&event.targets.contains(player)&&event.card&&(event.card.name=='sha'||get.type(event.card)=='trick');
},
logTarget:'player',
check:function(event,player){
@ -7537,12 +7537,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false;
},
priority:10,
trigger:{target:'useCardToBefore'},
trigger:{global:'useCard'},
content:function(){
"step 0"
player.loseHp();
"step 1"
trigger.cancel();
trigger.targets.remove(player);
"step 2"
if(trigger.player.countCards('he')){
player.discardPlayerCard(trigger.player,'he',true);
@ -8540,19 +8540,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
multitarget:true,
content:function(){
"step 0"
event.cards=[targets[0].getCards('e'),targets[1].getCards('e')];
targets[0].lose(event.cards[0],ui.special);
targets[1].lose(event.cards[1],ui.special);
if(event.cards[0].length) targets[0].$give(event.cards[0],targets[1]);
if(event.cards[1].length) targets[1].$give(event.cards[1],targets[0]);
"step 1"
for(var i=0;i<event.cards[1].length;i++){
targets[0].equip(event.cards[1][i]);
}
for(var i=0;i<event.cards[0].length;i++){
targets[1].equip(event.cards[0][i]);
}
targets[0].swapEquip(targets[1]);
},
ai:{
order:10,

50
game/asset.js
View File

@ -1,5 +1,5 @@
window.noname_asset_list=[
'1.9.87',
'1.9.87.1',
'audio/background/music_danji.mp3',
'audio/background/music_default.mp3',
'audio/background/music_diaochan.mp3',
@ -1747,6 +1747,53 @@ window.noname_asset_list=[
'image/card/zixin.png',
'image/card/ziyangdan.png',
'image/card/zong.png',
'audio/skill/drlt_congjian1.mp3',
'audio/skill/drlt_congjian2.mp3',
'audio/skill/drlt_duorui1.mp3',
'audio/skill/drlt_duorui2.mp3',
'audio/skill/drlt_hongju1.mp3',
'audio/skill/drlt_hongju2.mp3',
'audio/skill/drlt_huairou1.mp3',
'audio/skill/drlt_huairou2.mp3',
'audio/skill/drlt_jieying1.mp3',
'audio/skill/drlt_jieying2.mp3',
'audio/skill/drlt_jueyan1.mp3',
'audio/skill/drlt_jueyan2.mp3',
'audio/skill/drlt_poshi1.mp3',
'audio/skill/drlt_poshi2.mp3',
'audio/skill/drlt_poxi1.mp3',
'audio/skill/drlt_poxi2.mp3',
'audio/skill/drlt_qianjie1.mp3',
'audio/skill/drlt_qianjie2.mp3',
'audio/skill/drlt_qingce1.mp3',
'audio/skill/drlt_qingce2.mp3',
'audio/skill/drlt_wanglie1.mp3',
'audio/skill/drlt_wanglie2.mp3',
'audio/skill/drlt_xiongluan1.mp3',
'audio/skill/drlt_xiongluan2.mp3',
'audio/skill/drlt_zhenggu1.mp3',
'audio/skill/drlt_zhenggu2.mp3',
'audio/skill/drlt_zhenrong1.mp3',
'audio/skill/drlt_zhenrong2.mp3',
'audio/skill/drlt_zhiti1.mp3',
'audio/skill/drlt_zhiti2.mp3',
'audio/skill/kongsheng1.mp3',
'audio/skill/kongsheng2.mp3',
'audio/skill/liangyin1.mp3',
'audio/skill/liangyin2.mp3',
'audio/skill/xinfu_dianhu1.mp3',
'audio/skill/xinfu_dianhu2.mp3',
'audio/skill/xinfu_jianji1.mp3',
'audio/skill/xinfu_jianji2.mp3',
'audio/skill/xinfu_lianpian1.mp3',
'audio/skill/xinfu_lianpian2.mp3',
'audio/skill/xinfu_xingzhao.mp3',
'audio/skill/xinfu_xingzhao2.mp3',
'audio/skill/xinfu_zuilun1.mp3',
'audio/skill/xinfu_zuilun2.mp3',
'audio/skill/xz_xunxun1.mp3',
'audio/skill/xz_xunxun2.mp3',
'image/character/chendao.jpg',
'image/character/guanqiujian.jpg',
'image/character/haozhao.jpg',
@ -1759,6 +1806,7 @@ window.noname_asset_list=[
'image/character/zhangxiu.jpg',
'image/character/zhoufei.jpg',
'image/character/zhugezhan.jpg',
'image/character/baiwuchang.jpg',
'image/character/baosanniang.jpg',
'image/character/beimihu.jpg',

40
game/game.js
View File

@ -9250,6 +9250,35 @@
},
element:{
content:{
swapEquip:function(){
"step 0"
game.log(player,'和',target,'交换了装备区中的牌')
var e1=player.getCards('e');
var todis1=[];
for(var i=0;i<e1.length;i++){
if(target.isDisabled(get.subtype(e1[i]))) todis1.push(e1[i]);
}
player.discard(todis1);
var e2=target.getCards('e');
var todis2=[];
for(var i=0;i<e2.length;i++){
if(player.isDisabled(get.subtype(e2[i]))) todis1.push(e2[i]);
}
target.discard(todis2);
"step 1"
event.cards=[player.getCards('e'),target.getCards('e')];
player.lose(event.cards[0],ui.special);
target.lose(event.cards[1],ui.special);
if(event.cards[0].length) player.$give(event.cards[0],target);
if(event.cards[1].length) target.$give(event.cards[1],player);
"step 2"
for(var i=0;i<event.cards[1].length;i++){
player.equip(event.cards[1][i]);
}
for(var i=0;i<event.cards[0].length;i++){
target.equip(event.cards[0][i]);
}
},
disableEquip:function(){
event.trigger('disableEquip');
if(!player.isDisabled(event.pos)){
@ -14166,6 +14195,13 @@
},
player:{
//新函数
swapEquip:function(target){
var next=game.createEvent('swapEquip');
next.player=this;
next.target=target;
next.setContent('swapEquip');
return next;
},
canCompare:function(target){
if(this==target) return false;
if(!this.countCards('h')||!target.countCards('h')) return false;
@ -45561,7 +45597,7 @@
}
return suit;
}
else if(get.itemtype(card.cards)=='cards'){
else if(get.itemtype(card.cards)=='cards'&&card.name!='muniu'){
return get.suit(card.cards);
}
else{
@ -45580,7 +45616,7 @@
}
return color;
}
else if(get.itemtype(card.cards)=='cards'){
else if(get.itemtype(card.cards)=='cards'&&card.name!='muniu'){
return get.color(card.cards);
}
else{

6
game/update.js
View File

@ -1,9 +1,7 @@
window.noname_update={
version:'1.9.87',
update:'1.9.86.1',
version:'1.9.87.1',
update:'1.9.87',
changeLog:[
'雷包武将（by 极光）',
'旧张梁，黄巾雷使',
'修复BUG',
],
files:[