This commit is contained in:
libccy 2016-05-09 15:57:27 +08:00
parent de66224533
commit 9a74ba8564
7 changed files with 57 additions and 58 deletions

View File

@ -83,7 +83,7 @@ card.standard={
var evt=_status.event.getParent();
var sks=target.get('s');
if(sks.contains('leiji')||
sks.contains('diyleiji')||
sks.contains('releiji')||
sks.contains('lingbo')){
return 1;
}

View File

@ -133,7 +133,7 @@ character.refresh={
content:function(){
"step 0"
player.chooseCard(get.translation(trigger.player)+'的'+(trigger.judgestr||'')+'判定为'+
get.translation(trigger.player.judging[0])+',是否发动【鬼才】?','he').set('ai',function(card){
get.translation(trigger.player.judging[0])+',是否发动【'+get.skillTranslation('reguicai',player)+'】?','he').set('ai',function(card){
var trigger=_status.event.getTrigger();
var player=_status.event.player;
var judging=_status.event.judging;
@ -197,7 +197,7 @@ character.refresh={
return;
}
event.num--;
player.choosePlayerCard('是否对'+get.translation(trigger.source)+'发动【反馈】?',trigger.source,ai.get.buttonValue,'he');
player.choosePlayerCard('是否对'+get.translation(trigger.source)+'发动【'+get.skillTranslation('refankui',player)+'】?',trigger.source,ai.get.buttonValue,'he');
"step 2"
if(result.bool){
player.logSkill('refankui',trigger.source);
@ -1342,34 +1342,34 @@ character.refresh={
re_huatuo:'界华佗',
re_lidian:'李典',
qinxue:'勤学',
retuxi:'突袭',
reluoyi:'裸衣',
reluoyi2:'裸衣',
reganglie:'刚烈',
retuxi:'突袭',
reluoyi:'裸衣',
reluoyi2:'裸衣',
reganglie:'刚烈',
qingjian:'清俭',
reyingzi:'英姿',
refanjian:'反间',
reyingzi:'英姿',
refanjian:'反间',
refanjian_card:'弃牌',
refanjian_hp:'流失体力',
reqianxun:'谦逊',
reqianxun2:'谦逊',
relianying:'连营',
reqianxun:'谦逊',
reqianxun2:'谦逊',
relianying:'连营',
retishen:'替身',
retishen2:'替身',
reyajiao:'涯角',
rejianxiong:'奸雄',
rejianxiong:'奸雄',
rejianxiong_mopai:'摸牌',
rejianxiong_napai:'拿牌',
reyiji:'遗计',
reyiji2:'遗计',
reyiji:'遗计',
reyiji2:'遗计',
yijue:'义绝',
yijue2:'义绝',
retieji:'铁骑',
retieji2:'铁骑',
refankui:'反馈',
retieji:'铁骑',
retieji2:'铁骑',
refankui:'反馈',
reyicong:'义从',
qiaomeng:'趫猛',
rekurou:'苦肉',
rekurou:'苦肉',
zhaxiang:'诈降',
zhaxiang2:'诈降',
zhuhai:'诛害',
@ -1378,7 +1378,7 @@ character.refresh={
reguicai:'新鬼才',
xunxun:'恂恂',
wangxi:'忘隙',
reguose:'国色',
reguose:'国色',
fenwei:'奋威',
chulao:'除疠',
rejizhi:'集智',

View File

@ -9,7 +9,7 @@ character.shenhua={
xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
zhoutai:['male','wu',4,['buqu','fenji']],
zhangjiao:['male','qun',3,['leiji','guidao','huangtian'],['zhu']],
sp_zhangjiao:['male','qun',3,['diyleiji','guidao','huangtian'],['zhu']],
sp_zhangjiao:['male','qun',3,['releiji','guidao','huangtian'],['zhu']],
// yuji:['male','qun',3,['guhuo']],
sp_zhugeliang:['male','shu',3,['huoji','bazhen','kanpo']],
@ -2494,7 +2494,7 @@ character.shenhua={
}
}
},
diyleiji:{
releiji:{
audio:2,
trigger:{player:'respond'},
filter:function(event,player){
@ -2503,13 +2503,13 @@ character.shenhua={
direct:true,
content:function(){
"step 0";
player.chooseTarget('是否发动【新雷击】?').ai=function(target){
player.chooseTarget('是否发动【'+get.skillTranslation('releiji',player)+'】?').ai=function(target){
if(target.skills.contains('hongyan')) return 0;
return ai.get.damageEffect(target,_status.event.player,_status.event.player,'thunder');
};
"step 1"
if(result.bool){
player.logSkill('diyleiji',result.targets,'thunder');
player.logSkill('releiji',result.targets,'thunder');
event.target=result.targets[0];
event.target.judge(function(card){
var suit=get.suit(card);
@ -3164,16 +3164,15 @@ character.shenhua={
buqu:'不屈',
buqu_bg:'创',
leiji:'雷击',
spleiji:'新雷击',
guidao:'鬼道',
huangtian:'黄天',
huangtian2:'黄天',
guhuo:'蛊惑',
fenji:'奋激',
diyleiji:'雷击',
releiji:'雷击',
jiewei:'解围',
jiewei_info:'每当你翻面,你可以使用一张锦囊牌或装备牌,若如此做,此牌结算后,你可以弃置场上一张同类型的牌',
diyleiji_info:'每当你使用或打出一张【闪】,可令任意一名角色进行一次判定,若结果为梅花,其受到一点雷电伤害,然后你回复一点体力;若结果为黑桃,其受到两点雷电伤害',
releiji_info:'每当你使用或打出一张【闪】,可令任意一名角色进行一次判定,若结果为梅花,其受到一点雷电伤害,然后你回复一点体力;若结果为黑桃,其受到两点雷电伤害',
tiangong:'天公',
tiangong2:'天公',
tiangong_info:'锁定技,你防止即将受到的雷电伤害,每当你造成一次雷电伤害,你摸一张牌',
@ -3195,8 +3194,6 @@ character.shenhua={
'称为“创”,若所有“创”的点数均不同,你不会死亡。你的手牌上限为“创”的个数',
leiji_info:
'每当你使用或打出一张【闪】,可令任意一名角色进行一次判定,若结果为黑桃,其受到两点雷电伤害',
spleiji_info:
'每当你使用或打出一张【闪】,可令任意一名角色进行一次判定,若结果为黑色,其受到一点雷电伤害,然后你回复一点体力',
guidao_info:
'任意一名角色的判定生效前,你可以打出一张黑色牌替换之',
huangtian_info:

View File

@ -1392,8 +1392,8 @@ window.noname_asset_list=[
'audio/skill/dimeng2.mp3',
'audio/skill/dingpin1.mp3',
'audio/skill/dingpin2.mp3',
'audio/skill/diyleiji1.mp3',
'audio/skill/diyleiji2.mp3',
'audio/skill/releiji1.mp3',
'audio/skill/releiji2.mp3',
'audio/skill/duanbing1.mp3',
'audio/skill/duanbing2.mp3',
'audio/skill/duanbing3.mp3',

View File

@ -6160,12 +6160,12 @@
}
str+='发动了';
if(!info.direct){
game.log(player,str,'【'+get.translation(skill)+'】');
game.log(player,str,'【'+get.skillTranslation(skill,player)+'】');
if(lib.config.skill_animation&&lib.skill[skill]&&lib.skill[skill].skillAnimation){
player.$skill(lib.skill[skill].animationStr||lib.translate[skill],lib.skill[skill].skillAnimation,lib.skill[skill].animationColor);
}
else{
player.popup(skill);
player.popup(get.skillTranslation(skill,player));
}
}
if(event.addCount!=false){
@ -9119,12 +9119,12 @@
if(lib.config.skill_animation&&lib.skill[name]&&lib.skill[name].skillAnimation){
this.$skill(lib.skill[name].animationStr||lib.translate[name],lib.skill[name].skillAnimation,lib.skill[name].animationColor);
}
else if(!nopop) this.popup(name);
else if(!nopop) this.popup(get.skillTranslation(name,this));
if(typeof targets=='object'&&targets.length){
game.log(this,'对',targets,'发动了','【'+get.translation(name)+'】');
game.log(this,'对',targets,'发动了','【'+get.skillTranslation(name,this)+'】');
}
else{
game.log(this,'发动了','【'+get.translation(name)+'】');
game.log(this,'发动了','【'+get.skillTranslation(name,this)+'】');
}
}
if(nature!=false){
@ -15447,7 +15447,7 @@
if(info.popup!=false&&!info.direct){
if(info.popup){
player.popup(info.popup);
game.log(player,'发动了','【'+get.translation(event.skill)+'】');
game.log(player,'发动了','【'+get.skillTranslation(event.skill,player)+'】');
}
else{
player.logSkill(event.skill);
@ -21839,6 +21839,9 @@
_status.noupdatec=true;
}
ui.skills=ui.create.control(skills.concat([ui.click.skill]));
for(var i=0;i<ui.skills.childNodes.length;i++){
ui.skills.childNodes[i].innerHTML=get.skillTranslation(ui.skills.childNodes[i].link,_status.event.player);
}
if(!_status.event.isMine()){
ui.skills.style.display='none';
}
@ -21870,6 +21873,9 @@
_status.noupdatec=true;
}
ui.skills2=ui.create.control(skills.concat([ui.click.skill]));
for(var i=0;i<ui.skills2.childNodes.length;i++){
ui.skills2.childNodes[i].innerHTML=get.skillTranslation(ui.skills2.childNodes[i].link,_status.event.player);
}
if(!_status.event.isMine()){
ui.skills2.style.display='none';
}
@ -21901,6 +21907,9 @@
_status.noupdatec=true;
}
ui.skills3=ui.create.control(skills.concat([ui.click.skill]));
for(var i=0;i<ui.skills3.childNodes.length;i++){
ui.skills3.childNodes[i].innerHTML=get.skillTranslation(ui.skills3.childNodes[i].link,_status.event.player);
}
if(!_status.event.isMine()){
ui.skills3.style.display='none';
}
@ -25940,6 +25949,17 @@
if(card.parentNode.id=='discardPile') return 'd';
if(card.parentNode.id=='special') return 's';
},
skillTranslation(str,player){
if(str.indexOf('re')==0&&player){
var str2=str.slice(2);
if(lib.translate[str]==lib.translate[str2]){
if(player.hasSkill(str2)){
return '新'+lib.translate[str];
}
}
}
return get.translation(str);
},
translation:function(str,arg){
if(str&&typeof str=='object'&&str.name){
var str2;
@ -26287,13 +26307,7 @@
else{
opacity='';
}
var skilltrans=get.translation(skills[i]);
if(skilltrans&&skilltrans.length==3&&skilltrans[0]=='新'){
skilltrans=skilltrans.slice(1);
}
else{
skilltrans=skilltrans.slice(0,2);
}
var skilltrans=get.translation(skills[i]).slice(0,2);
str+='<div class="skill" style="'+opacity+
'">【'+skilltrans+'】</div><div style="'+opacity+'">'+
lib.translate[skills[i]+'_info']+'</div><div style="display:block;height:10px"></div>';
@ -26430,13 +26444,7 @@
for(i=0;i<skills.length;i++){
if(lib.skill[skills[i]]&&lib.skill[skills[i]].nopop) continue;
if(lib.translate[skills[i]+'_info']){
translation=get.translation(skills[i]);
if(translation.length==3&&translation[0]=='新'){
translation=translation.slice(1);
}
else{
translation=translation.slice(0,2);
}
translation=get.translation(skills[i]).slice(0,2);
if(!skills2.contains(skills[i])){
uiintro.add('<div style="opacity:0.5"><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
}
@ -26706,13 +26714,7 @@
var skills=infoitem[3];
for(i=0;i<skills.length;i++){
if(lib.translate[skills[i]+'_info']){
translation=get.translation(skills[i]);
if(translation.length==3&&translation[0]=='新'){
translation=translation.slice(1);
}
else{
translation=translation.slice(0,2);
}
translation=get.translation(skills[i]).slice(0,2);
uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
}
}