v1.9.93.1(Part 2)
This commit is contained in:
Spmario233
GitHub
parent
a086bbb6f4
commit
1bc96f3a01
|
|
@ -155,16 +155,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
var card=cards.randomGet();
|
||||
player.gain(card);
|
||||
target.$giveAuto(card,player);
|
||||
game.delay(0.3);
|
||||
break;
|
||||
}
|
||||
}
|
||||
event.num++;
|
||||
event.redo();
|
||||
}
|
||||
"step 4"
|
||||
player.turnOver();
|
||||
game.delay(0.7);
|
||||
if(num<event.targets.length) event.goto(3);
|
||||
"step 5"
|
||||
player.turnOver();
|
||||
"step 6"
|
||||
event.count--;
|
||||
if(event.count){
|
||||
player.chooseBool(get.prompt2('new_guixin')).ai=function(){
|
||||
|
|
@ -174,7 +175,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
else{
|
||||
event.finish();
|
||||
}
|
||||
"step 6"
|
||||
"step 7"
|
||||
if(event.count&&result.bool){
|
||||
player.logSkill('new_guixin');
|
||||
event.goto(1);
|
||||
|
|
@ -1251,7 +1252,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player.unmarkSkill('qixing');
|
||||
}
|
||||
game.addVideo('storage',player,['qixing',get.cardsInfo(player.storage.qixing),'cards']);
|
||||
player.discard(result.links);
|
||||
game.cardsDiscard(result.links);
|
||||
},
|
||||
group:'dawu3'
|
||||
},
|
||||
|
|
@ -1286,11 +1287,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
for(var i=0;i<game.players.length;i++){
|
||||
if(game.players[i].hasSkill('dawu2')){
|
||||
game.players[i].removeSkill('dawu2');
|
||||
game.players[i].popup('dawu2');
|
||||
//game.players[i].popup('dawu2');
|
||||
}
|
||||
if(game.players[i].hasSkill('kuangfeng2')){
|
||||
game.players[i].removeSkill('kuangfeng2');
|
||||
game.players[i].popup('kuangfeng2');
|
||||
//game.players[i].popup('kuangfeng2');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1328,7 +1329,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player.unmarkSkill('qixing');
|
||||
}
|
||||
game.addVideo('storage',player,['qixing',get.cardsInfo(player.storage.qixing),'cards']);
|
||||
player.discard(result.links);
|
||||
game.cardsDiscard(result.links);
|
||||
game.log(player,'将',result.links,'置入了弃牌堆')
|
||||
},
|
||||
},
|
||||
kuangfeng2:{
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
mobile_default:["miheng","taoqian","liuzan","lingcao","sunru","lifeng","zhuling","liuye","zhaotongzhaoguang","majun","simazhao","wangyuanji","pangdegong","shenpei"],
|
||||
mobile_fire:["re_sp_zhugeliang","re_xunyu","re_dianwei","re_yanwen","re_pangtong","xin_yuanshao"],
|
||||
mobile_forest:['re_zhurong','re_menghuo'],
|
||||
mobile_others:["re_jikang","old_bulianshi","old_caochun","old_yuanshu"],
|
||||
mobile_others:["re_jikang","old_bulianshi","old_yuanshu"],
|
||||
},
|
||||
},
|
||||
character:{
|
||||
|
|
@ -33,7 +33,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
re_yanwen:["male","qun",4,["reshuangxiong"],[]],
|
||||
re_pangtong:['male','shu',3,['xinlianhuan','niepan'],[]],
|
||||
xin_yuanshao:['male','qun',4,['reluanji','xueyi'],['zhu']],
|
||||
old_caochun:['male','wei',4,['shanjia']],
|
||||
old_yuanshu:['male','qun',4,['xinyongsi','yjixi']],
|
||||
|
||||
shenpei:["male","qun","2/3",["shouye","liezhi"],[]],
|
||||
|
|
@ -484,8 +483,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
},
|
||||
},
|
||||
translate:{
|
||||
re_jikang:"新嵇康",
|
||||
old_bulianshi:'新步练师',
|
||||
re_jikang:"手杀嵇康",
|
||||
old_bulianshi:'手杀步练师',
|
||||
old_caochun:'旧曹纯',
|
||||
shenpei:'审配',
|
||||
re_zhurong:'界祝融',
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
old_shenhua:["yuji","zhangjiao","old_zhugezhan","old_zhoutai","old_caoren"],
|
||||
old_refresh:["old_zhangfei","old_huatuo"],
|
||||
old_yijiang:["masu","xushu","fazheng","liru","yujin","xin_yujin","old_zhonghui","old_xusheng","old_zhuran","old_lingtong","old_madai","old_caoxiu","old_wangyi","old_caozhen","old_quancong","old_chenqun","old_zhuhuan","old_zhuzhi","old_guanzhang"],
|
||||
old_sp:["old_lingju","old_maliang","old_machao","zhangliang","jsp_caoren"],
|
||||
old_sp:["old_caochun","old_lingju","old_maliang","old_machao","zhangliang","jsp_caoren"],
|
||||
},
|
||||
},
|
||||
character:{
|
||||
|
|
@ -18,6 +18,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
old_zhangfei:['male','shu',4,['paoxiao','retishen']],
|
||||
old_huatuo:['male','qun',3,['jijiu','chulao']],
|
||||
jsp_caoren:['male','wei',4,['kuiwei','yanzheng']],
|
||||
old_caochun:['male','wei',4,['shanjia']],
|
||||
masu:['male','shu',3,['xinzhan','huilei']],
|
||||
xushu:['male','shu',3,['wuyan','jujian']],
|
||||
fazheng:['male','shu',3,['enyuan','xuanhuo']],
|
||||
|
|
|
|||
|
|
@ -1613,19 +1613,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
player.storage.rerende+=cards.length;
|
||||
if(player.storage.rerende>=2){
|
||||
var list=[];
|
||||
if(lib.filter.cardUsable({name:'sha'},player,event.getParent('chooseToUse'))){
|
||||
if(game.hasPlayer(function(current){
|
||||
return player.canUse('sha',current);
|
||||
})){
|
||||
list.push(['基本','','sha']);
|
||||
list.push(['基本','','sha','fire']);
|
||||
list.push(['基本','','sha','thunder']);
|
||||
}
|
||||
if(lib.filter.cardUsable({name:'sha'},player,event.getParent('chooseToUse'))&&game.hasPlayer(function(current){
|
||||
return player.canUse('sha',current);
|
||||
})){
|
||||
list.push(['基本','','sha']);
|
||||
list.push(['基本','','sha','fire']);
|
||||
list.push(['基本','','sha','thunder']);
|
||||
}
|
||||
if(player.canUse('tao',player,true,true)){
|
||||
if(lib.filter.cardUsable({name:'tao'},player,event.getParent('chooseToUse'))&&game.hasPlayer(function(current){
|
||||
return player.canUse('tao',current);
|
||||
})){
|
||||
list.push(['基本','','tao']);
|
||||
}
|
||||
if(player.canUse('jiu',player,true,true)){
|
||||
if(lib.filter.cardUsable({name:'jiu'},player,event.getParent('chooseToUse'))&&game.hasPlayer(function(current){
|
||||
return player.canUse('jiu',current);
|
||||
})){
|
||||
list.push(['基本','','jiu']);
|
||||
}
|
||||
if(list.length){
|
||||
|
|
@ -1669,26 +1671,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
'step 1'
|
||||
if(result&&result.bool&&result.links[0]){
|
||||
var card={name:result.links[0][2],nature:result.links[0][3]};
|
||||
if(card.name=='sha'){
|
||||
event.fakecard=card;
|
||||
player.chooseTarget(function(card,player,target){
|
||||
return player.canUse(_status.event.fakecard,target,true,true);
|
||||
},true,'选择出杀目标').set('ai',function(target){
|
||||
var player=_status.event.player;
|
||||
return get.effect(target,_status.event.fakecard,player,player);
|
||||
}).set('fakecard',card);
|
||||
}
|
||||
else{
|
||||
player.useCard(card,player);
|
||||
event.finish();
|
||||
}
|
||||
}
|
||||
else{
|
||||
event.finish();
|
||||
}
|
||||
'step 2'
|
||||
if(result.bool&&result.targets&&result.targets.length){
|
||||
player.useCard(event.fakecard,result.targets);
|
||||
player.chooseUseTarget(card,true);
|
||||
}
|
||||
},
|
||||
ai:{
|
||||
|
|
|
|||
|
|
@ -993,7 +993,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
event.list=[];
|
||||
for(var i=0;i<player.storage.kongsheng2.length;i++){
|
||||
if(get.type(player.storage.kongsheng2[i])=='equip'&&player.canUse(player.storage.kongsheng2[i],player)){
|
||||
player.useCard(player.storage.kongsheng2[i],player);
|
||||
player.chooseUseTarget(player.storage.kongsheng2[i],true,'nopopup','noanimate');
|
||||
event.list.push(player.storage.kongsheng2[i]);
|
||||
};
|
||||
};
|
||||
|
|
@ -1932,22 +1932,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
'step 2'
|
||||
if(result.bool&&result.cards.length){
|
||||
if(get.type(result.cards[0])=='equip'&&!player.isDisabled(get.subtype(result.cards[0]))){
|
||||
player.$give(result.cards,player);
|
||||
player.lose(result.cards,ui.special);
|
||||
event.toequip=result.cards[0];
|
||||
player.chooseUseTarget(result.cards[0],true,'nopopup');
|
||||
}
|
||||
else{
|
||||
player.discard(result.cards[0]);
|
||||
}
|
||||
}
|
||||
'step 3'
|
||||
if(event.toequip){
|
||||
game.delay();
|
||||
}
|
||||
'step 4'
|
||||
if(event.toequip){
|
||||
player.useCard(event.toequip,player).set('animate',false).nopopup=true;
|
||||
}
|
||||
},
|
||||
ai:{
|
||||
effect:{
|
||||
|
|
@ -4519,7 +4509,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
"step 0"
|
||||
player.awakenSkill('luanwu');
|
||||
event.current=player.next;
|
||||
event.currented=[];
|
||||
"step 1"
|
||||
event.currented.push(event.current);
|
||||
event.current.animate('target');
|
||||
event.current.chooseToUse('乱武：使用一张杀或流失一点体力',{name:'sha'},function(card,player,target){
|
||||
if(player==target) return false;
|
||||
|
|
@ -4534,8 +4526,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
|||
});
|
||||
"step 2"
|
||||
if(result.bool==false) event.current.loseHp();
|
||||
if(event.current.next!=player){
|
||||
event.current=event.current.next;
|
||||
event.current=event.current.next;
|
||||
if(event.current!=player&&!event.currented.contains(event.current)){
|
||||
game.delay(0.5);
|
||||
event.goto(1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue