From c0a70afc81bb1fbe22d233c015805655e374e13a Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Mon, 5 Jun 2023 00:08:29 +0800 Subject: [PATCH] jsrg_xushao --- character/diy.js | 1 + character/offline.js | 200 ++++++++++++++++++++++++++++++++++++++++++- game/game.js | 75 +++++++++++++--- 3 files changed, 262 insertions(+), 14 deletions(-) diff --git a/character/diy.js b/character/diy.js index 5ffa2854f..fcafdecc0 100755 --- a/character/diy.js +++ b/character/diy.js @@ -17863,6 +17863,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ saya_nodis:'破围', //〖破围〗不会因为〖铁骑〗无效 inari_baiwei:'摆尾', + inari_baiwei_draw:'摆尾', inari_baiwei_info:'你可以将一张♦牌当做任意基本牌使用或打出。此牌结算完成后，你摸一张牌。', //你不能以此法使用【毒】 inari_baiwei_backup:'摆尾', diff --git a/character/offline.js b/character/offline.js index 0e3206fde..b68de5a95 100644 --- a/character/offline.js +++ b/character/offline.js @@ -21,7 +21,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ jsrg_hejin:['male','qun',4,['jsrgzhaobing','jsrgzhuhuan','jsrgyanhuo']], jsrg_sunjian:['male','qun',4,['jsrgpingtao','jsrgjuelie']], jsrg_huangfusong:['male','qun',4,['jsrgguanhuo','jsrgjuxia']], - jsrg_xushao:['male','qun',3,['jsrgyingmen','jsrgpingjian'],['unseen']], + jsrg_xushao:['male','qun',3,['sbyingmen','sbpingjian']], jsrg_dongbai:['female','qun',3,['jsrgshichong','jsrglianzhu']], jsrg_qiaoxuan:['male','qun',3,['jsrgjuezhi','jsrgjizhao']], jsrg_yangbiao:['male','qun','3/4',['jsrgzhaohan','jsrgrangjie','jsrgyizheng']], @@ -149,8 +149,202 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, }, + characterFilter:{ + jsrg_xushao:function(mode){ + return mode!='guozhan'; + }, + }, skill:{ //江山如故·起 + sbyingmen:{ + forbid:['guozhan'], + trigger:{ + global:'phaseBefore', + player:'enterGame', + }, + forced:true, + filter:function(event,player){ + return event.name!='phase'||game.phaseNumber==0; + }, + content:function(){ + if(!_status.characterlist) lib.skill.pingjian.initList(); + var characters=_status.characterlist.randomRemove(4); + lib.skill.sbyingmen.addVisitors(characters,player); + game.delayx(); + }, + group:'sbyingmen_reload', + subSkill:{ + reload:{ + trigger:{player:'phaseBegin'}, + forced:true, + locked:false, + filter:function(event,player){ + return player.getStorage('sbyingmen').length<4; + }, + content:function(){ + if(!_status.characterlist) lib.skill.pingjian.initList(); + var characters=_status.characterlist.randomRemove(4-player.getStorage('sbyingmen').length); + lib.skill.sbyingmen.addVisitors(characters,player); + game.delayx(); + }, + }, + }, + getSkills:function(characters,player){ + var skills=[]; + for(var name of characters){ + if(Array.isArray(lib.character[name])){ + for(var skill of lib.character[name][3]){ + var list=get.skillCategoriesOf(skill,player); + list.remove('锁定技'); + if(list.length>0) continue; + var info=get.info(skill); + if(info&&(!info.unique||info.gainable)) skills.add(skill); + } + } + } + return skills; + }, + addVisitors:function(characters,player){ + player.addSkillBlocker('sbyingmen'); + game.log(player,'将','#y'+get.translation(characters),'加入了','#g“访客”') + lib.skill.rehuashen.drawCharacter(player,characters); + player.markAuto('sbyingmen',characters) + var storage=player.getStorage('sbyingmen'); + var skills=lib.skill.sbyingmen.getSkills(storage,player); + player.addInvisibleSkill(skills); + }, + removeVisitors:function(characters,player){ + var skills=lib.skill.sbyingmen.getSkills(characters,player); + var characters2=player.getStorage('sbyingmen').slice(0); + characters2.removeArray(characters); + skills.removeArray(lib.skill.sbyingmen.getSkills(characters2,player)); + player.unmarkAuto('sbyingmen',characters); + _status.characterlist.addArray(characters); + player.removeInvisibleSkill(skills); + }, + onremove:function(player,skill){ + lib.skill.sbyingmen.removeVisitors(player.getSkills('sbyingmen'),player); + player.removeSkillBlocker('sbyingmen'); + }, + skillBlocker:function(skill,player){ + if(!player.invisibleSkills.contains(skill)||skill=='sbpingjian'||skill=='sbpingjian') return false; + return !player.hasSkill('sbpingjian'); + }, + marktext:'客', + intro:{ + name:'访客', + mark:function(dialog,storage,player){ + if(!storage||!storage.length) return '当前没有“访客”'; + dialog.addSmall([storage,'character']); + var skills=lib.skill.sbyingmen.getSkills(storage,player); + if(skills.length) dialog.addText('
  • 当前可用技能：'+get.translation(skills),false); + }, + }, + }, + sbpingjian:{ + trigger:{player:['useSkillAfter','logSkill']}, + forced:true, + filter:function(event,player){ + var skill=event.sourceSkill||event.skill; + return player.invisibleSkills.contains(skill)&&lib.skill.sbyingmen.getSkills(player.getStorage('sbyingmen'),player).contains(skill); + }, + content:function(){ + 'step 0' + var visitors=player.getStorage('sbyingmen').slice(0); + var drawers=visitors.filter(function(name){ + return Array.isArray(lib.character[name])&&lib.character[name][3].contains(trigger.sourceSkill); + }); + event.drawers=drawers; + if(visitors.length==1) event._result={bool:true,links:visitors}; + else{ + var dialog=['评鉴：请选择移去一张“访客”']; + if(drawers.length) dialog.push('
    如果移去'+get.translation(drawers)+'，则你摸一张牌
    '); + dialog.push([visitors,'character']); + player.chooseButton(dialog,true); + } + 'step 1' + if(result.bool){ + lib.skill.sbyingmen.removeVisitors(result.links,player); + game.log(player,'移去了','#y'+get.translation(result.links[0])); + if(event.drawers.contains(result.links[0])) player.draw(); + } + }, + group:'sbpingjian_trigger', + subSkill:{ + trigger:{ + trigger:{player:'triggerInvisible'}, + forced:true, + forceDie:true, + popup:false, + priority:10, + filter:function(event,player){ + if(event.revealed) return false; + var skills=lib.skill.sbyingmen.getSkills(player.getStorage('sbyingmen'),player); + game.expandSkills(skills); + return skills.contains(event.skill); + }, + content:function(){ + "step 0" + if(get.info(trigger.skill).silent){ + event.finish(); + } + else{ + var info=get.info(trigger.skill); + var event=trigger,trigger=event._trigger; + var str; + var check=info.check; + if(info.prompt) str=info.prompt; + else{ + if(typeof info.logTarget=='string'){ + str=get.prompt(event.skill,trigger[info.logTarget],player); + } + else if(typeof info.logTarget=='function'){ + var logTarget=info.logTarget(trigger,player); + if(get.itemtype(logTarget).indexOf('player')==0) str=get.prompt(event.skill,logTarget,player); + } + else{ + str=get.prompt(event.skill,null,player); + } + } + if(typeof str=='function'){str=str(trigger,player)} + var next=player.chooseBool('评鉴：'+str); + next.set('yes',!info.check||info.check(trigger,player)); + next.set('hsskill',event.skill); + next.set('forceDie',true); + next.set('ai',function(){ + return _status.event.yes; + }); + if(typeof info.prompt2=='function'){ + next.set('prompt2',info.prompt2(trigger,player)); + } + else if(typeof info.prompt2=='string'){ + next.set('prompt2',info.prompt2); + } + else if(info.prompt2!=false){ + if(lib.dynamicTranslate[event.skill]) next.set('prompt2',lib.dynamicTranslate[event.skill](player,event.skill)); + else if(lib.translate[event.skill+'_info']) next.set('prompt2',lib.translate[event.skill+'_info']); + } + if(trigger.skillwarn){ + if(next.prompt2){ + next.set('prompt2',''+trigger.skillwarn+'。'+next.prompt2); + } + else{ + next.set('prompt2',trigger.skillwarn); + } + } + } + "step 1" + if(result.bool){ + trigger.revealed=true; + } + else{ + trigger.untrigger(); + trigger.cancelled=true; + } + } + }, + }, + }, jsrgchaozheng:{ audio:2, trigger:{player:'phaseZhunbeiBegin'}, @@ -8286,6 +8480,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ jsrgxundao_info:'当你的判定牌生效前，你可以令至多两名角色依次弃置一张牌，然后你选择一张以此法弃置且位于弃牌堆中的牌代替此判定牌。', jsrglinghua:'灵化', jsrglinghua_info:'①准备阶段，你可以进行目标角色为你的【闪电】的特殊的使用流程。若你未因此受到伤害，你可以令一名角色回复1点体力。②结束阶段，你可以进行目标角色为你且判定效果反转的【闪电】的特殊的使用流程。若你未因此受到伤害，你可以对一名角色造成1点雷电伤害。', + sbyingmen:'盈门', + sbyingmen_info:'锁定技。①游戏开始时，你将武将牌堆中随机四张武将牌置于你的武将牌上，称为“访客”。②回合开始时，若你的“访客”数小于4，你随机从武将牌堆中将“访客”补至四张。', + sbpingjian:'评鉴', + sbpingjian_info:'你可以于满足你“访客”上的一个无技能标签或仅有锁定技标签的技能条件的时机发动此技能，然后你选择移去一张“访客”。若移去的是本次发动技能的“访客”，你摸一张牌。', offline_star:'桌游志·SP', offline_sticker:'桌游志·贴纸', diff --git a/game/game.js b/game/game.js index c514580fa..1ede1b474 100644 --- a/game/game.js +++ b/game/game.js @@ -12058,7 +12058,9 @@ if(!fullskills.contains(event.skill)){ var info=get.info(event.skill); var hidden=player.hiddenSkills.slice(0); + var invisible=player.invisibleSkills.slice(0); game.expandSkills(hidden); + game.expandSkills(invisible); if(hidden.contains(event.skill)){ if(!info.silent&&player.hasSkillTag('nomingzhi',false,null,true)){ event.finish(); @@ -12070,6 +12072,14 @@ event.skillHidden=true; } } + else if(invisible.contains(event.skill)){ + if(!info.direct){ + event.trigger('triggerInvisible'); + } + else{ + event.skillHidden=true; + } + } else{ var keep=false; for(var i in player.additionalSkills){ @@ -15799,7 +15809,7 @@ player.markSkill(roundname); } var name=event.skill; - var players=player.getSkills(null,false,false); + var players=player.getSkills(false,false,false); var equips=player.getSkills('e'); var global=lib.skill.global.slice(0); var logInfo={ @@ -15808,14 +15818,14 @@ event:_status.event, }; if(info.sourceSkill){ - logInfo.sourceSkill=name; - if(global.contains(name)){ + logInfo.sourceSkill=info.sourceSkill; + if(global.contains(info.sourceSkill)){ logInfo.type='global'; } - else if(players.contains(name)){ + else if(players.contains(info.sourceSkill)){ logInfo.type='player'; } - else if(equips.contains(name)){ + else if(equips.contains(info.sourceSkill)){ logInfo.type='equip'; } } @@ -19540,6 +19550,7 @@ skills.add(i); } if(arg2) skills.addArray(this.hiddenSkills); + if(arg2===false||arg2=='invisible') skills.addArray(this.invisibleSkills); if(arg3!==false) skills.addArray(es); for(var i in this.forbiddenSkills){ skills.remove(i); @@ -22294,7 +22305,7 @@ } if(info){ var player=this; - var players=player.getSkills(null,false,false); + var players=player.getSkills(false,false,false); var equips=player.getSkills('e'); var global=lib.skill.global.slice(0); var logInfo={ @@ -22303,14 +22314,14 @@ event:_status.event, }; if(info.sourceSkill){ - logInfo.sourceSkill=name; - if(global.contains(name)){ + logInfo.sourceSkill=info.sourceSkill; + if(global.contains(info.sourceSkill)){ logInfo.type='global'; } - else if(players.contains(name)){ + else if(players.contains(info.sourceSkill)){ logInfo.type='player'; } - else if(equips.contains(name)){ + else if(equips.contains(info.sourceSkill)){ logInfo.type='equip'; } } @@ -23011,6 +23022,41 @@ this.popup(skill); game.log(this,'获得了技能','#g【'+get.translation(skill)+'】'); }, + addInvisibleSkill:function(skill){ + if(Array.isArray(skill)){ + for(var i=0;i