v1.9.97.1

This commit is contained in:
Spmario233 2020-01-13 23:13:24 +08:00 committed by GitHub
parent a2e007f29b
commit 3cad2c0f0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 23 deletions

View File

@ -13,6 +13,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
key_umi:['female','key',3,['umi_chaofan','umi_lunhui','umi_qihuan']],
key_umi2:['female','key',3,[],['unseen']],
key_kagari:['female','shen',3,['kagari_zongsi']],
key_rei:['male','key',4,['xiandeng','shulv','xisheng']],
// diy_caocao:['male','wei',4,['xicai','diyjianxiong','hujia']],
// diy_hanlong:['male','wei',4,['siji','ciqiu']],
diy_feishi:['male','shu',3,['shuaiyan','moshou']],
@ -89,7 +90,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
diy:{
diy_tieba:["diy_wenyang","ns_zuoci","ns_lvzhi","ns_wangyun","ns_nanhua","ns_nanhua_left","ns_nanhua_right","ns_huamulan","ns_huangzu","ns_jinke","ns_yanliang","ns_wenchou","ns_caocao","ns_caocaosp","ns_zhugeliang","ns_wangyue","ns_yuji","ns_xinxianying","ns_guanlu","ns_simazhao","ns_sunjian","ns_duangui","ns_zhangbao","ns_masu","ns_zhangxiu","ns_lvmeng","ns_shenpei","ns_yujisp","ns_yangyi","ns_liuzhang","ns_xinnanhua"],
diy_default:["diy_feishi","diy_liuyan","diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","diy_liufu","diy_xizhenxihong","diy_liuzan","diy_zaozhirenjun","diy_yangyi","diy_tianyu"],
diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi"],
diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei"],
},
},
characterIntro:{
@ -104,6 +105,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
characterTitle:{
key_umi:'#bSummer Pockets',
key_rei:'#gHarmonia',
key_kagari:'#bRewrite',
key_lucia:'#bRewrite',
key_kyousuke:'#bLittle Busters!',
@ -5380,6 +5382,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
key_kagari:'篝',
key_umi:'加藤うみ',
key_umi2:'鹰原羽未',
key_rei:'零',
lucia_duqu:'毒躯',
lucia_duqu_info:'锁定技,①当你对其他角色造成伤害或受到其他角色的伤害时,你和对方各获得一张花色点数随机的【毒】。<br>②当你因【毒】失去体力时,你改为回复等量的体力。<br>③当你处于濒死状态时,你可以使用一张【毒】(每回合限一次)。',
lucia_zhenren:'振刃',
@ -5517,7 +5520,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
nsshuangxiong_info:'当你使用[决斗]或被使用[决斗]时,你可以将武将牌翻面',
nsshuangxiong_append:'背面武将文丑2体力你可以将一张牌当[杀]打出',
nsguanyong:'冠勇',
nsguanyong_info:'你可以将一张牌当[杀]打出',
nsguanyong_info:'你可以将一张牌当[杀]打出',
nsjihui:'急恚',
nsjihui_info:'锁定技,每当一名角色一次弃置了三张或更多的牌,你获得一个额外回合;你的额外回合内,你使用牌只能指定你与上一回合角色为目标',
nsmouyun:'谋运',

View File

@ -339,10 +339,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
next.setContent(lib.skill.rehuashen.content);
},
},
rexingsheng:{audio:2},
rexinsheng:{
mode:['identity','single','doudizhu'],
unique:true,
audio:2,
audio:'rexingsheng',
trigger:{player:'damageEnd'},
frequent:true,
content:function(){
@ -352,6 +353,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
"reguhuo":{
audio:2,
group:["reguhuo_guess","reguhuo_respond","reguhuo_wuxie"],
derivation:'rechanyuan',
enable:"chooseToUse",
@ -410,7 +412,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
"reguhuo_guess":{
audio:'guhuo_guess',
audio:'reguhuo',
trigger:{
player:"useCardBefore",
},
@ -824,7 +826,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
reqingguo:{
audio:'qingguo',
audio:2,
enable:['chooseToRespond','chooseToUse'],
filterCard:function(card){
return get.color(card)=='black';
@ -1848,7 +1850,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
reguanxing:{
audio:'guanxing',
audioname:['jiangwei','re_jiangwei'],
audioname:['jiangwei','re_jiangwei','re_zhugeliang'],
trigger:{player:['phaseZhunbeiBegin','phaseJieshuBegin']},
frequent:true,
filter:function(event,player,name){
@ -2055,7 +2057,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
reluoshen:{
audio:'luoshen',
audio:2,
locked:false,
trigger:{player:'phaseZhunbeiBegin'},
frequent:true,
@ -2121,7 +2123,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
rejieyin:{
audio:'jieyin',
audio:2,
enable:'phaseUse',
filterCard:true,
usable:1,
@ -2222,6 +2224,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
rejiuyuan:{
global:'rejiuyuan2',
audio:2,
zhuSkill:true,
},
rejiuyuan2:{
@ -2247,7 +2250,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1'
if(result.bool){
var target=result.targets[0];
player.logSkill('rejiuyuan2',target);
target.logSkill('rejiuyuan');
player.line('rejiuyuan2',target,'green');
trigger.getParent().targets.remove(player);
trigger.getParent().targets.push(target);
player.draw();
@ -2255,7 +2259,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
rezhiheng:{
audio:'zhiheng',
audio:2,
enable:'phaseUse',
usable:1,
position:'he',
@ -2315,7 +2319,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
},
rejizhi:{
audio:'jizhi',
audio:2,
locked:false,
trigger:{player:'useCard'},
frequent:true,
@ -2369,7 +2373,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
rebiyue:{
audio:'biyue',
audio:2,
trigger:{player:'phaseJieshuBegin'},
frequent:true,
content:function(){

View File

@ -4490,18 +4490,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
//forceaudio:true,
trigger:{global:'damageSource'},
filter:function(event,player){
if(player==event.source||event.player.group!='qun') return false;
if(player==event.source||event.source.group!='qun') return false;
return player.hasZhuSkill('baonue',event.player);
},
direct:true,
content:function(){
'step 0'
trigger.player.chooseBool(get.prompt('baonue',player)).set('choice',get.attitude(trigger.player,player)>0);
trigger.source.chooseBool(get.prompt('baonue',player)).set('choice',get.attitude(trigger.source,player)>0);
'step 1'
if(result.bool){
player.logSkill('baonue');
trigger.player.line(player,'green')
trigger.player.judge(function(card){
trigger.source.line(player,'green')
trigger.source.judge(function(card){
if(get.suit(card)=='spade') return 4;
return 0;
});
@ -4509,7 +4509,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else{
event.finish();
}
'step 3'
'step 2'
if(result.suit=='spade'){
player.recover();
}

View File

@ -943,6 +943,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
return false;
},
forceDie:true,
content:function(){
if(!_status.pyzhuren) _status.pyzhuren={};
var list=[];
@ -4828,7 +4829,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'phaseUseBegin'},
direct:true,
filter:function(event,player){
if(!player.countCards('h',function(card){
if(!player.countCards('he',function(card){
return get.type(card)!='basic';
})){
return false;
@ -4846,13 +4847,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
});
'step 1'
if(result.bool){
var cards=player.getCards('h',function(card){
var cards=player.getCards('he',function(card){
return get.type(card)!='basic';
});
var target=result.targets[0];
var types=[];
for(var i=0;i<cards.length;i++){
types.add(get.type(cards[i]));
types.add(get.type(cards[i],'trick'));
}
player.logSkill('yirang',target);
target.gain(cards,player,'give');
@ -6835,6 +6836,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
yingjian:{
trigger:{player:'phaseZhunbeiBegin'},
direct:true,
audio:'qingyi',
content:function(){
player.chooseUseTarget('###是否发动【影箭】?###视为使用一张没有距离限制的【杀】',{name:'sha'},false,'nodistance').logSkill='yingjian';
},
@ -9659,8 +9661,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.countCards('h')>player.hp;
},
},
xiandeng:{
mod:{
cardUsable:function(card,player,num){
if(card.name=='sha') return num+1;
},
targetInRange:function(card,player){
if(card.name=='sha'&&player.countUsed('sha',true)==0) return true;
},
},
},
qingyi:{
audio:'qingyi1',
audio:2,
trigger:{player:'phaseJudgeBefore'},
direct:true,
content:function(){
@ -14218,6 +14230,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
qingyi1:'轻逸',
qingyi2:'轻逸',
qingyi_info:'你可以跳过判定阶段和摸牌阶段,视为对任意一名角色使用一张【杀】。',
xiandeng:'先登',
xiandeng_info:'锁定技,出牌阶段,你使用的第一张【杀】不计入次数且无距离限制。',
shulv:'熟虑',
shulv_info:'出牌阶段限一次,若你的手牌数大于体力值,则你可以弃置一张牌并摸一张牌。',
xisheng:'牺牲',

View File

@ -1122,7 +1122,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
guanxing_fail:{},
guanxing:{
audio:2,
audioname:['jiangwei'],
audioname:['jiangwei','re_jiangwei','re_zhugeliang'],
trigger:{player:'phaseZhunbeiBegin'},
frequent:true,
content:function(){
@ -1338,6 +1338,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
trigger:{player:'loseEnd'},
forced:true,
firstDo:true,
audioname:['re_zhugeliang'],
filter:function(event,player){
if(player.countCards('h')) return false;
for(var i=0;i<event.cards.length;i++){
@ -1974,7 +1976,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
xiaoji:{
audio:2,
audioname:['sp_sunshangxiang'],
audioname:['sp_sunshangxiang','re_sunshangxiang'],
trigger:{player:'loseEnd'},
frequent:true,
filter:function(event,player){
@ -2289,6 +2291,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
lijian:{
audio:2,
audioname:['re_diaochan'],
enable:'phaseUse',
usable:1,
filter:function(event,player){