This commit is contained in:
libccy 2017-08-05 11:04:20 +08:00
parent 0b1b34a897
commit b89a7e4b6e
6 changed files with 15 additions and 12 deletions

View File

@ -1100,15 +1100,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){
// }, // },
content:function(){ content:function(){
var list=[]; var list=[];
list.push(get.cardPile('juedou','cardPile')); list.push(get.cardPile2('juedou'));
list.push(get.cardPile('huogong','cardPile')); list.push(get.cardPile2('huogong'));
list.push(get.cardPile('nanman','cardPile')); list.push(get.cardPile2('nanman'));
list.push(get.cardPile('huoshaolianying','cardPile')); list.push(get.cardPile2('huoshaolianying'));
for(var i=0;i<list.length;i++){ for(var i=0;i<list.length;i++){
if(!list[i]) list.splice(i--,1); if(!list[i]) list.splice(i--,1);
} }
list=[list.randomGet()]; list=[list.randomGet()];
var sha=get.cardPile('sha','cardPile'); var sha=get.cardPile2('sha');
if(sha){ if(sha){
if(list.length){ if(list.length){
list.push(sha); list.push(sha);
@ -1116,7 +1116,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
else{ else{
sha.remove(); sha.remove();
list.push(sha); list.push(sha);
var sha2=get.cardPile('sha','cardPile'); var sha2=get.cardPile2('sha');
if(sha2){ if(sha2){
list.push(sha2); list.push(sha2);
} }
@ -2208,7 +2208,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
gw_youer_bg:'饵', gw_youer_bg:'饵',
gw_youer_info:'将一名其他角色的所有手牌移出游戏,然后摸一张牌,当前回合结束后该角色将以此法失去的牌收回手牌', gw_youer_info:'将一名其他角色的所有手牌移出游戏,然后摸一张牌,当前回合结束后该角色将以此法失去的牌收回手牌',
gw_tongdi:'通敌', gw_tongdi:'通敌',
gw_tongdi_info:'观看一名其他角色的手牌并获得其中一张,然后令目标装备一件进攻马', gw_tongdi_info:'观看一名其他角色的手牌并获得其中一张,然后令目标从牌堆或弃牌堆中装备一件进攻马',
gw_baoxueyaoshui:'暴雪药水', gw_baoxueyaoshui:'暴雪药水',
gw_baoxueyaoshui_info:'令一名角色弃置两张手牌并摸一张牌', gw_baoxueyaoshui_info:'令一名角色弃置两张手牌并摸一张牌',
gw_birinongwu:'蔽日浓雾', gw_birinongwu:'蔽日浓雾',

View File

@ -696,7 +696,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
shandianjian:'闪电箭', shandianjian:'闪电箭',
shandianjian_info:'目标角色展示一张手牌然后若你能弃掉一张与所展示牌相同花色的手牌则对该角色造成1点雷电伤害。', shandianjian_info:'目标角色展示一张手牌然后若你能弃掉一张与所展示牌相同花色的手牌则对该角色造成1点雷电伤害。',
shijieshu:'视界术', shijieshu:'视界术',
shijieshu_info:'目标随机装备两张装备牌,然后弃置一张牌', shijieshu_info:'目标从牌堆或弃牌堆中随机装备两张装备牌,然后弃置一张牌',
zhaomingdan:'照明弹', zhaomingdan:'照明弹',
zhaomingdan_info:'观看一名其他角色的手牌,并弃置其区域内的一张牌,然后其与你各摸一张牌', zhaomingdan_info:'观看一名其他角色的手牌,并弃置其区域内的一张牌,然后其与你各摸一张牌',
jihuocard:'激活', jihuocard:'激活',

View File

@ -5097,7 +5097,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
content:function(){ content:function(){
var type=get.type(trigger.card); var type=get.type(trigger.card);
var card=get.cardPile(function(card){ var card=get.cardPile2(function(card){
return get.type(card)==type; return get.type(card)==type;
}); });
if(card){ if(card){

View File

@ -614,9 +614,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 0' 'step 0'
player.showCards(get.translation(player)+'对'+get.translation(target)+'发动了【连计】',cards); player.showCards(get.translation(player)+'对'+get.translation(target)+'发动了【连计】',cards);
'step 1' 'step 1'
var equip1=get.cardPile(function(card){ var equip1=get.cardPile2(function(card){
return get.subtype(card)=='equip1'; return get.subtype(card)=='equip1';
},'cardPile'); });
target.$draw(equip1); target.$draw(equip1);
target.equip(equip1); target.equip(equip1);
game.delay(); game.delay();

View File

@ -550,7 +550,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(result.bool){ if(result.bool){
var target=result.targets[0]; var target=result.targets[0];
player.logSkill('daiyan',target); player.logSkill('daiyan',target);
var tao=get.cardPile('tao','cardPile'); var tao=get.cardPile2('tao');
if(tao){ if(tao){
target.gain(tao,'gain2'); target.gain(tao,'gain2');
} }

View File

@ -42432,6 +42432,9 @@
} }
return null; return null;
}, },
cardPile2:function(name){
return get.cardPile(name,'cardPile');
},
aiStrategy:function(){ aiStrategy:function(){
switch(get.config('ai_strategy')){ switch(get.config('ai_strategy')){
case 'ai_strategy_1':return 1; case 'ai_strategy_1':return 1;