From 9b14281bd7fa8662d242d23d9aa38931569d94bd Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 21:52:56 +0800 Subject: [PATCH 01/27] Add files via upload --- character/jsrg.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/jsrg.js b/character/jsrg.js index 628d6cc20..c3b8a234e 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -3792,6 +3792,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sbpingjian:{ trigger:{player:['useSkill','logSkillBegin']}, forced:true, + locked:false, 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); From 51f93c095d33f6afe1bae58b4059ddf73540aa73 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:01:48 +0800 Subject: [PATCH 02/27] Add files via upload --- character/shiji.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/shiji.js b/character/shiji.js index 7845bbdbc..0db7de662 100644 --- a/character/shiji.js +++ b/character/shiji.js @@ -3151,7 +3151,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ qingyu:{ audio:3, dutySkill:true, - locked:true, + locked:false, group:['qingyu_achieve','qingyu_fail','qingyu_defend'], subSkill:{ defend:{ From 203b6e56937dcead4c5233a2cf0ccb7dac264480 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:04:10 +0800 Subject: [PATCH 03/27] Add files via upload --- character/clan.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/clan.js b/character/clan.js index 706833aee..ecfcd46e3 100644 --- a/character/clan.js +++ b/character/clan.js @@ -272,6 +272,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return get.cardNameLength(event.card)==player.getHistory('useCard').indexOf(event.getParent())+1; }, direct:true, + locked:false, content:function(){ 'step 0' var num=get.cardNameLength(trigger.card); From 061a24d76fa0c0c516f78d7f4db0e44635b5a3f6 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:07:05 +0800 Subject: [PATCH 04/27] Add files via upload --- character/tw.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/tw.js b/character/tw.js index 9c7ac9621..083235e4b 100644 --- a/character/tw.js +++ b/character/tw.js @@ -457,6 +457,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return event.hasNature(); }, forced:true, + locked:false, content:function(){ 'step 0' if(event.triggername=='damageBegin2'){ From 2d5e9bfca1f2ad085d1d0363115ad4f7cbf2a873 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:17:26 +0800 Subject: [PATCH 05/27] Add files via upload --- character/sb.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/sb.js b/character/sb.js index a44b548af..63b97f8cd 100644 --- a/character/sb.js +++ b/character/sb.js @@ -4446,6 +4446,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ sbzhiheng:{ audio:2, audioname:['shen_caopi'], + locked:false, mod:{ aiOrder:function(player,card,num){ if(num<=0||get.itemtype(card)!=='card'||get.type(card)!=='equip') return num; From a0f647df882db07c40f74280361621db9051c22f Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:37:28 +0800 Subject: [PATCH 06/27] Add files via upload --- mode/guozhan.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mode/guozhan.js b/mode/guozhan.js index 2985b2ef7..884a1310c 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -9080,6 +9080,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, }, + locked:false, audio:"duanliang1", enable:"chooseToUse", filterCard:function(card){ From 829a4e574fc1a59f1ecae867a0a721e390e7dccc Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:50:08 +0800 Subject: [PATCH 07/27] Add files via upload --- mode/guozhan.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mode/guozhan.js b/mode/guozhan.js index 884a1310c..646e27fe9 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -9739,6 +9739,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ return player.hp<=1; }, forced:true, + locked:false, //priority:3, content:function(){ player.addTempSkill('baka_yingzi','phaseAfter'); From 947200d1b19df86c1d86607a1f12695c319c1879 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:57:32 +0800 Subject: [PATCH 08/27] Add files via upload --- mode/guozhan.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mode/guozhan.js b/mode/guozhan.js index 646e27fe9..a71a1fb59 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -10880,6 +10880,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ unique:true, forceunique:true, lordSkill:true, + locked:false, audio:2, derivation:'yuanjiangfenghuotu', mark:true, From 0fa894d66f8abd01d832481a45153076cd3a5343 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:10:17 +0800 Subject: [PATCH 09/27] Add files via upload --- character/shiji.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/shiji.js b/character/shiji.js index 0db7de662..d444df3a7 100644 --- a/character/shiji.js +++ b/character/shiji.js @@ -1260,7 +1260,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ spxizhan:{ audio:4, group:'spxizhan_effect', - locked:true, + locked:false, subSkill:{ spfangzong:{charlotte:true}, effect:{ From 1bb1a340cbe581b417b06d72065f7788989e7f4c Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:10:58 +0800 Subject: [PATCH 10/27] Add files via upload --- character/jsrg.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/jsrg.js b/character/jsrg.js index c3b8a234e..1976ca3b9 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -941,6 +941,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ limited:true, skillAnimation:true, animationColor:'orange', + locked:false, chooseButton:{ dialog:function(event,player){ var list=[]; From d6039eaf515ac27f5eb1b894a7958b8a5caf139b Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:13:08 +0800 Subject: [PATCH 11/27] Add files via upload --- character/sp2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/sp2.js b/character/sp2.js index fd190e554..2a0e61e12 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -627,6 +627,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, }, audio:2, + locked:false, trigger:{player:'phaseUseBegin'}, filter:function(event,player){ return player.countCards('h'); From 45727e4c781f4c03301b4d96b65be061684a0c7b Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:16:17 +0800 Subject: [PATCH 12/27] Add files via upload --- character/xianding.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/xianding.js b/character/xianding.js index 284da0d6f..cf1eba955 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -2168,6 +2168,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }); }, direct:true, + locked:false, content:function(){ 'step 0' var targets=trigger.targets.filter(target=>{ From 7ee2254241c4e72ba36c9b3443c95e878c09d872 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:18:18 +0800 Subject: [PATCH 13/27] Add files via upload --- character/sp.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/sp.js b/character/sp.js index f9224f2e3..e2d1e469f 100755 --- a/character/sp.js +++ b/character/sp.js @@ -13082,6 +13082,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, spweiwu:{ audio:2, + locked:false, enable:'phaseUse', usable:1, viewAs:{ From c15a40d1b3533250d58ae89e2efeff902a8d1f88 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:27:34 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E9=9D=9E=E6=9C=8D=20=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- character/tw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/tw.js b/character/tw.js index 083235e4b..a79e64dc7 100644 --- a/character/tw.js +++ b/character/tw.js @@ -14585,7 +14585,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, dynamicTranslate:{ twfeifu:function(player){ - var str='转换技。'; + var str='锁定技，转换技。'; if(!player.storage.twfeifu) str+=''; str+='阴：当你成为【杀】的唯一目标后；'; if(!player.storage.twfeifu) str+=''; From 78e02d9f0b92f38fe431bf3ba467efd302349096 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:37:17 +0800 Subject: [PATCH 15/27] Add files via upload --- character/tw.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/tw.js b/character/tw.js index a79e64dc7..f6d9a2123 100644 --- a/character/tw.js +++ b/character/tw.js @@ -3559,6 +3559,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'useCardAfter'}, group:['twmibei_mark','twmibei_fail'], forced:true, + locked:false, direct:true, dutySkill:true, derivation:'twmouli', From 027964ef3cc9e6b3d924cf5d5a08680d1ce7688a Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:41:21 +0800 Subject: [PATCH 16/27] Add files via upload --- character/tw.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/tw.js b/character/tw.js index f6d9a2123..eb7467129 100644 --- a/character/tw.js +++ b/character/tw.js @@ -1381,6 +1381,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if (get.tag(card, 'damage') > 0 && target.storage.twchongwangx.contains(player)) return false; }, }, + locked:false, unique: true, onremove: true, global: 'twchongwang_global', From 24e17def7cc64ae91be0f875a494b2157eb4646c Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:47:11 +0800 Subject: [PATCH 17/27] Add files via upload --- character/jsrg.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/jsrg.js b/character/jsrg.js index 1976ca3b9..89ab19fe5 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -1321,6 +1321,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return (player.countCards('h')==0)^player.hasSkill('jsrgmanjuan_in'); }, forced:true, + locked:false, firstDo:true, silent:true, content:function(){ From a77c0d82908ce164f433c7f3810813a00f297c80 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Tue, 5 Dec 2023 23:56:09 +0800 Subject: [PATCH 18/27] Add files via upload --- character/sp2.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/sp2.js b/character/sp2.js index 2a0e61e12..6a31b8876 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -531,6 +531,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio: 'juexiang', trigger: { player: 'die' }, forced: true, + locked:false, forceDie: true, skillAnimation: true, animationColor: 'water', From 7bc8b63ec48315e47998a938b1cff90a595e1cbe Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:00:22 +0800 Subject: [PATCH 19/27] Add files via upload --- character/shiji.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/shiji.js b/character/shiji.js index d444df3a7..1a1b524e7 100644 --- a/character/shiji.js +++ b/character/shiji.js @@ -2715,6 +2715,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'useCardAfter'}, dutySkill:true, forced:true, + locked:false, direct:true, filter:function(event,player){ if(!player.storage.xingqi||!player.storage.xingqi.length) return false; From 479894257154ecc602029f22f23353b7c19a6f50 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:06:23 +0800 Subject: [PATCH 20/27] Add files via upload --- character/xianding.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/xianding.js b/character/xianding.js index cf1eba955..ed3f2cacb 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -924,6 +924,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return !player.hasMark('dccaixia_clear'); }, direct:true, + locked:false, content:function(){ 'step 0' var choices=Array.from({length:Math.min(5,game.players.length+game.dead.length)}).map((_,i)=>get.cnNumber(i+1,true)); From a4809a858757672d91ec9dadcc13ade0183bf7b8 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:09:12 +0800 Subject: [PATCH 21/27] Add files via upload --- character/refresh.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/refresh.js b/character/refresh.js index 98cb6c6ad..9d7c88453 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -8680,6 +8680,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(player.getEquips(3).length>0||player.getEquips(4).length>0) return Infinity; }, }, + locked:false, enable:'phaseUse', usable:1, position:'he', From 842876b7373b45a9e575cbb7f2c3bc8bc129fca5 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:14:38 +0800 Subject: [PATCH 22/27] Add files via upload --- character/shiji.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/character/shiji.js b/character/shiji.js index 1a1b524e7..198d02778 100644 --- a/character/shiji.js +++ b/character/shiji.js @@ -2134,7 +2134,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ rechuhai:{ audio:'chuhai', dutySkill:true, - locked:true, + locked:false, group:['rechuhai_add','rechuhai_achieve','rechuhai_fail','rechuhai_chuhai'], derivation:'zhangming', subSkill:{ From cb6adfdd9ca42f180b8b0f4b07464c69fcabc8b5 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:17:17 +0800 Subject: [PATCH 23/27] Add files via upload --- character/jsrg.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/jsrg.js b/character/jsrg.js index 89ab19fe5..f3fce0c24 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -1712,6 +1712,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, jsrgrihui:{ audio:'dcrihui', + locked:false, trigger:{source:'damageSource'}, filter:function(event,player){ return event.getParent().type=='card'&&event.card&&event.card.name=='sha'&&game.hasPlayer(current=>{ From b826c0bb91828c8590fb32b2125dd1196f8742f7 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:18:34 +0800 Subject: [PATCH 24/27] Add files via upload --- character/yijiang.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/yijiang.js b/character/yijiang.js index e890f60a6..7f5f9948b 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -11807,6 +11807,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ miji:{ audio:2, audioname:['re_wangyi'], + locked:false, mod:{ aiOrder:function(player,card,num){ if(num>0&&_status.event&&_status.event.type==='phase'&&get.tag(card,'recover')){ From 129f78e1e5447c0614652689adf82c1efffb1287 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:21:29 +0800 Subject: [PATCH 25/27] Add files via upload --- character/tw.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/tw.js b/character/tw.js index eb7467129..69da7357b 100644 --- a/character/tw.js +++ b/character/tw.js @@ -7662,6 +7662,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return targets.length>=2; }, forced:true, + locked:false, dutySkill:true, skillAnimation:true, animationColor:'wood', From a1db74013b1440246155fe9057c7a228f638b264 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:25:47 +0800 Subject: [PATCH 26/27] Add files via upload --- character/sb.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/sb.js b/character/sb.js index 63b97f8cd..d0069f576 100644 --- a/character/sb.js +++ b/character/sb.js @@ -61,6 +61,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(get.type2(card)=='trick') return true; }, }, + locked:false, getLimit:3, audio:2, enable:'phaseUse', From fd95850b9b158954ab27389a68c8014c7d9b1b45 Mon Sep 17 00:00:00 2001 From: lieren2023 <131325076+lieren2023@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:31:04 +0800 Subject: [PATCH 27/27] Add files via upload --- character/jsrg.js | 1 + 1 file changed, 1 insertion(+) diff --git a/character/jsrg.js b/character/jsrg.js index f3fce0c24..04e8cf0ba 100644 --- a/character/jsrg.js +++ b/character/jsrg.js @@ -2447,6 +2447,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, trigger:{player:'useCard'}, forced:true, + locked:false, filter:function(event,player){ if(player.group!='shu') return false; return game.hasPlayer(current=>{