diff --git a/audio/skill/pytianjiang1.mp3 b/audio/skill/pytianjiang1.mp3
new file mode 100644
index 000000000..67fb62257
Binary files /dev/null and b/audio/skill/pytianjiang1.mp3 differ
diff --git a/audio/skill/pytianjiang2.mp3 b/audio/skill/pytianjiang2.mp3
new file mode 100644
index 000000000..b4e23c2d4
Binary files /dev/null and b/audio/skill/pytianjiang2.mp3 differ
diff --git a/audio/skill/pyzhuren1.mp3 b/audio/skill/pyzhuren1.mp3
new file mode 100644
index 000000000..423e38a31
Binary files /dev/null and b/audio/skill/pyzhuren1.mp3 differ
diff --git a/audio/skill/pyzhuren2.mp3 b/audio/skill/pyzhuren2.mp3
new file mode 100644
index 000000000..b8f93cc9f
Binary files /dev/null and b/audio/skill/pyzhuren2.mp3 differ
diff --git a/character/extra.js b/character/extra.js
index cf0b30ff2..5a4a99433 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -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');
};
},
diff --git a/character/refresh.js b/character/refresh.js
index 91143b23b..089ccac3e 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -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:'①当你使用或打出【闪】或【闪电】时，你可以进行判定。
②当你不因〖暴虐〗或〖助祭〗而进行的判定的判定牌生效后，若结果为：黑桃，你对一名角色造成2点雷电伤害；梅花：你回复1点体力并对一名其他角色造成1点雷电伤害。',
+ xinleiji_info:'①当你使用或打出【闪】或【闪电】时，你可以进行判定。
②当你不因〖暴虐〗或〖助祭〗而进行的判定的判定牌生效后，若结果为：黑桃，你可对一名其他角色造成2点雷电伤害；梅花：你回复1点体力并可对一名其他其他角色造成1点雷电伤害。',
xinguidao_info:'一名角色的判定牌生效前，你可以打出一张黑色牌作为判定牌并获得原判定牌。若你以此法打出的牌为黑桃2-9，则你摸一张牌。',
reqiangxi:"强袭",
"reqiangxi_info":"出牌阶段对每名其他角色限一次，你可以选择一项：1. 失去一点体力并对你攻击范围内的一名其他角色造成一点伤害；2. 弃置一张武器牌并对你攻击范围内的一名其他角色造成一点伤害。",
diff --git a/character/shenhua.js b/character/shenhua.js
index 723e0c10d..3ac596348 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -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){
diff --git a/character/sp.js b/character/sp.js
index de8758e96..8b596c047 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -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;
diff --git a/character/xinghuoliaoyuan.js b/character/xinghuoliaoyuan.js
index 2ba0829d2..a46391368 100755
--- a/character/xinghuoliaoyuan.js
+++ b/character/xinghuoliaoyuan.js
@@ -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){
- var num1=game.players.length-1;
- var num2=ui.cardPile.childElementCount;
- if(num1>num2) return false;
- if(!player.storage.xinfu_qianxin) return true;
- for(var i=0;inum2) num3=0;
+ else if(!player.storage.xinfu_qianxin){}
+ else{
+ for(var i=0;i0;
},
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){
diff --git a/character/yijiang.js b/character/yijiang.js
index a7a7dde27..4787d4a8f 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -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'},
diff --git a/game/asset.js b/game/asset.js
index 207d50cff..e35edde49 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -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,
};
\ No newline at end of file
diff --git a/game/update.js b/game/update.js
index 7d59b98c9..6cf5d0718 100644
--- a/game/update.js
+++ b/game/update.js
@@ -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',
diff --git a/image/skin/shibing1/1.jpg b/image/skin/shibing1/1.jpg
new file mode 100644
index 000000000..6d81cadc9
Binary files /dev/null and b/image/skin/shibing1/1.jpg differ
diff --git a/image/skin/shibing1/2.jpg b/image/skin/shibing1/2.jpg
new file mode 100644
index 000000000..379c6e9aa
Binary files /dev/null and b/image/skin/shibing1/2.jpg differ
diff --git a/image/skin/shibing1/3.jpg b/image/skin/shibing1/3.jpg
new file mode 100644
index 000000000..0ee94286b
Binary files /dev/null and b/image/skin/shibing1/3.jpg differ
diff --git a/image/skin/shibing1/4.jpg b/image/skin/shibing1/4.jpg
new file mode 100644
index 000000000..c0337e118
Binary files /dev/null and b/image/skin/shibing1/4.jpg differ
diff --git a/image/skin/shibing1/5.jpg b/image/skin/shibing1/5.jpg
new file mode 100644
index 000000000..dbe2ac44e
Binary files /dev/null and b/image/skin/shibing1/5.jpg differ
diff --git a/image/skin/shibing1/6.jpg b/image/skin/shibing1/6.jpg
new file mode 100644
index 000000000..c8905943d
Binary files /dev/null and b/image/skin/shibing1/6.jpg differ
diff --git a/image/skin/shibing2/1.jpg b/image/skin/shibing2/1.jpg
new file mode 100644
index 000000000..756b9940f
Binary files /dev/null and b/image/skin/shibing2/1.jpg differ
diff --git a/image/skin/shibing2/2.jpg b/image/skin/shibing2/2.jpg
new file mode 100644
index 000000000..515b358ff
Binary files /dev/null and b/image/skin/shibing2/2.jpg differ
diff --git a/image/skin/shibing2/3.jpg b/image/skin/shibing2/3.jpg
new file mode 100644
index 000000000..b2c63aa0c
Binary files /dev/null and b/image/skin/shibing2/3.jpg differ
diff --git a/image/skin/shibing2/4.jpg b/image/skin/shibing2/4.jpg
new file mode 100644
index 000000000..bfe53048e
Binary files /dev/null and b/image/skin/shibing2/4.jpg differ
diff --git a/image/skin/shibing2/5.jpg b/image/skin/shibing2/5.jpg
new file mode 100644
index 000000000..fa4467ab4
Binary files /dev/null and b/image/skin/shibing2/5.jpg differ
diff --git a/image/skin/shibing2/6.jpg b/image/skin/shibing2/6.jpg
new file mode 100644
index 000000000..eaa6bcba8
Binary files /dev/null and b/image/skin/shibing2/6.jpg differ
diff --git a/mode/boss.js b/mode/boss.js
index a69cdb23e..877e298d7 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -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&¤t!=target&¤t.hp0;
@@ -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=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;
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 6b1065120..986d99882 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -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')&¤t.siege(event.target);
})&&event.target.countCards('e');