YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #801 from mengxinzxz/PR-Branch 

bugfix
This commit is contained in:
Spmario233 2024-01-16 22:17:09 +08:00 committed by GitHub
parent 7b10bcd1cc 5979d4eea0
commit 3957168cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
character/tw.js
View File

@ -77,7 +77,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
tw_madai:['male','shu',4,['mashu','twqianxi']],
tw_niujin:['male','wei',4,['twcuorui','twliewei']],
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_yl_luzhi:['male','qun',3,['twmingren','twzhenliang']],
tw_liuzhang:['male','qun',3,['jutu','twyaohu','rehuaibi']],
@ -6240,7 +6240,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
trigger:{global:['roundStart','dying']},
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);
},
filter:function(event,player){
@ -6269,18 +6269,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
subSkill:{
update:{
trigger:{
player:['loseAfter','loseAsyncAfter','addToExpansionAfter'],
trigger:{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,
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(){
lib.skill.twpingting.init(player,'twpingting');
}

39
character/xianding.js
View File

@ -20,7 +20,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dc_sp_machao:['male','qun',4,['zhuiji','dc_olshichou']],
old_huangfusong:['male','qun',4,['xinfenyue']],
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']],
sunlingluan:['female','wu',3,['dclingyue','dcpandi']],
dc_wangjun:['male','qun',4,['dctongye','dcchangqu']],
@ -1333,6 +1333,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return ui.cardPile.childNodes.length+ui.discardPile.childNodes.length>=count;
},
frequent:true,
locked:false,
content:function(){
var num=player.hasSkill('dczhangcai_all')?get.number(trigger.card):8;
var count=1;
@ -1662,33 +1663,29 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
},
},
dcluoyan: {
derivation: ['retianxiang', 'liuli'],
init: function (player) {
if (player.getStorage('dcxingwu').length) player.addAdditionalSkill('dcluoyan', ['retianxiang_daxiaoqiao', 'liuli_daxiaoqiao']);
dcluoyan:{
derivation:['retianxiang','liuli'],
init:function(player){
if(player.getExpansions('dcxingwu').length) player.addAdditionalSkill('dcluoyan',['retianxiang','liuli']);
else player.removeAdditionalSkill('dcluoyan');
},
onremove: function (player) {
onremove:function(player){
player.removeAdditionalSkill('dcluoyan');
},
trigger: {
player: ['loseAfter', 'loseAsyncAfter', 'addToExpansionAfter'],
trigger:{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) {
var cards = player.getExpansions('dcxingwu'), skills = player.additionalSkills.dcluoyan;
if ((cards.length && skills && skills.length) || (!cards.length && (!skills || !skills.length))) {
return false;
}
return true;
},
forced: true,
content: function () {
lib.skill.dcluoyan.init(player, 'dcluoyan');
forced:true,
silent:true,
content:function(){
lib.skill.dcluoyan.init(player,'dcluoyan');
},
},
retianxiang_daxiaoqiao: {
audio: 'tianxiang_daxiaoqiao',
inherit: 'retianxiang',
retianxiang_daxiaoqiao:{
audio:'tianxiang_daxiaoqiao',
inherit:'retianxiang',
},
//田尚衣
dcposuo:{