v1.9.96.4

This commit is contained in:
Spmario233 2019-12-16 12:55:19 +08:00 committed by GitHub
parent ebd9293142
commit 75184980b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions

View File

@ -8327,7 +8327,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
tiandao_info:'任意一名角色的判定生效前,你可以打出一张牌替换之', tiandao_info:'任意一名角色的判定生效前,你可以打出一张牌替换之',
yunshen:'云身', yunshen:'云身',
yunshen2:'云身', yunshen2:'云身',
yunshen_info:'每当你打出一张闪,你可以令你的防御距离+1准备阶段你将累计的防御距离清零然后摸等量的牌', yunshen_info:'每当你使用货打出一张闪,你可以令你的防御距离+1准备阶段你将累计的防御距离清零然后摸等量的牌',
lianji:'连计', lianji:'连计',
lianji_info:'出牌阶段限一次,你可以选择一张手牌并指定两名角色进行拼点,拼点赢的角色获得此牌,并对没赢的角色造成一点伤害', lianji_info:'出牌阶段限一次,你可以选择一张手牌并指定两名角色进行拼点,拼点赢的角色获得此牌,并对没赢的角色造成一点伤害',
mazui:'麻醉', mazui:'麻醉',

View File

@ -2310,7 +2310,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
sub:true, sub:true,
audio:"reyajiao", audio:"reyajiao",
trigger:{ trigger:{
player:"respond", player:"useCard",
}, },
//priority:1, //priority:1,
filter:function (event,player){ filter:function (event,player){
@ -2320,10 +2320,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
content:function (){ content:function (){
"step 0" "step 0"
player.chooseTarget("是否发动【龙胆】令一名其他角色回复1点体力",function(card,player,target){ player.chooseTarget("是否发动【龙胆】令一名其他角色回复1点体力",function(card,player,target){
return target!=trigger.source&&target!=player&&target.isDamaged(); return target!=_status.event.source&&target!=player&&target.isDamaged();
}).set('ai',function(target){ }).set('ai',function(target){
return get.attitude(_status.event.player,target); return get.attitude(_status.event.player,target);
}); }).set('source',trigger.getParent(2).player);
"step 1" "step 1"
if(result.bool&&result.targets&&result.targets.length){ if(result.bool&&result.targets&&result.targets.length){
player.line(result.targets[0],'green'); player.line(result.targets[0],'green');
@ -2344,10 +2344,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
content:function (){ content:function (){
"step 0" "step 0"
player.chooseTarget("是否发动【龙胆】对一名其他角色造成1点伤害",function(card,player,target){ player.chooseTarget("是否发动【龙胆】对一名其他角色造成1点伤害",function(card,player,target){
return target!=trigger.target&&target!=player; return target!=_status.event.target&&target!=player;
}).set('ai',function(target){ }).set('ai',function(target){
return -get.attitude(_status.event.player,target); return -get.attitude(_status.event.player,target);
}); }).set('target',trigger.target);
"step 1" "step 1"
if(result.bool&&result.targets&&result.targets.length){ if(result.bool&&result.targets&&result.targets.length){
player.line(result.targets[0],'green'); player.line(result.targets[0],'green');
@ -2675,7 +2675,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}, },
content:function (){ content:function (){
"step 0" "step 0"
event.cards=get.cards(2); event.cards=game.cardsGotoOrdering(get.cards(2)).cards;
"step 1" "step 1"
if(event.cards.length>1){ if(event.cards.length>1){
player.chooseCardButton('将“遗计”牌分配给任意角色',true,event.cards,[1,event.cards.length]).set('ai',function(button){ player.chooseCardButton('将“遗计”牌分配给任意角色',true,event.cards,[1,event.cards.length]).set('ai',function(button){
@ -2825,7 +2825,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
event.target.chooseToDiscard('he').set('ai',function(card){ event.target.chooseToDiscard('he').set('ai',function(card){
var player=_status.event.player; var player=_status.event.player;
if(player.isTurnedOver()) return -1; if(player.isTurnedOver()) return -1;
return (player.hp*player.hp)-get.value(card); return (player.hp*player.hp)-Math.max(1,get.value(card));
}).set('prompt','弃置一张手牌并失去一点体力;或选择不弃置,将武将牌翻面并摸'+(player.getDamagedHp())+'张牌。'); }).set('prompt','弃置一张手牌并失去一点体力;或选择不弃置,将武将牌翻面并摸'+(player.getDamagedHp())+'张牌。');
} }
else event.finish(); else event.finish();
@ -5579,7 +5579,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
filter:function(event,player){ filter:function(event,player){
if(event.gzyongjue==player){ if(event.gzyongjue==player){
for(var i=0;i<event.cards.length;i++){ for(var i=0;i<event.cards.length;i++){
if(get.position(event.cards[i])=='d'){ if(get.position(event.cards[i],true)=='o'){
return true; return true;
} }
} }
@ -5593,7 +5593,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
var cards=[]; var cards=[];
for(var i=0;i<trigger.cards.length;i++){ for(var i=0;i<trigger.cards.length;i++){
if(get.position(trigger.cards[i])=='d'){ if(get.position(trigger.cards[i],true)=='o'){
cards.push(trigger.cards[i]); cards.push(trigger.cards[i]);
} }
} }
@ -5800,6 +5800,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
for(var i=0;i<skills.length;i++){ for(var i=0;i<skills.length;i++){
list.add(skills[i]); list.add(skills[i]);
var info=lib.skill[skills[i]]; var info=lib.skill[skills[i]];
if(info.charlotte){list.splice(i--);continue};
if(typeof info.derivation=='string'){ if(typeof info.derivation=='string'){
list.add(info.derivation); list.add(info.derivation);
} }
@ -5807,7 +5808,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
list.addArray(info.derivation); list.addArray(info.derivation);
} }
} }
trigger.source.disableSkill('gzduanchang_disable',list); trigger.source.removeSkill(list);
trigger.source.syncSkills(); trigger.source.syncSkills();
player.line(trigger.source,'green'); player.line(trigger.source,'green');
}, },