diff --git a/character/onlyOL.js b/character/onlyOL.js index 05c62059e..fa7f4eb9b 100644 --- a/character/onlyOL.js +++ b/character/onlyOL.js @@ -205,8 +205,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ let evt=_status.event; if(evt.name!='chooseToUse') evt=evt.getParent('chooseToUse'); if(!evt||!evt.respondTo||!storage.includes(evt.respondTo[1])) return; - const num=get.number(card); - if(typeof num!='number'||num=get.number(evt.respondTo[1]))) return false; }, }, onremove(player){ @@ -237,7 +237,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, trigger:{global:['loseAfter','equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter']}, filter(event,player){ - if(!player.hasEquipableSlot(1)||player.getEquip('sizhaojian')) return false; + if(!player.hasEquipableSlot(1)||player.getEquip(1)||player.getEquip('sizhaojian')) return false; const card=get.cardPile('sizhaojian','field'); if(!card||!player.canEquip(card,true)) return false; return game.hasPlayer(target=>{ @@ -1025,9 +1025,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ olsbyufeng_block:'思召剑', olsbyufeng_info:'游戏开始时,若【思召剑】未加入本局游戏,若你可装备【思召剑】,则你将【思召剑】置入装备区。', sizhaojian:'思召剑', - sizhaojian_info:'当你使用有点数的【杀】指定目标后,你令目标角色只能使用有点数且点数大于等于此【杀】的【闪】响应此牌。', + sizhaojian_info:'当你使用有点数的【杀】指定目标后,你令目标角色只能使用无点数或点数大于等于此【杀】的【闪】响应此牌。', olsbshishou:'士首', - olsbshishou_info:'主公技,其他群势力角色失去装备区的牌后,若你的装备区中没有【思召剑】,且【思召剑】存在于场上/牌堆/弃牌堆中,其可令你将【思召剑】置入装备区。', + olsbshishou_info:'主公技,其他群势力角色失去装备区的牌后,若你的装备区中没有武器牌,且【思召剑】存在于场上/牌堆/弃牌堆中,其可令你将【思召剑】置入装备区。', onlyOL_yijiang1:'OL专属·将1', onlyOL_yijiang2:'OL专属·将2', diff --git a/character/refresh.js b/character/refresh.js index dd7a787e3..ae6be78ea 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -8922,7 +8922,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{source:'damageBegin1'}, forced:true, audio:'paoxiao', - audioname:['re_zhangfei','guanzhang','xiahouba'], + audioname:['re_zhangfei','guanzhang','xiahouba','re_guanzhang'], filter:function(event,player){ return event.card&&event.card.name=='sha'&&player.countMark('olpaoxiao2')>0; }, diff --git a/character/yijiang.js b/character/yijiang.js index 4f34266ad..3b0e9373b 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -9538,6 +9538,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ group:'fuhun2' }, fuhun2:{ + audio:'fuhun', + audioname:['re_guanzhang'], trigger:{source:'damageSource'}, forced:true, filter:function(event,player){ diff --git a/noname/library/element/player.js b/noname/library/element/player.js index ecc809d94..553bfd1b8 100644 --- a/noname/library/element/player.js +++ b/noname/library/element/player.js @@ -7462,7 +7462,7 @@ export class Player extends HTMLDivElement { const player = this, skills = this.getRemovableAdditionalSkills(skill, target); if(skills.length){ player.removeSkill(skills); - if (player.additionalSkills[skill]&&player.additionalSkills[skill].length) delete player.additionalSkills[skill]; + if (player.additionalSkills[skill]&&!player.additionalSkills[skill].length) delete player.additionalSkills[skill]; } _status.event.clearStepCache(); return this; @@ -7475,7 +7475,7 @@ export class Player extends HTMLDivElement { return '#g【' + get.translation(i) + '】'; })); player.removeSkill(skills); - if (player.additionalSkills[skill]&&player.additionalSkills[skill].length) delete player.additionalSkills[skill]; + if (player.additionalSkills[skill]&&!player.additionalSkills[skill].length) delete player.additionalSkills[skill]; }); } }