This commit is contained in:
libccy 2018-08-13 19:40:09 +08:00
parent 1ff223bc03
commit b142cb2669
4 changed files with 57 additions and 7 deletions

View File

@ -4401,6 +4401,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
init:function(player){
player.storage.luanzhan=0;
},
init2:function(player){
player.markSkill('luanzhan');
},
content:function(){
if(typeof player.storage.luanzhan=='number'){
player.storage.luanzhan+=trigger.num;
@ -4408,7 +4411,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{
player.storage.luanzhan=trigger.num;
}
player.markSkill('luanzhan');
if(player.hasSkill('luanzhan')){
player.markSkill('luanzhan');
}
},
group:'luanzhan_cancel',
subSkill:{
@ -8721,6 +8726,39 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
}
},
gzshushen:{
audio:'shushen',
trigger:{player:'recoverAfter'},
direct:true,
filter:function(event,player){
return game.hasPlayer(function(current){
return player!=current&&player.sameIdentityAs(current);
});
},
content:function(){
'step 0'
event.num=trigger.num||1;
"step 1"
player.chooseTarget(get.prompt2('gzshushen'),function(card,player,target){
return target!=player&&player.sameIdentityAs(target);
}).set('ai',function(target){
return get.attitude(_status.event.player,target);
});
"step 2"
if(result.bool){
player.logSkill('gzshushen',result.targets);
result.targets[0].draw();
if(event.num>1){
event.num--;
event.goto(1);
}
}
},
ai:{
threaten:0.8,
expose:0.1
}
},
shushen:{
audio:2,
trigger:{player:'recoverAfter'},

View File

@ -10144,6 +10144,9 @@
},
chooseToUse:function(){
"step 0"
if(game.modeSwapPlayer&&!_status.auto&&player.isUnderControl()&&!lib.filter.wuxieSwap(trigger)){
game.modeSwapPlayer(player);
}
var skills=player.getSkills(true);
game.expandSkills(skills);
for(var i=0;i<skills.length;i++){
@ -10385,6 +10388,9 @@
event.result={bool:false};
}
else{
if(game.modeSwapPlayer&&!_status.auto&&player.isUnderControl()&&!lib.filter.wuxieSwap(trigger)){
game.modeSwapPlayer(player);
}
game.check();
if(event.isMine()){
game.pause();
@ -10443,6 +10449,9 @@
}
}
else{
if(game.modeSwapPlayer&&!_status.auto&&player.isUnderControl()&&!lib.filter.wuxieSwap(trigger)){
game.modeSwapPlayer(player);
}
event.rangecards=player.getCards(event.position);
for(var i=0;i<event.rangecards.length;i++){
if(lib.filter.cardDiscardable(event.rangecards[i],player,event)){
@ -17526,14 +17535,14 @@
this.classList.remove('linked');
}
},
canUse:function(card,player,distance,includecard){
canUse:function(card,target,distance,includecard){
if(typeof card=='string') card={name:card};
var info=get.info(card);
if(info.multicheck&&!info.multicheck(card,this)) return false;
if(includecard!=false&&!lib.filter.cardEnabled(card,player)) return false;
if(includecard!=false&&!lib.filter.cardEnabled(card,this)) return false;
if(includecard&&!lib.filter.cardUsable(card,this)) return false;
if(distance==false) return lib.filter.targetEnabled(card,this,player);
return lib.filter.filterTarget(card,this,player);
if(distance==false) return lib.filter.targetEnabled(card,this,target);
return lib.filter.filterTarget(card,this,target);
},
hasUseTarget:function(card,distance,includecard){
var player=this;

View File

@ -2,7 +2,7 @@ window.noname_update={
version:'1.9.55',
update:'1.9.54.1',
changeLog:[
'bug修复'
'势备篇卡牌'
],
files:[
'card/guozhan.js',
@ -11,6 +11,7 @@ window.noname_update={
'character/gwent.js',
'character/hearth.js',
'character/shenhua.js',
'character/sp.js',
'character/yijiang.js',
'game/asset.js',
'game/game.js',

View File

@ -221,7 +221,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
gz_liushan:['male','shu',3,['xiangle','fangquan']],
gz_menghuo:['male','shu',4,['huoshou','zaiqi']],
gz_zhurong:['female','shu',4,['juxiang','lieren']],
gz_ganfuren:['female','shu',3,['shushen','shenzhi']],
gz_ganfuren:['female','shu',3,['gzshushen','shenzhi']],
gz_yuji:['male','qun',3,['qianhuan']],
gz_sunquan:['male','wu',4,['gzzhiheng']],
@ -4161,6 +4161,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
gz_masu:'马谡',
gz_yuji:'于吉',
gzshushen:'淑慎',
gzshushen_info:'当你回复1点体力时你可令与你势力相同的一名其他角色摸一张牌。',
_lianheng:'连横',
lianheng_tag:'连',
guo_tag:'国',