Merge pull request #251 from mengxinzxz/PR-Branch

bug修复+小优化
This commit is contained in:
Spmario233 2023-09-02 19:46:32 +08:00 committed by GitHub
commit 0b6385dc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions

View File

@ -7,15 +7,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sp:{
sp_tianji:["sunhao","liuxie","caoang","hetaihou","sunluyu",'ol_wangrong',"zuofen","ganfuren","ol_bianfuren","qinghegongzhu","tengfanglan","ruiji",'caoxiancaohua'],
sp_sibi:["yangxiu","chenlin","chengyu","shixie","fuwan","wangyun","zhugejin","simalang","maliang","buzhi","dongyun","kanze","sunqian","xizhicai","sunshao",'duxi',"jianggan",'ol_dengzhi','ol_yangyi','ol_dongzhao','ol_chendeng','jin_yanghu','wangyan','xiahouxuan','quhuang','zhanghua','wangguan','sunhong'],
sp_tianzhu:["wutugu","yanbaihu","shamoke","panfeng","zhugedan",'huangzu','gaogan',"tadun","fanjiangzhangda","ahuinan","dongtuna"],
sp_tianzhu:["wutugu","yanbaihu","shamoke","panfeng","zhugedan",'huangzu','gaogan',"tadun","fanjiangzhangda","ahuinan","dongtuna",'ol_wenqin'],
sp_nvshi:["lingju","guanyinping","zhangxingcai","mayunlu","dongbai","zhaoxiang",'ol_zhangchangpu','ol_xinxianying',"daxiaoqiao","jin_guohuai"],
sp_shaowei:["simahui","zhangbao","zhanglu","zhugeguo","xujing","zhangling",'huangchengyan','zhangzhi','lushi'],
sp_huben:['duanjiong','ol_mengda',"caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","huojun",'zhaoyǎn','dengzhong','ol_furong','macheng','ol_zhangyì','ol_zhujun','maxiumatie','luoxian','ol_wenqin'],
sp_huben:['duanjiong','ol_mengda',"caohong","xiahouba","zhugeke","zumao","wenpin","litong","mazhong","heqi","quyi","luzhi","zangba","yuejin","dingfeng","wuyan","ol_zhuling","tianyu","huojun",'zhaoyǎn','dengzhong','ol_furong','macheng','ol_zhangyì','ol_zhujun','maxiumatie','luoxian','ol_huban','haopu'],
sp_liesi:['mizhu','weizi','ol_liuba','zhangshiping'],
sp_default:["sp_diaochan","sp_zhaoyun","sp_sunshangxiang","sp_caoren","sp_jiangwei","sp_machao","sp_caiwenji","jsp_guanyu","jsp_huangyueying","sp_pangde","sp_jiaxu","yuanshu",'sp_zhangliao','sp_ol_zhanghe','sp_menghuo','ol_puyuan','ol_wenqin'],
sp_waitforsort:['ol_huban','haopu'],
sp_default:["sp_diaochan","sp_zhaoyun","sp_sunshangxiang","sp_caoren","sp_jiangwei","sp_machao","sp_caiwenji","jsp_guanyu","jsp_huangyueying","sp_pangde","sp_jiaxu","yuanshu",'sp_zhangliao','sp_ol_zhanghe','sp_menghuo'],
sp_waitforsort:[],
sp_qifu:["caoying",'panshu',"caochun","yuantanyuanshang",'caoshuang','wolongfengchu','guansuo','baosanniang','fengfangnv','jin_zhouchu'],
sp_wanglang:['ol_wanglang'],
sp_wanglang:['ol_wanglang','ol_puyuan','ol_zhouqun'],
sp_zhongdan:["cuiyan","huangfusong"],
sp_guozhan2:["sp_dongzhuo","liqueguosi","zhangren"],
//sp_single:["niujin"],
@ -24179,7 +24179,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
olbihun:'弼昏',
olbihun_info:'锁定技。当你使用牌指定其他角色为目标时若你的手牌数大于手牌上限且若此牌的目标数大于1取消此目标为1其获得此牌。',
olchuanwu:'穿屋',
olchuanwu_info:'锁定技。当你造成或受到伤害后你令武将牌上的前X个未失效的技能失效直到回合结束。然后你摸等同于你此次失效的技能数张牌X为你的攻击范围。',
olchuanwu_info:'锁定技。当你造成或受到伤害后你令武将牌上的前X个技能失效直到回合结束。然后你摸等同于你此次失效的技能数张牌X为你的攻击范围。',
oljianhe:'剑合',
oljianhe_info:'出牌阶段每名角色限一次。你可以重铸至少两张同名牌或至少两张装备牌然后令一名角色选择一项1.重铸等量张与你以此法重铸的牌类型相同的牌2.受到你造成的1点雷电伤害。',
dongtuna:'董荼那',
@ -24277,7 +24277,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
sp_liesi:'列肆·豪商巨贾',
sp_default:"天同·同名异势",
sp_qifu:'灯愿·祈福武将',
sp_wanglang:'八萬·饶舌凤鹛',
sp_wanglang:'OL·限定专属',
sp_zhongdan:"忠胆英杰",
sp_guozhan:"国战",
sp_guozhan2:"国战移植",

View File

@ -97,8 +97,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var player=event.player;
var evtx=event.getParent('phaseUse');
var suits=lib.suit.slice(0).reverse();
suits=suits.filter(suit=>!player.getStorage('dcposuo_suits').contains(suit));
if(!suits.length||!player.countCards('hs',card=>suits.contains(get.suit(card,player)))||player.getHistory('sourceDamage',evt=>{
suits=suits.filter(suit=>!player.getStorage('dcposuo_suits').contains(suit)&&player.countCards('hs',card=>get.suit(card,player)==suit));
if(!suits.length||player.getHistory('sourceDamage',evt=>{
return evt.player!=player&&evt.getParent('phaseUse')==evtx;
}).length) event.set('dcposuo_cards',undefined);
else{
@ -160,7 +160,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
precontent:function(){
player.logSkill('dcposuo');
delete event.result.skill;
player.addTempSkill('dcposuo_suits');
player.addTempSkill('dcposuo_suits','phaseUseAfter');
player.markAuto('dcposuo_suits',[get.suit(event.result.cards[0])]);
},
}

View File

@ -1304,7 +1304,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
event.target=target;
target.addTempSkill('gzyechou_unsavable');
player.useCard({name:'sha',isCard:true},target).set('forceDie',true).set('oncard',function(){
_status.event.directHit.add(game.filterPlayer());
_status.event.directHit.addArray(game.filterPlayer());
});
'step 1'
player.addTempSkill('gzyechou_unequip');
@ -1536,7 +1536,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
//毌丘俭
gzzhengrong:{
audio:'drlt_zhengrong',
audio:'drlt_zhenrong',
trigger:{
source:'damageBegin3',
player:['damageBegin1','chooseJunlingForBegin'],
@ -15699,7 +15699,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
delete source.shijun;
}
else if(source&&source.identity!='unknown'){
if(source.identity=='ye') source.draw(3);
if(source.identity=='ye'&&!source.getStorage('yexinjia_friend').length) source.draw(3);
else if(source.shijun2){
delete source.shijun2;
source.draw(1+game.countPlayer(function(current){