From 04480942a31b37a58a96fe13acdfd140cdad9b31 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Fri, 19 Apr 2024 22:55:01 +0800
Subject: [PATCH 01/57] =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=90=E4=B9=89?=
=?UTF-8?q?=E7=83=88=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/mobile.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/character/mobile.js b/character/mobile.js
index eb8d7e132..9b33952ca 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -2442,9 +2442,9 @@ game.import("character", function () {
mbyilie3: {
audio: "mbyilie",
trigger: { player: "phaseEnd" },
- //filter:function(event,player){
- // return player.countMark('mbyilie');
- //},
+ filter: function (event, player) {
+ return player.hasMark('mbyilie');
+ },
forced: true,
content: function () {
"step 0";
@@ -21154,7 +21154,7 @@ game.import("character", function () {
mbyilie2: "义烈",
mbyilie3: "义烈",
mbyilie_info:
- "锁定技。①游戏开始时,你选择一名其他角色,然后你获得以下效果:其受到伤害时,若你没有“烈”,则你获得等同于伤害值的“烈”标记,然后防止此伤害;其对其他角色造成伤害后,你回复1点体力。②结束阶段,你摸一张牌并失去X点体力,然后移去所有“烈”(X为你拥有的“烈”标记数)。",
+ "锁定技。①游戏开始时,你选择一名其他角色,然后你获得以下效果:其受到伤害时,若你没有“烈”,则你获得等同于伤害值的“烈”标记,然后防止此伤害;其对其他角色造成伤害后,你回复1点体力。②结束阶段,若你拥有“烈”标记,你摸一张牌并失去X点体力,然后移去所有“烈”(X为你拥有的“烈”标记数)。",
muludawang: "木鹿大王",
shoufa: "兽法",
shoufa_info:
From e7d94af9b4254675ca25ed7025f0b188b3a63b41 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Fri, 19 Apr 2024 23:08:05 +0800
Subject: [PATCH 02/57] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E5=BC=93?=
=?UTF-8?q?=E9=AA=91=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/refresh.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/character/refresh.js b/character/refresh.js
index 295c285b7..8b8646886 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -8241,7 +8241,7 @@ game.import("character", function () {
cardUsable: function (card, player) {
if (card.name == "sha") {
const suit = get.suit(card);
- return suit === "unsure" || player.storage.xingongji2.includes(suit);
+ if (suit === "unsure" || player.storage.xingongji2.includes(suit)) return Infinity;
}
},
aiOrder: function (player, card, num) {
From 29035c121181fed16a6f1eeeb6155cb92b812af8 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Sat, 20 Apr 2024 12:45:55 +0800
Subject: [PATCH 03/57] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B6=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E7=A5=9E=E9=B2=81=E8=82=83=E6=8A=80=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
character/extra.js | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/character/extra.js b/character/extra.js
index d38d9034e..f1e8dcd0e 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -673,7 +673,7 @@ game.import("character", function () {
return game.hasPlayer((current) => {
if (current == player) return false;
const total = current.countCards("ej");
- return total > 0 && num > total;
+ return total > 0 && num >= total + (get.mode() != "doudizhu" ? 1 : 0);
});
},
filterCard: true,
@@ -682,7 +682,7 @@ game.import("character", function () {
1,
Math.max(
...game.filterPlayer((i) => i != get.player()).map((i) => i.countCards("ej"))
- ) + 1,
+ ) + (get.mode() != "doudizhu" ? 1 : 0),
];
},
check(card) {
@@ -691,10 +691,10 @@ game.import("character", function () {
filterTarget(card, player, target) {
const num = target.countCards("ej");
if (!num) return false;
- return ui.selected.cards.length == num + 1 && player != target;
+ return ui.selected.cards.length == num + (get.mode() != "doudizhu" ? 1 : 0) && player != target;
},
filterOk() {
- return ui.selected.cards.length == ui.selected.targets[0].countCards("ej") + 1;
+ return ui.selected.cards.length == ui.selected.targets[0].countCards("ej") + (get.mode() != "doudizhu" ? 1 : 0);
},
position: "he",
lose: false,
@@ -746,8 +746,9 @@ game.import("character", function () {
filter(event, player) {
return (
(event.name != "phase" || game.phaseNumber == 0) &&
- game.countPlayer((current) => {
- return !current.isZhu2();
+ game.countPlayer(current => {
+ if (get.mode() != "doudizhu") return !current.isZhu2();
+ return current.getSeatNum() != 3;
}) > 1
);
},
@@ -756,15 +757,13 @@ game.import("character", function () {
derivation: "tamo_faq",
async content(event, trigger, player) {
const toSortPlayers = game.filterPlayer((current) => {
- return (
- !current.isZhu2() ||
- get.mode() == "doudizhu" && current.getSeatNum() == 3
- );
+ if (get.mode() != "doudizhu") return !current.isZhu2();
+ return current.getSeatNum() != 3;
});
toSortPlayers.sortBySeat(game.findPlayer2((current) => current.getSeatNum() == 1, true));
const next = player.chooseToMove("榻谟:是否分配" +
- (game.countPlayer() > toSortPlayers.length ?
- "除主公" + (get.mode() == "doudizhu" ? "和三号位外" : "外") : "") +
+ (get.mode() != "doudizhu" ?
+ (game.hasPlayer(cur => cur.isZhu2()) ? "除主公外" : "") : "除三号位外") +
"所有角色的座次?"
);
next.set("list", [
@@ -10842,17 +10841,21 @@ game.import("character", function () {
dingzhou: "定州",
dingzhou_info:
"出牌阶段限一次。你可以将X张牌交给一名场上有牌的角色,然后你获得其场上的所有牌(X为其场上的牌数+1)。",
+ dingzhou_info_doudizhu:
+ "出牌阶段限一次。你可以将X张牌交给一名场上有牌的角色,然后你获得其场上的所有牌(X为其场上的牌数)。",
tamo: "榻谟",
tamo_info:
"游戏开始时,你可以重新分配除主公外所有角色的座次。",
tamo_info_doudizhu:
- "游戏开始时,你可以重新分配除主公和三号位外所有角色的座次。",
+ "游戏开始时,你可以重新分配除三号位外所有角色的座次。",
tamo_faq: "FAQ",
tamo_faq_info:
"
HWt2_!cIfa1_~v@J%EA>`m`~)=~Y(=JwhGW%*hW*yO*J
zl7$jD8+d38rj+u0rS+C4@8lUzD)ML)=GpT8$lRN4F$P!ayxYtVz%qgr$J@;m^qQ!ILE80dXYD{(*dCDJLAQ|*Fj!U
zgu?ZEi~?;uWh?R+Y3i1-g~z}@YftZySiG{{
z?ZYUfP56ODdjIL4RR0#<`$f%XtutAAIFi4>)#p_z
S8%?YE*Ss8eHyTKaznUUnQiR^lDjLOinJ9aqsf?jLxG5noG%i
z^ERd}tO5twmq=L~xqo_UFY7NB-5l=2n#j19(uU5}t6xiBG^z$Gm&MSC%1??ZQDkGp9pm6LS0cA2=j`70Z+%V*P5_fQ51lsywFzfXHywPS;*HdM3I>MO%t
z6<*2)dcp>etl%3T|kNwYXH)?I4vf3)0^zBuGJJl+5GbyGGl=^O~}xFSeJ
zCQnbs1xkWvCM8c1F*{OO3&&rSb{Mhw6{A@6Ydr657%7P$j;qZXw`rU=t^dR27G@ZDPn8u|-fWt(EX9xn41{Bn=gyiwlzrF
gz)AT6`2;vG#(CTNQ)U0CIvs5VR
zM2hjrY+E~I;?^qB)&TA+Fo#3XFpQJ}vAEyeS4%f!{pP)!AtO>eol0n=t9Gfr-px_?
z&i?rdzJj}%-kdD7s@2I+M84dOP;iR@P(4Voz!^LX)?`p@v$9&1U#E((zxC()Gfh5S
z>7enWMAXsgX9PJleE_{i;$MJi3P7F#l}V5&%O4
wr+IO1K+b
zyGVnOwQzjcVx2Izv1t1!XeBbTkQfq>C8wlMMz3O!ZWLE-EaSlY(9}3%kXnLRbwVe7
zHBySCr>??E$p>YaT9ptna~-?p>-6Aq*&mi@8rn9jns8M5vK`h-8lT8XX3Lk&AGuay
z?~&jNp^6JJF$y{mGnhl7Y@s}C>dx4cucjN48}74FSX@>#0r~E>qV6tBOZj4cIHonE
zZVj*`&`9#ppD>PJHfG><;xGo#PqsRbRF+_iz}Lj(^<+6Vu1eCewZ$p=K%O{u6VunS
zt*hT#=2xE%
WPy>Y7S*iSam7gumX!Ej&*
|I)*!#i1><
zzAY8p4kvtep!^tyl3f_sc%_rH3QKtSU-|YNjJz
t9HC8Ik@*p
=iWKvwqI17an(~5x13*AcJJjElpQ%>>d0H4DBD^#eCo*m^M9^A#`!-}
zM}BC