十周年二乔bugfix,TW/十周年二乔使用tempname机制
This commit is contained in:
parent
7ec6308524
commit
947694c8db
|
@ -77,7 +77,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
tw_madai:['male','shu',4,['mashu','twqianxi']],
|
tw_madai:['male','shu',4,['mashu','twqianxi']],
|
||||||
tw_niujin:['male','wei',4,['twcuorui','twliewei']],
|
tw_niujin:['male','wei',4,['twcuorui','twliewei']],
|
||||||
tw_guanqiujian:['male','wei',3,['twzhengrong','twhongju']],
|
tw_guanqiujian:['male','wei',3,['twzhengrong','twhongju']],
|
||||||
tw_daxiaoqiao:['female','wu',3,['twxingwu','twpingting']],
|
tw_daxiaoqiao:['female','wu',3,['twxingwu','twpingting'],['tempname:daxiaoqiao']],
|
||||||
tw_furong:['male','shu',4,['twxuewei','twliechi']],
|
tw_furong:['male','shu',4,['twxuewei','twliechi']],
|
||||||
tw_yl_luzhi:['male','qun',3,['twmingren','twzhenliang']],
|
tw_yl_luzhi:['male','qun',3,['twmingren','twzhenliang']],
|
||||||
tw_liuzhang:['male','qun',3,['jutu','twyaohu','rehuaibi']],
|
tw_liuzhang:['male','qun',3,['jutu','twyaohu','rehuaibi']],
|
||||||
|
@ -6240,7 +6240,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
audio:2,
|
audio:2,
|
||||||
trigger:{global:['roundStart','dying']},
|
trigger:{global:['roundStart','dying']},
|
||||||
init:function(player,skill){
|
init:function(player,skill){
|
||||||
if(player.getExpansions('twxingwu').length) player.addAdditionalSkill(skill,['tianxiang_daxiaoqiao','liuli_daxiaoqiao']);
|
if(player.getExpansions('twxingwu').length) player.addAdditionalSkill(skill,['tianxiang','liuli']);
|
||||||
else player.removeAdditionalSkill(skill);
|
else player.removeAdditionalSkill(skill);
|
||||||
},
|
},
|
||||||
filter:function(event,player){
|
filter:function(event,player){
|
||||||
|
@ -6269,18 +6269,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
},
|
},
|
||||||
subSkill:{
|
subSkill:{
|
||||||
update:{
|
update:{
|
||||||
trigger:{
|
trigger:{player:['loseAfter','loseAsyncAfter','addToExpansionAfter']},
|
||||||
player:['loseAfter','loseAsyncAfter','addToExpansionAfter'],
|
filter:function(event,player){
|
||||||
|
var cards=player.getExpansions('twxingwu'),skills=player.additionalSkills.twpingting;
|
||||||
|
return !((cards.length&&skills&&skills.length)||(!cards.length&&(!skills||!skills.length)));
|
||||||
},
|
},
|
||||||
forced:true,
|
forced:true,
|
||||||
silent:true,
|
silent:true,
|
||||||
filter:function(event,player){
|
|
||||||
var cards=player.getExpansions('twxingwu'),skills=player.additionalSkills.twpingting;
|
|
||||||
if((cards.length&&skills&&skills.length)||(!cards.length&&(!skills||!skills.length))){
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
content:function(){
|
content:function(){
|
||||||
lib.skill.twpingting.init(player,'twpingting');
|
lib.skill.twpingting.init(player,'twpingting');
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
dc_sp_machao:['male','qun',4,['zhuiji','dc_olshichou']],
|
dc_sp_machao:['male','qun',4,['zhuiji','dc_olshichou']],
|
||||||
old_huangfusong:['male','qun',4,['xinfenyue']],
|
old_huangfusong:['male','qun',4,['xinfenyue']],
|
||||||
dc_xiahouba:['male','shu',4,['rebaobian']],
|
dc_xiahouba:['male','shu',4,['rebaobian']],
|
||||||
dc_daxiaoqiao:['female','wu',3,['dcxingwu','dcluoyan']],
|
dc_daxiaoqiao:['female','wu',3,['dcxingwu','dcluoyan'],['tempname:daxiaoqiao']],
|
||||||
tianshangyi:['female','wei',3,['dcposuo','dcxiaoren']],
|
tianshangyi:['female','wei',3,['dcposuo','dcxiaoren']],
|
||||||
sunlingluan:['female','wu',3,['dclingyue','dcpandi']],
|
sunlingluan:['female','wu',3,['dclingyue','dcpandi']],
|
||||||
dc_wangjun:['male','qun',4,['dctongye','dcchangqu']],
|
dc_wangjun:['male','qun',4,['dctongye','dcchangqu']],
|
||||||
|
@ -1662,33 +1662,29 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
dcluoyan: {
|
dcluoyan:{
|
||||||
derivation: ['retianxiang', 'liuli'],
|
derivation:['retianxiang','liuli'],
|
||||||
init: function (player) {
|
init:function(player){
|
||||||
if (player.getStorage('dcxingwu').length) player.addAdditionalSkill('dcluoyan', ['retianxiang_daxiaoqiao', 'liuli_daxiaoqiao']);
|
if(player.getExpansions('dcxingwu').length) player.addAdditionalSkill('dcluoyan',['retianxiang','liuli']);
|
||||||
else player.removeAdditionalSkill('dcluoyan');
|
else player.removeAdditionalSkill('dcluoyan');
|
||||||
},
|
},
|
||||||
onremove: function (player) {
|
onremove:function(player){
|
||||||
player.removeAdditionalSkill('dcluoyan');
|
player.removeAdditionalSkill('dcluoyan');
|
||||||
},
|
},
|
||||||
trigger: {
|
trigger:{player:['loseAfter','loseAsyncAfter','addToExpansionAfter']},
|
||||||
player: ['loseAfter', 'loseAsyncAfter', 'addToExpansionAfter'],
|
filter:function(event,player){
|
||||||
|
var cards=player.getExpansions('dcxingwu'),skills=player.additionalSkills.dcluoyan;
|
||||||
|
return !((cards.length&&skills&&skills.length)||(!cards.length&&(!skills||!skills.length)));
|
||||||
},
|
},
|
||||||
filter: function (event, player) {
|
forced:true,
|
||||||
var cards = player.getExpansions('dcxingwu'), skills = player.additionalSkills.dcluoyan;
|
silent:true,
|
||||||
if ((cards.length && skills && skills.length) || (!cards.length && (!skills || !skills.length))) {
|
content:function(){
|
||||||
return false;
|
lib.skill.dcluoyan.init(player,'dcluoyan');
|
||||||
}
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
forced: true,
|
|
||||||
content: function () {
|
|
||||||
lib.skill.dcluoyan.init(player, 'dcluoyan');
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
retianxiang_daxiaoqiao: {
|
retianxiang_daxiaoqiao:{
|
||||||
audio: 'tianxiang_daxiaoqiao',
|
audio:'tianxiang_daxiaoqiao',
|
||||||
inherit: 'retianxiang',
|
inherit:'retianxiang',
|
||||||
},
|
},
|
||||||
//田尚衣
|
//田尚衣
|
||||||
dcposuo:{
|
dcposuo:{
|
||||||
|
|
Loading…
Reference in New Issue