v1.9.96.5.1

This commit is contained in:
Spmario233 2019-12-22 15:59:53 +08:00 committed by GitHub
parent 1b9f390e76
commit 1e44c31d4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 193 additions and 125 deletions

Binary file not shown.

Binary file not shown.

BIN
audio/skill/pyzhuren1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/pyzhuren2.mp3 Normal file

Binary file not shown.

View File

@ -2510,6 +2510,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var target=result.targets[0];
player.line(target);
player.logSkill('drlt_jieying',target);
player.removeSkill('drlt_jieying_mark');
target.addSkill('drlt_jieying_mark');
};
},

View File

@ -649,11 +649,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
xinleiji:{
group:'xinleiji_misa',
audio:'releiji',
audio:2,
audioname:['boss_qinglong'],
trigger:{player:['useCard','respond']},
filter:function(event,player){
return event.card.name=='shan'||event.card.name=='shandian';
return event.card.name=='shan'||event.name=='useCard'&&event.card.name=='shandian';
},
judgeCheck:function(card,bool){
var suit=get.suit(card);
@ -701,24 +701,29 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
xinleiji_misa:{
audio:'releiji',
audio:'xinleiji',
trigger:{player:'judgeAfter'},
forced:true,
locked:false,
direct:true,
filter:function(event,player){
return event.judgestr!='暴虐'&&event.judgestr!='助祭'&&['spade','club'].contains(event.result.suit);
},
content:function(){
'step 0'
event.num=1+['club','spade'].indexOf(trigger.result.suit);
if(event.num==1) player.recover();
player.chooseTarget(true,'雷击:对一名角色造成'+event.num+'点雷电伤害。').ai=function(target){
event.logged=false;
if(event.num==1&&player.isDamaged()){
event.logged=true;
player.logSkill('xinleiji');
player.recover();
}
player.chooseTarget('雷击:是否对一名角色造成'+event.num+'点雷电伤害?',lib.filter.notMe).ai=function(target){
var player=_status.event.player;
return get.damageEffect(target,player,player,'thunder');
};
'step 1'
if(result.bool&&result.targets&&result.targets.length){
player.line(result.targets,'thunder');
if(!event.logged) player.logSkill('xinleiji',result.targets);
else player.line(result.targets,'thunder');
result.targets[0].damage(event.num,'thunder');
}
},
@ -1807,7 +1812,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
reguanxing:{
audio:'guanxing',
audioname:['jiangwei'],
audioname:['jiangwei','re_jiangwei'],
trigger:{player:['phaseZhunbeiBegin','phaseJieshuBegin']},
frequent:true,
filter:function(event,player,name){
@ -3864,7 +3869,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
xinleiji:'雷击',
xinguidao:'鬼道',
xinleiji_info:'①当你使用或打出【闪】或【闪电】时,你可以进行判定。<br>②当你不因〖暴虐〗或〖助祭〗而进行的判定的判定牌生效后,若结果为:黑桃,你对一名角色造成2点雷电伤害梅花你回复1点体力并对一名其他角色造成1点雷电伤害。',
xinleiji_info:'①当你使用或打出【闪】或【闪电】时,你可以进行判定。<br>②当你不因〖暴虐〗或〖助祭〗而进行的判定的判定牌生效后,若结果为:黑桃,你对一名其他角色造成2点雷电伤害梅花你回复1点体力并对一名其他其他角色造成1点雷电伤害。',
xinguidao_info:'一名角色的判定牌生效前你可以打出一张黑色牌作为判定牌并获得原判定牌。若你以此法打出的牌为黑桃2-9则你摸一张牌。',
reqiangxi:"强袭",
"reqiangxi_info":"出牌阶段对每名其他角色限一次你可以选择一项1. 失去一点体力并对你攻击范围内的一名其他角色造成一点伤害2. 弃置一张武器牌并对你攻击范围内的一名其他角色造成一点伤害。",

View File

@ -5534,7 +5534,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.canUse({name:'sha'},target,false);
}).set('check',check).set('ai',function(target){
if(!_status.event.check) return 0;
return get.effect(target,{name:'sha'},_status.event.player);
return get.effect(target,{name:'sha'},_status.event.player,_status.event.player);
});
"step 1"
if(result.bool){

View File

@ -689,6 +689,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filter:function(event,player){
return player.countCards('e')>0;
},
check:function(){return 1},
filterCard:true,
filterTarget:function(event,player,target){
return target!=player&&!target.isDisabled(get.subtype(ui.selected.cards[0]));
@ -698,6 +699,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
target.equip(cards[0]);
},
ai:{
order:11,
result:{
target:function(player,target){
if(ui.selected.cards.length){
var card=ui.selected.cards[0];
if(target.getEquip(card)||target.countCards('h',{subtype:get.subtype(card)})) return 0;
return get.effect(target,card,player,target);
}
return 0;
},
},
},
},
pyzhuren:{
audio:2,
@ -705,6 +719,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
usable:1,
filterCard:true,
selectCard:1,
check:function(card){
var player=_status.event.player;
var name='pyzhuren_'+(card[card.name=='shandian'?'name':'suit']);
if(!lib.card[name]||_status.pyzhuren&&_status.pyzhuren[name]){
if(!player.countCards('h','sha')) return 4-get.value(card);
return 0;
}
return 2+card.number/2-get.value(card);
},
content:function(){
if(!_status.pyzhuren) _status.pyzhuren={};
var rand=get.number(cards[0])/13;
@ -723,6 +746,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.gain(game.createCard(name,cards[0].name=='shandian'?'spade':cards[0].suit,1),'gain2')
}
},
ai:{
order:10,
result:{
player:1,
},
},
group:'pyzhuren_destroy',
},
pyzhuren_destroy:{
@ -898,7 +927,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
songshu_reflectionblue:{
//不愧是你 马场老贼
},
sibian:{
audio:2,
@ -1918,7 +1946,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
biaozhao:{
audio:2,
group:["biaozhao2","biaozhao3"],
intro:{
content:"cards",
},
@ -1936,6 +1963,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
'step 1'
if(result.bool){
player.addSkill('biaozhao2');
player.addSkill('biaozhao3');
player.logSkill('biaozhao');
player.lose(result.cards,ui.special,'toStorage');
player.storage.biaozhao=result.cards;
@ -1947,6 +1976,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{
global:["loseEnd","cardsDiscardEnd"],
},
charlotte:true,
forced:true,
audio:"biaozhao",
filter:function (event,player){
if(!player.storage.biaozhao) return false;
@ -1982,6 +2013,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player:"phaseZhunbeiBegin",
},
forced:true,
charlotte:true,
audio:"biaozhao",
filter:function (event,player){
return player.storage.biaozhao!=undefined;
@ -3974,35 +4006,35 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else if(_status.event.shuimeng){
if(cardname=='wuzhong'){
if(player.needsToDiscard(2-ui.selected.cards.length)){
return 10-get.value(card);
return 10-get.value(card,player,'raw');
}
}
else if(cardname=='guohe'){
if(player.needsToDiscard(-1-ui.selected.cards.length)){
return 10-get.value(card);
return 10-get.value(card,player,'raw');
}
}
return 0;
}
else if(cardname=='lebu'){
if(player.needsToDiscard(1-ui.selected.cards.length)){
return 8-get.value(card);
return 8-get.value(card,player,'raw');
}
else{
if(!ui.selected.cards.length){
return 6-get.value(card);
return 6-get.value(card,player,'raw');
}
return 0;
}
}
else if(cardname=='shunshou'){
if(_status.event.nh<=2) return get.value(card);
if(_status.event.nh<=2) return get.value(card,player,'raw');
}
else if(cardname=='huogong'){
if(player.hp==1) return get.value(card);
if(player.hp==1) return get.value(card,player,'raw');
}
if(ui.selected.cards.length) return 0;
return 7-get.value(card);
return 7-get.value(card,player,'raw');
},
ai2:function(target){
var att=get.attitude(_status.event.player,target);
@ -8596,7 +8628,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
target:{
audio:"anxian",
trigger:{target:'shaBefore'},
trigger:{target:'useCardToTargeted'},
direct:true,
filter:function(event,player){
return player.countCards('h');
@ -8617,7 +8649,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
"step 1"
if(result.bool){
trigger.player.draw();
trigger.cancel();
trigger.getParent().excluded.push(player);
}
},
}
@ -12051,6 +12083,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
junbing2:{
audio:'junbing',
forceaudio:true,
trigger:{player:'phaseJieshuBegin'},
filter:function(event,player){
if(player.countCards('h')>1) return false;

View File

@ -584,17 +584,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
group:["qianxin_effect"],
enable:"phaseUse",
usable:1,
filter:function (event,player){
onChooseToUse:function(event){
if(!game.online){
var num1=game.players.length-1;
var player=event.player;
var num2=ui.cardPile.childElementCount;
if(num1>num2) return false;
if(!player.storage.xinfu_qianxin) return true;
var num3=num2;
if(num1>num2) num3=0;
else if(!player.storage.xinfu_qianxin){}
else{
for(var i=0;i<num2;i++){
if(player.storage.xinfu_qianxin.contains(ui.cardPile.childNodes[i])){
return false;
num3=0;break;
}
}
return true;
}
event.set('qianxinNum',num3);
}
},
filter:function (event,player){
return event.qianxinNum&&event.qianxinNum>0;
},
filterTarget:function (card,player,target){
return target!=player;
@ -602,7 +611,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
filterCard:true,
selectCard:function (){
var num1=game.players.length-1;
var num2=ui.cardPile.childElementCount;
var num2=_status.event.qianxinNum;
return [1,Math.floor(num2/num1)];
},
discard:false,
@ -695,8 +704,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'令'+get.translation(event.source)+'将手牌摸至四张',
'令自己本回合的手牌上限-2'
]).set('ai',function(){
var list=[0,1];
return list.randomGet();
var player=_status.event.player;
var source=_status.event.getParent().player;
if(get.attitude(player,source)>0) return 0;
if(player.hp-player.countCards('h')>1) return 1;
return [0,1].randomGet();
})
}
'step 1'
@ -1568,7 +1580,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
enable:"phaseUse",
filter:function (event,player){
if(player.hasSkill('lianhuan')||player.hasSkill('xinlianhuan')) return false;
if(player.getStat().skill.smh_lianhuan+player.getStat().skill.smh_lianhuan1>=3) return false;
if((player.getStat().skill.smh_lianhuan||0)+(player.getStat().skill.smh_lianhuan1||0)>=3) return false;
return player.countCards('h',{suit:'club'})>0;
},
filterCard:function (card){
@ -1670,7 +1682,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
enable:"phaseUse",
filter:function (event,player){
if(player.hasSkill('lianhuan')||player.hasSkill('xinlianhuan')) return false;
if(player.getStat().skill.smh_lianhuan+player.getStat().skill.smh_lianhuan1>=3) return false;
if((player.getStat().skill.smh_lianhuan||0)+(player.getStat().skill.smh_lianhuan1||0)>=3) return false;
return player.countCards('h',{suit:'club'})>0;
},
filterCard:function (card){

View File

@ -4163,7 +4163,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
choice='taoyuan';
}
else{
choice=Math.random()<0.5?'wuzhong':'shunshou';
choice=Math.random()<0.5?'guohe':'shunshou';
}
}
}
@ -7954,7 +7954,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dingpin3:{
trigger:{player:'useCard'},
silent:true,
content:function(){player.storage.dingpin.add(get.type(trigger.card,'trick'))},
content:function(){if(player.storage.dingpin)player.storage.dingpin.add(get.type(trigger.card,'trick'))},
},
dingpin4:{
trigger:{player:'phaseUseBefore'},

View File

@ -1,5 +1,5 @@
window.noname_asset_list=[
'1.9.96.3',
'1.9.96.6',
'audio/background/aozhan_chaoming.mp3',
'audio/background/aozhan_online.mp3',
'audio/background/aozhan_rewrite.mp3',
@ -459,6 +459,10 @@ window.noname_asset_list=[
'audio/skill/xiaoxi_pangde2.mp3',
'audio/skill/xiechan1.mp3',
'audio/skill/xiechan2.mp3',
'audio/skill/pytianjiang1.mp3',
'audio/skill/pytianjiang2.mp3',
'audio/skill/pyzhuren1.mp3',
'audio/skill/pyzhuren2.mp3',
'audio/skill/anguo1.mp3',
'audio/skill/anguo2.mp3',
@ -2329,6 +2333,7 @@ window.noname_asset_list=[
'image/character/zhangwen.jpg',
'image/character/re_zuoci.jpg',
'image/character/xinpi.jpg',
'image/character/puyuan.jpg',
'image/character/baiwuchang.jpg',
'image/character/baosanniang.jpg',
@ -3965,5 +3970,8 @@ window.noname_skin_list={
zhugeliang:5,
zhuran:1,
zhurong:3,
zuoci:4
zuoci:4,
shibing1:6,
shibing2:6,
};

View File

@ -1,6 +1,6 @@
window.noname_update={
version:'1.9.96.5',
update:'1.9.96.4.1',
version:'1.9.96.5.1',
update:'1.9.96.5',
changeLog:[
'修复BUG',
],
@ -13,7 +13,7 @@ window.noname_update={
//'card/guozhan.js',
//'card/gwent.js',
//'character/diy.js',
//'character/extra.js',
'character/extra.js',
//'character/hearth.js',
//'character/gujian.js',
//'character/gwent.js',
@ -24,14 +24,14 @@ window.noname_update={
'character/shenhua.js',
'character/sp.js',
//'character/tw.js',
'character/standard.js',
//'character/standard.js',
//'character/swd.js',
//'character/xianjian.js',
//'character/xinghuoliaoyuan.js',
'character/xinghuoliaoyuan.js',
'character/yijiang.js',
//'character/yxs.js',
//'extension/boss/extension.js',
'layout/default/layout.css',
//'layout/default/layout.css',
//'mode/identity.js',
//'mode/doudizhu.js',
'mode/guozhan.js',

BIN
image/skin/shibing1/1.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
image/skin/shibing1/2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
image/skin/shibing1/3.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
image/skin/shibing1/4.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
image/skin/shibing1/5.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
image/skin/shibing1/6.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
image/skin/shibing2/1.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
image/skin/shibing2/2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
image/skin/shibing2/3.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
image/skin/shibing2/4.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
image/skin/shibing2/5.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
image/skin/shibing2/6.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -1992,7 +1992,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_juhun:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
content:function(){
var list=game.filterPlayer(function(current){
@ -2084,7 +2084,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_shengfu:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
popup:false,
content:function(){
@ -2124,7 +2124,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
subSkill:{planetarian:{}},
},
boss_gongzheng:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
filter:function(event,player){
return player.countCards('j')>0;
@ -2134,7 +2134,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_xuechi:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
content:function(){
var list=game.players.slice(0);
@ -2164,7 +2164,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return target!=player&&!game.hasPlayer(function(current){
return current!=player&&current!=target&&current.hp<target.hp;
})
}).ai=function(target){
}).set('forceDie',true).ai=function(target){
return -get.attitude(_status.event.player,target);
};
'step 1'
@ -2176,7 +2176,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_leizhou:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
content:function(){
var list=game.players.slice(0);
@ -2233,7 +2233,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_kujiu:{
trigger:{global:'phaseBegin'},
trigger:{global:'phaseZhunbeiBegin'},
forced:true,
filter:function(event,player){
return event.player!=player;
@ -2264,7 +2264,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
inherit:'boss_manjia',
},
boss_zhifen:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
content:function(){
'step 0'
@ -2299,7 +2299,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_suozu:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
content:function(){
var list=game.players.slice(0);
@ -2355,7 +2355,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_lunhui:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
filter:function(event,player){
return player.hp<=2&&game.hasPlayer(function(current){
@ -2424,7 +2424,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
fangju:{
trigger:{
player:"damageBegin",
player:"damageBegin4",
},
forced:true,
filter:function (event,player){
@ -2779,8 +2779,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
boss_zhaohuo:{
trigger:{
player:'damageBefore',
source:'damageBegin',
player:'damageBegin4',
source:'damageBegin1',
},
forced:true,
filter:function(event,player){
@ -2978,7 +2978,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
/*----分界线----*/
boss_zirun:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
logTarget:function(){
return game.filterPlayer();
@ -2992,7 +2992,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_juehong:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
logTarget:function(event,player){
return player.getEnemies();
@ -3035,7 +3035,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
subSkill:{
hp:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
mark:true,
intro:{
@ -3106,7 +3106,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:'boss_lingqu_cancel',
subSkill:{
cancel:{
trigger:{player:'damageBegin'},
trigger:{player:'damageBegin4'},
priority:-11,
forced:true,
filter:function(event){
@ -3151,7 +3151,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
thunder:{
trigger:{player:'damageBefore'},
trigger:{player:'damageBegin4'},
filter:function(event){
return event.nature=='thunder'&&game.roundNumber<7;
},
@ -3189,7 +3189,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_jiazu:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
getTargets:function(player){
var targets=[];
@ -3451,7 +3451,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_xiangde:{
trigger:{player:'damageBegin'},
trigger:{player:'damageBegin3'},
forced:true,
filter:function(event,player){
return event.source&&event.source.isIn()&&event.source!=player&&event.source.getEquip(1);
@ -3461,7 +3461,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_yinzei:{
trigger:{player:'damageAfter'},
trigger:{player:'damageEnd'},
forced:true,
logTarget:'source',
filter:function(event,player){
@ -3472,7 +3472,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_zhue:{
trigger:{global:'damageAfter'},
trigger:{global:'damageEnd'},
forced:true,
filter:function(event,player){
return event.source&&event.source.isIn()&&event.source!=player;
@ -3495,7 +3495,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
boss_futai:{
global:'boss_futai2',
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
logTarget:function(event,player){
return game.filterPlayer(function(current){
return current.isDamaged();
@ -3537,7 +3537,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:['boss_luanchang_begin','boss_luanchang_end'],
subSkill:{
begin:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
content:function(){
var list=game.filterPlayer(function(current){
@ -3549,7 +3549,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
end:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
content:function(){
var list=game.filterPlayer(function(current){
@ -3566,7 +3566,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:['boss_nitai_in','boss_nitai_out'],
subSkill:{
in:{
trigger:{player:'damageBefore'},
trigger:{player:'damageBegin4'},
forced:true,
filter:function(event,player){
return _status.currentPhase==player;
@ -3576,7 +3576,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
out:{
trigger:{player:'damageBegin'},
trigger:{player:'damageBegin1'},
forced:true,
filter:function(event,player){
return _status.currentPhase!=player&&event.nature=='fire';
@ -3638,7 +3638,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:'boss_tanyu_hp',
subSkill:{
hp:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
popup:false,
filter:function(event,player){
@ -3674,7 +3674,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:['boss_xiongshou_turn','boss_xiongshou_damage'],
subSkill:{
damage:{
trigger:{source:'damageBegin'},
trigger:{source:'damageBegin1'},
forced:true,
filter:function(event,player){
return event.notLink()&&event.card&&event.card.name=='sha'&&event.player.hp<player.hp;
@ -3773,7 +3773,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
chixueqingfeng:{
equipSkill:true,
trigger:{player:'shaBegin'},
trigger:{player:'useCardToPlayered'},
filter:function(event){
return event.card.name=='sha';
},
logTarget:'target',
forced:true,
content:function(){
trigger.target.addTempSkill('chixueqingfeng2','shaAfter');
@ -3834,22 +3838,27 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
guilongzhanyuedao:{
equipSkill:true,
trigger:{player:'shaBegin'},
trigger:{player:'useCard'},
forced:true,
filter:function(event,player){
return event.card&&get.color(event.card)=='red';
return event.card&&event.card.name=='sha'&&get.color(event.card)=='red';
},
content:function(){
trigger.directHit=true;
trigger.directHit.addArray(game.players);
}
},
guofengyupao:{
equipSkill:true,
mod:{
targetEnabled:function(card,player,target,now){
if(player.hasSkillTag('unequip2')) return false;
if(target.hasSkillTag('unequip2')) return false;
if(player!=target){
if(get.type(card)=='trick') return false;
if(player.hasSkillTag('unequip',false,{
name:card?card.name:null,
target:player,
card:card
})){}
else if(get.type(card)=='trick') return false;
}
}
}
@ -4627,7 +4636,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
onremove:function(player){
player.enableSkill('honghuangzhili','boss_shenyi');
},
trigger:{global:'phaseBegin'},
trigger:{global:'phaseZhunbeiBegin'},
forced:true,
popup:false,
filter:function(event,player){
@ -4661,7 +4670,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_fentian:{
trigger:{source:'damageBegin'},
trigger:{source:'damageBegin1'},
forced:true,
filter:function(event){
return event.nature!='fire';
@ -4841,7 +4850,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_chiyi:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
unique:true,
filter:function(event,player){
@ -4884,7 +4893,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
intro:{
content:'受到的伤害+1'
},
trigger:{player:'damageBegin'},
trigger:{player:'damageBegin3'},
forced:true,
popup:false,
content:function(){
@ -5015,7 +5024,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_zhongdu:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
mark:true,
nopop:true,
@ -5041,7 +5050,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_qingyi:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
unique:true,
filter:function(event,player){
@ -5151,7 +5160,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_guimou:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
frequent:true,
content:function(){
var list=game.filterPlayer(function(target){
@ -5356,7 +5365,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:'xiaoxiong_damage',
subSkill:{
damage:{
trigger:{global:'phaseEnd'},
trigger:{global:'phaseJieshuBegin'},
forced:true,
filter:function(event,player){
return event.player!=player&&event.player.countUsed()==0;
@ -5538,7 +5547,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
fengqi:{
trigger:{player:['phaseBegin','phaseEnd']},
trigger:{player:['phaseZhunbeiBegin','phaseJieshuBegin']},
direct:true,
content:function(){
'step 0'
@ -5812,7 +5821,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
mazui2:{
trigger:{source:'damageBegin'},
trigger:{source:'damageBegin1'},
forced:true,
mark:'card',
filter:function(event){
@ -5874,7 +5883,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:'yunshen2'
},
yunshen2:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
filter:function(event,player){
return player.storage.yunshen>0;
@ -5921,7 +5930,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
jiaoxia:{
audio:2,
trigger:{target:'useCardToBegin'},
trigger:{target:'useCardToTargeted'},
filter:function(event,player){
return event.card&&get.color(event.card)=='red';
},
@ -5950,7 +5959,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_ruizhi:{
trigger:{global:'phaseBegin'},
trigger:{global:'phaseZhunbeiBegin'},
forced:true,
filter:function(event,player){
return event.player!=player&&event.player.countCards('he')>1;
@ -6027,7 +6036,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(card.name=='sha'&&player.hp<5) return Infinity;
}
},
trigger:{source:'damageBegin'},
trigger:{source:'damageBegin1'},
filter:function(event,player){
return event.card&&event.card.name=='sha'&&event.notLink()&&player.hp<5;
},
@ -6050,7 +6059,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
'boss_mengtai_discard','boss_mengtai_end'],
subSkill:{
begin:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
popup:false,
content:function(){
@ -6086,7 +6095,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
end:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
filter:function(event,player){
if(player.storage.boss_mengtai_draw) return true;
@ -6377,7 +6386,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_modao:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
content:function(){
player.draw(2);
@ -6407,7 +6416,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_zuijiu:{
trigger:{source:'damageBegin'},
trigger:{source:'damageBegin1'},
filter:function(event){
return event.card&&(event.card.name=='sha'||event.card.name=='juedou')&&
event.parent.name!='_lianhuan'&&event.parent.name!='_lianhuan2';
@ -6418,7 +6427,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_xixing:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
direct:true,
content:function(){
"step 0"
@ -6436,7 +6445,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_suoming:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
filter:function(event,player){
return game.hasPlayer(function(current){
@ -6478,14 +6487,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_baolian:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
content:function(){
player.draw(2);
}
},
boss_xiaoshou:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
content:function(){
"step 0"
@ -6526,7 +6535,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_manjia2:{
trigger:{player:'damageBegin'},
trigger:{player:'damageBegin3'},
filter:function(event,player){
if(player.getEquip(2)) return false;
if(event.nature=='fire') return true;
@ -6548,7 +6557,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_lianyu:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
unique:true,
content:function(){
"step 0"
@ -6609,7 +6618,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_guihuo:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
content:function(){
"step 0"
@ -6626,7 +6635,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_luolei:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
direct:true,
content:function(){
"step 0"
@ -6681,7 +6690,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
boss_didong:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
content:function(){
"step 0"
@ -6750,7 +6759,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
boss_xuanlin_intro3:{nobracket:true},
boss_xuanlin_intro4:{nobracket:true},
zhanjiang:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
filter:function(event,player){
var players=game.filterPlayer();
for(var i=0;i<players.length;i++){
@ -6863,7 +6872,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
wuqin:{
audio:2,
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
filter:function(event,player){
return player.countCards('h')==0;
},
@ -6877,7 +6886,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
boss_qiangzheng:{
audio:2,
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
unique:true,
filter:function(event,player){
@ -6937,7 +6946,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
},
boss_konghun:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
filter:function(){
return game.players.length>=3;
@ -6958,7 +6967,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
group:'boss_konghun2'
},
boss_konghun2:{
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
forced:true,
popup:false,
content:function(){
@ -6972,7 +6981,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
yuehun:{
unique:true,
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
frequent:true,
content:function(){
player.recover();
@ -7128,7 +7137,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
boss_hujia:{
audio:2,
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
unique:true,
filter:function(event,player){
@ -7223,7 +7232,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
huoshen:{
trigger:{player:'damageBefore'},
trigger:{player:'damageBegin1'},
forced:true,
unique:true,
filter:function(event){
@ -7332,7 +7341,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
boss_honglian:{
audio:2,
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
unique:true,
content:function(){
@ -7364,7 +7373,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
boss_tianyu:{
audio:true,
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
filter:function(event,player){
if(player.isLinked()) return true;
@ -7435,7 +7444,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
fanghua:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
unique:true,
filter:function(){
@ -7521,7 +7530,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
xiuluo:{
audio:2,
trigger:{player:'phaseBegin'},
trigger:{player:'phaseZhunbeiBegin'},
direct:true,
filter:function(event,player){
return player.countCards('j')>0;
@ -7557,7 +7566,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
shangshix2:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
forced:true,
unique:true,
filter:function(event,player){
@ -7720,7 +7729,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
},
jizhen:{
trigger:{player:'phaseEnd'},
trigger:{player:'phaseJieshuBegin'},
direct:true,
filter:function(event,player){
return game.hasPlayer(function(current){
@ -7754,7 +7763,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
shenqu:{
audio:2,
group:'shenqu2',
trigger:{global:'phaseBegin'},
trigger:{global:'phaseZhunbeiBegin'},
filter:function(event,player){
return player.countCards('h')<=player.maxHp;
},
@ -7866,7 +7875,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
derivation:["reyingzi","yinghun"],
unique:true,
trigger:{
player:"phaseBegin",
player:"phaseZhunbeiBegin",
},
filter:function (event,player){
return player.hp<=2&&!player.storage.boss_hunzi;

View File

@ -5500,7 +5500,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
audio:'zfengshi',
trigger:{player:'useCardToPlayered'},
filter:function(event,player){
if(event.card.name!='sha'&&game.countPlayer()<4) return false;
if(event.card.name!='sha'||game.countPlayer()<4) return false;
return player.siege(event.target)&&game.hasPlayer(function(current){
return current.hasSkill('fengshi')&&current.siege(event.target);
})&&event.target.countCards('e');