From d73ab8cb9501d9bb11dfda043850028c5ee5ca91 Mon Sep 17 00:00:00 2001 From: mengxinzxz <139629761+mengxinzxz@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B9=E7=BE=B2=E3=80=90=E5=88=9A=E8=BF=B0?= =?UTF-8?q?=E3=80=91=E5=8A=A0=E5=9B=9E5=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E3=80=90=E5=88=9A=E8=BF=B0=E3=80=91?= =?UTF-8?q?markcount=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/sp.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/character/sp.js b/character/sp.js index 52a61508d..ced27a3a9 100755 --- a/character/sp.js +++ b/character/sp.js @@ -1971,24 +1971,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }).set('choice',function(){ var info=lib.skill.olgangshu.getInfo(player); if(info[1]==0) return 1; - if(player.hasCard(card=>{ + if(info[2]<5&&player.hasCard(card=>{ return get.name(card)=='sha'&&player.hasValueTarget(card); },'hs')&&!player.getCardUsable('sha')) return 2; - if(!game.hasPlayer(current=>{ + if(info[0]<5&&!game.hasPlayer(current=>{ return player.inRange(current)&&get.effect(current,{name:'sha'},player,player)>0; })) return 0; var rand=Math.random(); - if(rand<0.2) return 0; - if(rand<0.7) return 1; - if(rand<1.0) return 2; - return get.rand(0,2); + var list=[0,1,2].filter(i=>info[i]<5); + if(!list.length) return 'cancel2'; + if(rand<0.2&&list.includes(0)) return 0; + if(rand<0.7&&list.includes(1)) return 1; + if(rand<1.0&&list.includes(2)) return 2; + return list.randomGet(); }()); 'step 1' if(result.control!='cancel2'){ player.logSkill('olgangshu'); player.addSkill('olgangshu_buff'); var info=lib.skill.olgangshu.getInfo(player); - info[result.index]=info[result.index]+1; + info[result.index]=Math.min(5,info[result.index]+1); game.log(player,'的',result.control.slice(0,result.control.indexOf('(')),'#y+1'); player.markSkill('olgangshu_buff'); } @@ -2026,7 +2028,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, mark:true, intro:{ - markcount:()=>0, + markcount:function(storage,player){ + var info=lib.skill.olgangshu.getInfo(player); + var str=''; + info.forEach(num=>str+=parseFloat(num)); + return str; + }, content:function(storage,player){ var info=lib.skill.olgangshu.getInfo(player); var str=''; @@ -26389,7 +26396,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ olrunwei_info:'其他角色的弃牌阶段开始时，若其已受伤，则你可以选择一项：①令其弃置一张牌，其本回合手牌上限+1；②令其摸一张牌，其本回合手牌上限-1。', caoxi:'曹羲', olgangshu:'刚述', - olgangshu_info:'①当你使用非基本牌结算结束后，你可以令以下一项数值+1：1.攻击范围；2.受〖刚述〗影响的下个摸牌阶段摸牌数；3.使用【杀】的次数上限。②当有牌被你抵消后，重置你〖刚述①〗增加的所有数值。', + olgangshu_info:'①当你使用非基本牌结算结束后，你可以令以下一项数值+1（每项至多加至5）：1.攻击范围；2.受〖刚述〗影响的下个摸牌阶段摸牌数；3.使用【杀】的次数上限。②当有牌被你抵消后，重置你〖刚述①〗增加的所有数值。', oljianxuan:'谏旋', oljianxuan_info:'当你受到伤害后，你可以令一名角色摸一张牌，然后若其手牌数等于你〖刚述①〗中的任意一项对应的数值，其重复此流程。', ol_pengyang:'OL彭羕',