From 0554777aa3699346fec7da4a9d904bb7999152da Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:26:17 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=9B=BA=E5=9B=BD=E5=AE=89=E9=82=A6?= =?UTF-8?q?=EF=BC=8C=E8=BF=9C=E4=BA=A4=E8=BF=91=E6=94=BB=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E5=86=9B=E7=9B=9B=E5=AE=B4=EF=BC=8C=E5=85=8B=E5=A4=8D=E4=B8=AD?= =?UTF-8?q?=E5=8E=9F=E6=B7=BB=E5=8A=A0=E6=97=A0=E6=87=88ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/card/guozhan.js b/card/guozhan.js index afc1a597e..911db1987 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -137,6 +137,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, ai:{ + wuxie:function(target,card,player,viewer){ + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } + }, order:3, value:9, useful:6, @@ -194,6 +203,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, ai:{ + wuxie:function(target,card,player,viewer){ + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } + }, order:6, value:9, useful:6, @@ -697,6 +715,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } }, ai:{ + wuxie:function(target,card,player,viewer){ + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } + }, order:6, value:4, useful:2, @@ -947,6 +974,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ player.draw(3); }, ai:{ + wuxie:function(target,card,player,viewer){ + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } + }, basic:{ useful:4, value:8, From f8253dc700b386feac4e99a3e310daa260f387fd Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:26:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=97=A0=E4=B8=AD=E7=94=9F=E6=9C=89?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E6=87=88ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/standard.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/card/standard.js b/card/standard.js index 07a473079..c795edbd6 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1145,6 +1145,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ target.draw(2); }, ai:{ + wuxie:function(target,card,player,viewer){ + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } + }, basic:{ order:7.2, useful:4.5, From fd8c05bb43dd61b7d8226e06d0ca803c473d1b56 Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:34:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 56 ++++++++++++++++++++++++------------------------ card/standard.js | 14 ++++++------ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/card/guozhan.js b/card/guozhan.js index 911db1987..ff0ac45e7 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -138,13 +138,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, order:3, value:9, @@ -204,13 +204,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, order:6, value:9, @@ -716,13 +716,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, order:6, value:4, @@ -975,13 +975,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, basic:{ useful:4, diff --git a/card/standard.js b/card/standard.js index c795edbd6..1f4f99cf8 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1146,13 +1146,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, basic:{ order:7.2, From 6b491050c51c20f96c4a284f2198f9cc39510a04 Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Thu, 22 Feb 2024 07:24:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 56 ++++++++++++++++++++++++------------------------ card/standard.js | 14 ++++++------ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/card/guozhan.js b/card/guozhan.js index ff0ac45e7..4e30590b4 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -138,13 +138,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, order:3, value:9, @@ -204,13 +204,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, order:6, value:9, @@ -716,13 +716,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, order:6, value:4, @@ -975,13 +975,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, basic:{ useful:4, diff --git a/card/standard.js b/card/standard.js index 1f4f99cf8..1e221dfa6 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1146,13 +1146,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, ai:{ wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(!_status._aozhan){ - if(!player.isMajor()){ - if(!viewer.isMajor()) return 0; - } - } - } + if(get.mode()=='guozhan'){ + if(!_status._aozhan){ + if(!player.isMajor()){ + if(!viewer.isMajor()) return 0; + } + } + } }, basic:{ order:7.2, From 9b567914fd474d5458b9dbebe615d484a4e52c7b Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Thu, 22 Feb 2024 12:37:11 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=AE=E5=8A=9B?= =?UTF-8?q?=E5=90=8C=E5=BF=83=E6=97=A0=E6=87=88ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/card/guozhan.js b/card/guozhan.js index 4e30590b4..3ccc90664 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -622,8 +622,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){ order:7.5, value:4, useful:2, - wuxie:function(){ - return 0; + wuxie:function(target,card,player,viewer){ + if(get.mode()=='guozhan'){ + if(viewer.isFriendOf(player)&&viewer.identity!='ye') return 0; + } }, result:{ target:function(player,target){ From 5c97bbc131c64558387e1e0df99c015544637f41 Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:53:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=88=AE=E5=8A=9B?= =?UTF-8?q?=E5=90=8C=E5=BF=83=E6=97=A0=E6=87=88ai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/card/guozhan.js b/card/guozhan.js index 3ccc90664..f63a4c165 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -622,11 +622,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){ order:7.5, value:4, useful:2, - wuxie:function(target,card,player,viewer){ - if(get.mode()=='guozhan'){ - if(viewer.isFriendOf(player)&&viewer.identity!='ye') return 0; - } - }, result:{ target:function(player,target){ if(get.mode()=='versus'){ From 49f2187d7ffad4a7fd527a617f7e30203d3cb293 Mon Sep 17 00:00:00 2001 From: hadeszoro <160452158+hadeszoro@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:27:06 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=99=8E?= =?UTF-8?q?=E7=A6=BB=E5=B1=B1=E5=92=8C=E5=85=8B=E5=A4=8D=E4=B8=AD=E5=8E=9F?= =?UTF-8?q?order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/guozhan.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/card/guozhan.js b/card/guozhan.js index f63a4c165..083007cb1 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -146,7 +146,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } }, - order:3, + order:4, value:9, useful:6, tag:{ @@ -845,7 +845,16 @@ game.import('card',function(lib,game,ui,get,ai,_status){ target.addTempSkill('diaohulishan'); }, ai:{ - order:10, + order:function(){ + var player=_status.currentPhase; + if(player.hasCard(function(card){ + return get.name(card)=='gz_haolingtianxia'||get.name(card)=='gz_guguoanbang'||get.name(card)=='gz_kefuzhongyuan'||get.name(card)=='wuzhong'||get.name(card)=='yuanjiao'||get.name(card)=='lianjunshengyan'||get.name(card)=='lulitongxin'||get.name(card)=='yiyi'; + })) return 3.5; + if(player.hasCard(function(card){ + return get.name(card)=='taoyuan'; + })) return get.order({name:'taoyuan'})-1; + return 9.5; + }, value:4, useful:[2,1], wuxie:function(){ From 72f9544bc0dd8e09959b75178673cb02f52f5e6c Mon Sep 17 00:00:00 2001 From: Spmario233 Date: Thu, 22 Feb 2024 18:12:19 +0800 Subject: [PATCH 8/8] Update card/guozhan.js --- card/guozhan.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/card/guozhan.js b/card/guozhan.js index 083007cb1..3fa65b1c8 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -845,14 +845,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){ target.addTempSkill('diaohulishan'); }, ai:{ - order:function(){ - var player=_status.currentPhase; + order:function(item, player){ + if(!player) player=get.player(); if(player.hasCard(function(card){ - return get.name(card)=='gz_haolingtianxia'||get.name(card)=='gz_guguoanbang'||get.name(card)=='gz_kefuzhongyuan'||get.name(card)=='wuzhong'||get.name(card)=='yuanjiao'||get.name(card)=='lianjunshengyan'||get.name(card)=='lulitongxin'||get.name(card)=='yiyi'; - })) return 3.5; + return ['gz_haolingtianxia','gz_guguoanbang','gz_kefuzhongyuan','wuzhong','yuanjiao','lianjunshengyan','lulitongxin','yiyi'].includes(get.name(card)); + },'hs')) return 3.5; if(player.hasCard(function(card){ return get.name(card)=='taoyuan'; - })) return get.order({name:'taoyuan'})-1; + },'hs')) return get.order({name:'taoyuan'},player)-1; return 9.5; }, value:4,