diff --git a/character/extra.js b/character/extra.js
index 1be166f7a..7f6c41343 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -753,6 +753,7 @@ game.import("character", function () {
},
direct: true,
changeSeat: true,
+ derivation: "tamo_faq",
async content(event, trigger, player) {
const toSortPlayers = game.filterPlayer((current) => !current.isZhu2());
toSortPlayers.sortBySeat(game.findPlayer2((current) => current.getSeatNum() == 1, true));
@@ -870,7 +871,7 @@ game.import("character", function () {
});
const { result } = await next;
if (!result.bool) return;
- player.logSkill("tamo");
+ await player.logSkill("tamo");
const resultList = result.moved[0].map((info) => {
return parseInt(info.split("|")[0]);
});
@@ -891,6 +892,25 @@ game.import("character", function () {
game.swapSeat(list[0], list[1], false);
}
}, toSwapList);
+ if (trigger.name === "phase" && trigger.player !== toSortPlayers[0] && !trigger._finished) {
+ trigger.finish();
+ trigger._triggered = 5;
+ const evt = toSortPlayers[0].insertPhase();
+ delete evt.skill;
+ const evt2 = trigger.getParent();
+ if (evt2.name == "phaseLoop" && evt2._isStandardLoop) {
+ evt2.player = toSortPlayers[0];
+ }
+ //跳过新回合的phaseBefore
+ evt.pushHandler("onPhase", (event, option) => {
+ if (
+ event.step === 0 &&
+ option.state === "begin"
+ ) {
+ event.step = 1;
+ }
+ });
+ }
await game.asyncDelay();
},
},
@@ -1164,7 +1184,6 @@ game.import("character", function () {
default:
return false;
}
- break;
}
},
forced: true,
@@ -10814,7 +10833,11 @@ game.import("character", function () {
dingzhou_info:
"出牌阶段限一次。你可以将X张牌交给一名场上有牌的角色,然后你获得其场上的所有牌(X为其场上的牌数+1)。",
tamo: "榻谟",
- tamo_info: "游戏开始时,你可以重新分配除主公外所有角色的座次。",
+ tamo_info:
+ "游戏开始时,你可以重新分配除主公外所有角色的座次。",
+ tamo_faq: "FAQ",
+ tamo_faq_info:
+ "