禁用卡牌：' + get.translation(lib.configOL.bannedcards));
}
uiintro.style.paddingBottom = "8px";
},
@@ -528,10 +514,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (game.me.name2) {
str += "/" + get.translation(game.me.name2);
}
- var name = [
- str,
- get.translation(_status.mode + 2) + " - " + lib.translate[game.me.identity + "2"],
- ];
+ var name = [str, get.translation(_status.mode + 2) + " - " + lib.translate[game.me.identity + "2"]];
return name;
},
showIdentity: function () {},
@@ -561,7 +544,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
event.videoId = lib.status.videoId++;
var list = [];
for (var i in lib.character) {
- if (lib.filter.characterDisabled(i)) continue;
+ if (lib.filter.characterDisabled2(i, "ignoreForibidden")) continue;
list.push(i);
}
_status.characterlist = list;
@@ -570,28 +553,54 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
};
var dialog = ui.create.characterDialog("heightset", filter).open();
dialog.videoId = event.videoId;
-
+
game.me
.chooseButton(true)
.set("ai", function (button) {
return Math.random();
})
+ .set(
+ "selectButton",
+ (function (choice) {
+ if (choice == "singble") return [1, 2];
+ if (choice == "double") return 2;
+ return 1;
+ })(get.config("double_character"))
+ )
.set("dialog", event.videoId);
"step 4";
- game.me.init(result.links[0]);
- _status.characterlist.remove(result.links[0]);
game.addRecentCharacter(result.links[0]);
+ _status.characterlist.removeArray(result.links);
+ if (result.links.length == 2) {
+ game.me.init(result.links[0], result.links[1]);
+ game.addRecentCharacter(result.links[1]);
+ } else {
+ game.me.init(result.links[0]);
+ }
game.me
.chooseButton(true)
.set("ai", function (button) {
return Math.random();
})
+ .set(
+ "selectButton",
+ (function (choice) {
+ if (choice == "singble") return [1, 2];
+ if (choice == "double") return 2;
+ return 1;
+ })(get.config("double_character"))
+ )
.set("dialog", event.videoId);
"step 5";
game.broadcastAll("closeDialog", event.videoId);
- game.me.next.init(result.links[0]);
- _status.characterlist.remove(result.links[0]);
game.addRecentCharacter(result.links[0]);
+ _status.characterlist.removeArray(result.links);
+ if (result.links.length == 2) {
+ game.me.next.init(result.links[0], result.links[1]);
+ game.addRecentCharacter(result.links[1]);
+ } else {
+ game.me.next.init(result.links[0]);
+ }
setTimeout(function () {
ui.arena.classList.remove("choose-character");
}, 500);
@@ -619,12 +628,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.players[i].showIdentity();
}
game.globalBuff = ["wuxianhuoli_weisuoyuwei"];
- const randomBuff = [
- "liuanhuaming",
- "duoduoyishan",
- "xushidaifa",
- "mianmianjudao",
- ].randomGet();
+ const randomBuff = ["liuanhuaming", "duoduoyishan", "xushidaifa", "mianmianjudao"].randomGet();
game.globalBuff.add(`wuxianhuoli_${randomBuff}`);
"step 1";
_status.characterChoice = {
@@ -633,11 +637,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
};
const dialog = ["请选择出场武将", '
本局游戏Buff
'];
game.globalBuff.forEach((buff, ind) => {
- dialog.add(
- `
「${ind === 0 ? "固定" : "随机"}」 ${get.translation(
- buff
- )}：${get.skillInfoTranslation(buff)}
`
- );
+ dialog.add(`
「${ind === 0 ? "固定" : "随机"}」 ${get.translation(buff)}：${get.skillInfoTranslation(buff)}
`);
});
dialog.add([_status.characterChoice[game.me.identity], "character"]);
game.me.chooseButton(true, dialog);
@@ -646,11 +646,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.characterChoice[game.me.identity].removeArray(result.links);
var list = _status.characterChoice[game.me.enemy.identity].randomRemove(1);
game.me.enemy.init(list[0]);
- [game.me, game.me.enemy].forEach((current) => {
- if (
- current.storage.nohp ||
- (lib.character[current.name1].hasHiddenSkil && !current.noclick)
- ) {
+ [game.me, game.me.enemy].forEach(current => {
+ if (current.storage.nohp || (lib.character[current.name1].hasHiddenSkil && !current.noclick)) {
current.storage.rawHp = 1;
current.storage.rawMaxHp = 1;
}
@@ -659,16 +656,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
current.hujia = 0;
current.update();
});
- game.globalBuff.forEach((buff) => {
+ game.globalBuff.forEach(buff => {
game.addGlobalSkill(buff);
});
game.addGlobalSkill("wuxianhuoli_task");
_status.wuxianhuoliProgress = 0;
_status.wuxianhuoliLevel = 0;
const func = () => {
- ui.wuxianhuoliProgress = get.is.phoneLayout()
- ? ui.create.div(".touchinfo.left", ui.window)
- : ui.create.div(ui.gameinfo);
+ ui.wuxianhuoliProgress = get.is.phoneLayout() ? ui.create.div(".touchinfo.left", ui.window) : ui.create.div(ui.gameinfo);
ui.wuxianhuoliProgress.innerHTML = "任务进度(0/3)";
const showTasks = () => {
if (ui.wuxianhuoliInfo) return;
@@ -679,34 +674,20 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ui.wuxianhuoliInfo,
() => {
var uiintro = ui.create.dialog("hidden");
- uiintro.add(
- `
任务列表
`
- );
+ uiintro.add(`
任务列表
`);
if (typeof _status.wuxianhuoliLevel !== "number") {
- uiintro.add(
- `
未获取当前进度，请于一名角色受伤后再查看
`
- );
+ uiintro.add(`
未获取当前进度，请于一名角色受伤后再查看
`);
} else if (_status.wuxianhuoliLevel < 2) {
- uiintro.add(`
全场角色造成${
- _status.wuxianhuoliLevel === 0 ? 3 : 5
- }点伤害(当前${_status.wuxianhuoliProgress}点)
\
+ uiintro.add(`
全场角色造成${_status.wuxianhuoliLevel === 0 ? 3 : 5}点伤害(当前${_status.wuxianhuoliProgress}点)
\
奖励：获得一个技能，摸两张牌
`);
} else {
- uiintro.add(
- `
所有任务已完成，无后续任务
`
- );
+ uiintro.add(`
所有任务已完成，无后续任务
`);
}
- uiintro.add(
- `
全局Buff
`
- );
+ uiintro.add(`
全局Buff
`);
uiintro.add(
`
${game.globalBuff
.map((buff, ind) => {
- return (
- get.translation(buff) +
- "：" +
- get.skillInfoTranslation(buff)
- );
+ return get.translation(buff) + "：" + get.skillInfoTranslation(buff);
})
.join("
")}
`
);
@@ -775,10 +756,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
event.videoIdx = lib.status.videoId++;
game.broadcastAll(
function (id, list) {
- var dialog = ui.create.dialog("选择武将", [list.all, "character"], "起始武将", [
- list[game.me.identity],
- "character",
- ]);
+ var dialog = ui.create.dialog("选择武将", [list.all, "character"], "起始武将", [list[game.me.identity], "character"]);
dialog.videoId = id;
},
event.videoIdx,
@@ -807,8 +785,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -846,8 +823,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -885,8 +861,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -924,8 +899,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -945,17 +919,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"step 7";
game.broadcastAll("closeDialog", event.videoIdx);
"step 8";
- game.me.chooseButton(
- true,
- ["请选择出场武将", [_status.characterChoice[game.me.identity], "character"]],
- _status.mode == "changban" ? 2 : 1
- );
+ game.me.chooseButton(true, ["请选择出场武将", [_status.characterChoice[game.me.identity], "character"]], _status.mode == "changban" ? 2 : 1);
"step 9";
game.me.init(result.links[0], _status.mode == "changban" ? result.links[1] : null);
_status.characterChoice[game.me.identity].removeArray(result.links);
- var list = _status.characterChoice[game.me.enemy.identity].randomRemove(
- _status.mode == "changban" ? 2 : 1
- );
+ var list = _status.characterChoice[game.me.enemy.identity].randomRemove(_status.mode == "changban" ? 2 : 1);
game.me.enemy.init(list[0], list[1]);
"step 10";
setTimeout(function () {
@@ -1006,40 +974,62 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
.set("ai", function (button) {
return Math.random();
})
+ .set(
+ "selectButton",
+ (function (choice) {
+ if (choice == "singble") return [1, 2];
+ if (choice == "double") return 2;
+ return 1;
+ })(lib.configOL.double_character)
+ )
.set("dialog", event.videoId);
"step 2";
game.broadcastAll(
function (player, character, id) {
- player.init(character);
- _status.characterlist.remove(character);
- if (player == game.me) game.addRecentCharacter(character);
+ if (player == game.me) game.addRecentCharacter(character[0]);
+ if (character.length !== 2) player.init(character[0]);
+ else {
+ player.init(character[0], character[1]);
+ if (player == game.me) game.addRecentCharacter(character[1]);
+ }
+ _status.characterlist.removeArray(character);
},
game.zhu,
- result.links[0]
+ result.links
);
game.fan
.chooseButton(true)
.set("ai", function (button) {
return Math.random();
})
+ .set(
+ "selectButton",
+ (function (choice) {
+ if (choice == "singble") return [1, 2];
+ if (choice == "double") return 2;
+ return 1;
+ })(lib.configOL.double_character)
+ )
.set("dialog", event.videoId);
"step 3";
game.broadcastAll("closeDialog", event.videoId);
game.broadcastAll(
function (player, character, id) {
var dialog = get.idDialog(id);
- if (dialog) {
- dialog.close();
+ if (dialog) dialog.close();
+ if (player == game.me) game.addRecentCharacter(character[0]);
+ if (character.length !== 2) player.init(character[0]);
+ else {
+ player.init(character[0], character[1]);
+ if (player == game.me) game.addRecentCharacter(character[1]);
}
- player.init(character);
- _status.characterlist.remove(character);
- if (player == game.me) game.addRecentCharacter(character);
+ _status.characterlist.removeArray(character);
setTimeout(function () {
ui.arena.classList.remove("choose-character");
}, 500);
},
game.fan,
- result.links[0],
+ result.links,
event.videoId
);
});
@@ -1065,33 +1055,23 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.players[i].showIdentity();
}
game.globalBuff = ["wuxianhuoli_weisuoyuwei"];
- const randomBuff = [
- "liuanhuaming",
- "duoduoyishan",
- "xushidaifa",
- "mianmianjudao",
- ].randomGet();
+ const randomBuff = ["liuanhuaming", "duoduoyishan", "xushidaifa", "mianmianjudao"].randomGet();
game.globalBuff.add(`wuxianhuoli_${randomBuff}`);
- const setBuff = (buff) => {
+ const setBuff = buff => {
game.globalBuff = buff;
};
game.broadcast(setBuff, game.globalBuff);
- if (!_status.postReconnect.wuxianhuoliBuff)
- _status.postReconnect.wuxianhuoliBuff = [setBuff, []];
+ if (!_status.postReconnect.wuxianhuoliBuff) _status.postReconnect.wuxianhuoliBuff = [setBuff, []];
_status.postReconnect.wuxianhuoliBuff[1].addArray(game.globalBuff);
"step 1";
_status.characterChoice = {
zhu: _status.characterlist.randomRemove(6),
fan: _status.characterlist.randomRemove(6),
};
- const list = ["zhu", "fan"].map((identity) => {
+ const list = ["zhu", "fan"].map(identity => {
const dialog = ["请选择出场武将", '
本局游戏Buff
'];
game.globalBuff.forEach((buff, ind) => {
- dialog.add(
- `
「${ind === 0 ? "固定" : "随机"}」 ${get.translation(
- buff
- )}：${get.skillInfoTranslation(buff)}
`
- );
+ dialog.add(`
「${ind === 0 ? "固定" : "随机"}」 ${get.translation(buff)}：${get.skillInfoTranslation(buff)}
`);
});
dialog.add([_status.characterChoice[identity], "character"]);
return [game[identity], true, dialog];
@@ -1116,10 +1096,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.characterChoice[current.identity].removeArray(result[i]);
if (!current.name) {
current.init(result[i][0]);
- if (
- current.storage.nohp ||
- (lib.character[current.name1].hasHiddenSkil && !current.noclick)
- ) {
+ if (current.storage.nohp || (lib.character[current.name1].hasHiddenSkil && !current.noclick)) {
current.storage.rawHp = 1;
current.storage.rawMaxHp = 1;
}
@@ -1134,11 +1111,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
const current = lib.playerOL[i];
if (!current.name) {
current.init(result[i][0]);
- if (
- current.storage.nohp ||
- (lib.character[current.name1].hasHiddenSkil &&
- !current.noclick)
- ) {
+ if (current.storage.nohp || (lib.character[current.name1].hasHiddenSkil && !current.noclick)) {
current.storage.rawHp = 1;
current.storage.rawMaxHp = 1;
}
@@ -1152,7 +1125,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ui.arena.classList.remove("choose-character");
}, 500);
}, result);
- game.globalBuff.forEach((buff) => {
+ game.globalBuff.forEach(buff => {
game.addGlobalSkill(buff);
});
game.addGlobalSkill("wuxianhuoli_task");
@@ -1161,9 +1134,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.wuxianhuoliLevel = 0;
});
const func = () => {
- ui.wuxianhuoliProgress = get.is.phoneLayout()
- ? ui.create.div(".touchinfo.left", ui.window)
- : ui.create.div(ui.gameinfo);
+ ui.wuxianhuoliProgress = get.is.phoneLayout() ? ui.create.div(".touchinfo.left", ui.window) : ui.create.div(ui.gameinfo);
ui.wuxianhuoliProgress.innerHTML = "任务进度(0/3)";
const showTasks = () => {
if (ui.wuxianhuoliInfo) return;
@@ -1174,34 +1145,20 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ui.wuxianhuoliInfo,
() => {
var uiintro = ui.create.dialog("hidden");
- uiintro.add(
- `
任务列表
`
- );
+ uiintro.add(`
任务列表
`);
if (typeof _status.wuxianhuoliLevel !== "number") {
- uiintro.add(
- `
未获取当前进度，请于一名角色受伤后再查看
`
- );
+ uiintro.add(`
未获取当前进度，请于一名角色受伤后再查看
`);
} else if (_status.wuxianhuoliLevel < 2) {
- uiintro.add(`
全场角色造成${
- _status.wuxianhuoliLevel === 0 ? 3 : 5
- }点伤害(当前${_status.wuxianhuoliProgress}点)
\
+ uiintro.add(`
全场角色造成${_status.wuxianhuoliLevel === 0 ? 3 : 5}点伤害(当前${_status.wuxianhuoliProgress}点)
\
奖励：获得一个技能，摸两张牌
`);
} else {
- uiintro.add(
- `
所有任务已完成，无后续任务
`
- );
+ uiintro.add(`
所有任务已完成，无后续任务
`);
}
- uiintro.add(
- `
全局Buff
`
- );
+ uiintro.add(`
全局Buff
`);
uiintro.add(
`
${game.globalBuff
.map((buff, ind) => {
- return (
- get.translation(buff) +
- "：" +
- get.skillInfoTranslation(buff)
- );
+ return get.translation(buff) + "：" + get.skillInfoTranslation(buff);
})
.join("
")}
`
);
@@ -1214,8 +1171,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
);
};
showTasks();
- if (!_status.postReconnect.wuxianhuoliShowTasks)
- _status.postReconnect.wuxianhuoliShowTasks = [showTasks, []];
+ if (!_status.postReconnect.wuxianhuoliShowTasks) _status.postReconnect.wuxianhuoliShowTasks = [showTasks, []];
const dialog = ui.create.dialog("hidden", "forcebutton");
dialog.add(`任务一`);
dialog.addText(`任务：全场角色共计造成3点伤害
奖励：获得一个技能，摸两张牌`);
@@ -1271,12 +1227,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
event.videoIdx = lib.status.videoId++;
game.broadcastAll(
function (id, list) {
- var dialog = ui.create.dialog(
- game.me.identity == "fan" ? "选择武将" : "请等待对手选择武将",
- [list.all, "character"],
- "起始武将",
- [list[game.me.identity], "character"]
- );
+ var dialog = ui.create.dialog(game.me.identity == "fan" ? "选择武将" : "请等待对手选择武将", [list.all, "character"], "起始武将", [list[game.me.identity], "character"]);
dialog.videoId = id;
},
event.videoIdx,
@@ -1304,8 +1255,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -1343,8 +1293,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -1382,8 +1331,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -1421,8 +1369,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
choosing = "对手";
}
- dialog.content.firstChild.innerHTML =
- choosing + "选择了" + get.translation(link);
+ dialog.content.firstChild.innerHTML = choosing + "选择了" + get.translation(link);
for (var i = 0; i < dialog.buttons.length; i++) {
if (link.includes(dialog.buttons[i].link)) {
if (first) {
@@ -1454,9 +1401,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
for (var i in result) {
var current = lib.playerOL[i];
if (result[i] == "ai") {
- result[i] = _status.characterChoice[current.identity].randomGets(
- _status.mode == "changban" ? 2 : 1
- );
+ result[i] = _status.characterChoice[current.identity].randomGets(_status.mode == "changban" ? 2 : 1);
} else {
result[i] = result[i].links;
}
@@ -1484,8 +1429,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
element: {
player: {
dieAfter: function () {
- if (_status.mode != "normal" || _status.characterChoice[this.identity].length <= 3)
- game.checkResult();
+ if (_status.mode != "normal" || _status.characterChoice[this.identity].length <= 3) game.checkResult();
},
dieAfter2: function () {
if (_status.mode != "normal") return;
@@ -1496,17 +1440,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"step 0";
game.delay();
"step 1";
- player
- .chooseButton(true, [
- "请选择一名出场武将",
- [_status.characterChoice[player.identity].slice(0), "character"],
- ])
- .set("forceDie", true);
+ player.chooseButton(true, ["请选择一名出场武将", [_status.characterChoice[player.identity].slice(0), "character"]]).set("forceDie", true);
"step 2";
var source = player;
var name = result.links[0];
var color = source.node.identity.dataset.color;
-
+
game.broadcastAll(
function (source, name, color) {
source.revive(null, false);
@@ -1519,7 +1458,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
color
);
game.log(source, "出场");
-
+
var num = _status.mode == "normal" ? 4 : source.maxHp;
if (player.hasSkill("cuorui")) {
player.logSkill("cuorui");
@@ -1627,11 +1566,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
direct: true,
content: function () {
- player.chooseUseTarget(
- "shuiyanqijunx",
- get.prompt("huwei"),
- "视为使用一张【水淹七军】"
- ).logSkill = "huwei";
+ player.chooseUseTarget("shuiyanqijunx", get.prompt("huwei"), "视为使用一张【水淹七军】").logSkill = "huwei";
},
},
sgkuanggu: {
@@ -1692,20 +1627,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
trigger: { target: "useCardToTargeted" },
direct: true,
filter: function (event, player) {
- return (
- event.player != player &&
- event.player.isPhaseUsing() &&
- (event.card.name == "sha" || get.type(event.card) == "trick")
- );
+ return event.player != player && event.player.isPhaseUsing() && (event.card.name == "sha" || get.type(event.card) == "trick");
},
content: function () {
- if (!player.hasSkill("sgrenwang_one"))
- player.addTempSkill("sgrenwang_one", "phaseUseEnd");
+ if (!player.hasSkill("sgrenwang_one")) player.addTempSkill("sgrenwang_one", "phaseUseEnd");
else if (trigger.player.countDiscardableCards(player, "he")) {
- player.discardPlayerCard(trigger.player, "he", get.prompt("sgrenwang")).logSkill = [
- "sgrenwang",
- trigger.player,
- ];
+ player.discardPlayerCard(trigger.player, "he", get.prompt("sgrenwang")).logSkill = ["sgrenwang", trigger.player];
}
},
},
@@ -1719,10 +1646,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
return get.color(card) == "black";
},
filter: function (event, player) {
- return (
- player.hasSkill("sgduanliang_sss") &&
- player.countCards("he", { type: ["basic", "equip"], color: "black" })
- );
+ return player.hasSkill("sgduanliang_sss") && player.countCards("he", { type: ["basic", "equip"], color: "black" });
},
position: "he",
viewAs: { name: "bingliang" },
@@ -1767,8 +1691,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
effect: {
target: function (card, player, target, current) {
- if (target.countCards("e") && get.tag(card, "respondShan") && current < 0)
- return 0.6;
+ if (target.countCards("e") && get.tag(card, "respondShan") && current < 0) return 0.6;
},
},
},
@@ -1795,15 +1718,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
audio: 2,
trigger: { global: "loseEnd" },
filter: function (event, player) {
- if (
- event.player == player ||
- event.player != _status.currentPhase ||
- event.getParent().name == "useCard"
- )
- return false;
+ if (event.player == player || event.player != _status.currentPhase || event.getParent().name == "useCard") return false;
for (var i = 0; i < event.cards.length; i++) {
- if (get.type(event.cards[i]) == "equip" && get.position(event.cards[i]) == "d")
- return true;
+ if (get.type(event.cards[i]) == "equip" && get.position(event.cards[i]) == "d") return true;
}
return false;
},
@@ -1811,8 +1728,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
content: function () {
var list = [];
for (var i = 0; i < trigger.cards.length; i++) {
- if (get.type(trigger.cards[i]) == "equip" && get.position(trigger.cards[i]) == "d")
- list.push(trigger.cards[i]);
+ if (get.type(trigger.cards[i]) == "equip" && get.position(trigger.cards[i]) == "d") list.push(trigger.cards[i]);
}
if (list.length) player.gain(list, "gain2");
},
@@ -1825,7 +1741,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
_changeHandcard: {
trigger: { global: "gameDrawAfter" },
silent: true,
@@ -1850,10 +1766,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
player.draw(hs.length, "nodelay");
for (var i = 0; i < hs.length; i++) {
hs[i].fix();
- ui.cardPile.insertBefore(
- hs[i],
- ui.cardPile.childNodes[get.rand(ui.cardPile.childElementCount)]
- );
+ ui.cardPile.insertBefore(hs[i], ui.cardPile.childNodes[get.rand(ui.cardPile.childElementCount)]);
}
},
},
@@ -1888,7 +1801,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (!event.card || event.card.name !== "sha") return false;
return (
game
- .getGlobalHistory("everything", (evt) => {
+ .getGlobalHistory("everything", evt => {
if (evt.name !== "damage") return false;
return evt.card && evt.card.name === "sha";
})
@@ -1906,13 +1819,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
wuxianhuoli_liuanhuaming: {
trigger: {
player: "loseAfter",
- global: [
- "equipAfter",
- "addJudgeAfter",
- "gainAfter",
- "loseAsyncAfter",
- "addToExpansionAfter",
- ],
+ global: ["equipAfter", "addJudgeAfter", "gainAfter", "loseAsyncAfter", "addToExpansionAfter"],
},
filter(event, player) {
if (player === _status.currentPhase) return false;
@@ -1937,7 +1844,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
async content(_, __, player) {
const cards = [];
for (const type of ["basic", "trick"]) {
- const card = get.cardPile((card) => {
+ const card = get.cardPile(card => {
const typex = get.type2(card, false);
return type === typex;
});
@@ -1962,12 +1869,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.wuxianhuoliProgress = num;
_status.wuxianhuoliLevel = level;
if (!ui.wuxianhuoliProgress) {
- ui.wuxianhuoliProgress = get.is.phoneLayout()
- ? ui.create.div(".touchinfo.left", ui.window)
- : ui.create.div(ui.gameinfo);
+ ui.wuxianhuoliProgress = get.is.phoneLayout() ? ui.create.div(".touchinfo.left", ui.window) : ui.create.div(ui.gameinfo);
}
- ui.wuxianhuoliProgress.innerHTML =
- "任务进度(" + num + "/" + (level === 0 ? 3 : 5) + ")";
+ ui.wuxianhuoliProgress.innerHTML = "任务进度(" + num + "/" + (level === 0 ? 3 : 5) + ")";
},
_status.wuxianhuoliProgress,
_status.wuxianhuoliLevel
@@ -2058,7 +1962,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
}
if (withol && !event.resultOL) {
- await new Promise((resolve) => {
+ await new Promise(resolve => {
const interval = setInterval(() => {
if (results.length === players.length) {
resolve();
@@ -2069,7 +1973,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
if (ai_targets.length > 0) {
withai = true;
- await new Promise((resolve) => {
+ await new Promise(resolve => {
const interval = setInterval(() => {
if (results.length === players.length) {
resolve();
@@ -2106,17 +2010,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
return;
}
if (!ui.wuxianhuoliProgress) {
- ui.wuxianhuoliProgress = get.is.phoneLayout()
- ? ui.create.div(".touchinfo.left", ui.window)
- : ui.create.div(ui.gameinfo);
+ ui.wuxianhuoliProgress = get.is.phoneLayout() ? ui.create.div(".touchinfo.left", ui.window) : ui.create.div(ui.gameinfo);
}
- ui.wuxianhuoliProgress.innerHTML =
- "任务进度(" + num + "/" + (level === 0 ? 3 : 5) + ")";
+ ui.wuxianhuoliProgress.innerHTML = "任务进度(" + num + "/" + (level === 0 ? 3 : 5) + ")";
},
_status.wuxianhuoliProgress,
_status.wuxianhuoliLevel
);
- await game.asyncDelay();
+ await game.delay();
},
getSkills(num = 6) {
let allList = _status.characterlist.slice(0);
@@ -2134,17 +2035,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.expandSkills(list2);
for (let k = 0; k < list2.length; k++) {
let info = lib.skill[list2[k]];
- if (
- !info ||
- info.silent ||
- info.juexingji ||
- info.hiddenSkill ||
- info.dutySkill ||
- info.zhuSkill ||
- info.unique ||
- info.groupSkill
- )
- continue;
+ if (!info || info.silent || info.juexingji || info.hiddenSkill || info.dutySkill || info.zhuSkill || info.unique || info.groupSkill) continue;
if (info.ai && (info.ai.combo || info.ai.notemp || info.ai.neg)) continue;
list.add(name);
if (!map[name]) map[name] = [];
@@ -2161,7 +2052,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
async contentx(event) {
_status.noclearcountdown = true;
const controls = [
- (link) => {
+ link => {
const evt = get.event();
evt.result = { refresh: true };
event.control.classList.add("disabled");
@@ -2182,17 +2073,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
.chooseControl(skills)
.set(
"choiceList",
- skills.map((skill) => {
- return (
- '
【' +
- get.translation(
- lib.translate[skill + "_ab"] || get.translation(skill).slice(0, 2)
- ) +
- "】
" +
- "
" +
- get.skillInfoTranslation(skill, game.me) +
- "
"
- );
+ skills.map(skill => {
+ return '
【' + get.translation(lib.translate[skill + "_ab"] || get.translation(skill).slice(0, 2)) + "】
" + "
" + get.skillInfoTranslation(skill, game.me) + "
";
})
)
.set("displayIndex", false)
@@ -2218,10 +2100,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
zhangjiao: "张角",
old_caoren: "曹仁",
old_zhoutai: "周泰",
- shuiyanqijunx_info:
- "出牌阶段，对一名其他角色使用。目标角色选择一项：1、弃置装备区里的所有牌；2、受到你造成的1点伤害。",
- guohe_info:
- "出牌阶段，对有牌的一名其他角色使用。你选择一项：①弃置其装备区里的一张牌。②观看其手牌并弃置其中的一张。",
+ shuiyanqijunx_info: "出牌阶段，对一名其他角色使用。目标角色选择一项：1、弃置装备区里的所有牌；2、受到你造成的1点伤害。",
+ guohe_info: "出牌阶段，对有牌的一名其他角色使用。你选择一项：①弃置其装备区里的一张牌。②观看其手牌并弃置其中的一张。",
shunshou_info: "出牌阶段，对距离为1且有牌的一名其他角色使用。你获得其的一张牌。",
},
translate: {
@@ -2233,7 +2113,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
changban2: "血战长坂坡",
dianjiang2: "点将单挑",
wuxianhuoli2: "无限火力",
-
+
wuxianhuoli_weisuoyuwei: "为所欲为",
wuxianhuoli_weisuoyuwei_info: "①准备阶段，你摸一张牌。②你使用【杀】的次数上限+1。",
wuxianhuoli_duoduoyishan: "多多益善",
@@ -2244,28 +2124,24 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
wuxianhuoli_liuanhuaming_info: "每回合限两次。当你于回合外失去牌后，你摸一张牌。",
wuxianhuoli_mianmianjudao: "面面俱到",
wuxianhuoli_mianmianjudao_info: "准备阶段，你从牌堆或弃牌堆中获得基本牌和锦囊牌各一张。",
-
+
wanrong: "婉容",
wanrong_info: "当你成为【杀】的目标后，你可以摸一张牌。",
sgzhiheng: "制衡",
sgzhiheng_info: "出牌阶段限一次，你可以弃置至多两张牌，然后摸等量的牌。",
xiechan: "挟缠",
- xiechan_info:
- "限定技，出牌阶段，你可以和对手拼点。若你赢/没赢，你/其视为对其/你使用一张【决斗】。",
+ xiechan_info: "限定技，出牌阶段，你可以和对手拼点。若你赢/没赢，你/其视为对其/你使用一张【决斗】。",
huwei: "虎威",
huwei_info: "当你登场时，你可以视为使用一张【水淹七军】。",
sgkuanggu: "狂骨",
sgkuanggu_info: "当你造成伤害后，若你已受伤，你可以进行判定：若结果为黑色，你回复1点体力。",
suzi: "肃资",
cangji: "藏机",
- cangji_info:
- "当你死亡时，你可以将装备区内的所有牌移动到游戏外。若如此做，你的下一名角色登场时，你将这些牌置入你的装备区。",
+ cangji_info: "当你死亡时，你可以将装备区内的所有牌移动到游戏外。若如此做，你的下一名角色登场时，你将这些牌置入你的装备区。",
sgrenwang: "仁望",
- sgrenwang_info:
- "当你于一名其他角色的出牌阶段内成为该角色使用的【杀】或普通锦囊牌的目标后，若此牌不是其本阶段内对你使用的第一张【杀】或普通锦囊牌，则你可以弃置该角色的一张牌。",
+ sgrenwang_info: "当你于一名其他角色的出牌阶段内成为该角色使用的【杀】或普通锦囊牌的目标后，若此牌不是其本阶段内对你使用的第一张【杀】或普通锦囊牌，则你可以弃置该角色的一张牌。",
sgduanliang: "断粮",
- sgduanliang_info:
- "出牌阶段，若你本回合内使用牌指定过其他角色为目标，则你可以将一张黑色基本牌或装备牌当做【兵粮寸断】使用。",
+ sgduanliang_info: "出牌阶段，若你本回合内使用牌指定过其他角色为目标，则你可以将一张黑色基本牌或装备牌当做【兵粮寸断】使用。",
sgqingguo: "倾国",
sgqingguo_info: "你可以将一张装备区内的牌当做【闪】使用或打出。",
pianyi: "翩仪",
@@ -2276,12 +2152,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shenju_info: "锁定技，你的手牌上限+X（X为你对手的体力值）。",
},
help: {
- 血战长坂:
- '
游戏规则
- 选将阶段
双方在游戏开始时由系统随机分配身份。分配到先手身份的玩家优先出牌，分配到后手身份的玩家优先选将。
双方各自随机获得3名暗置武将，同时从将池中随机选出6名明置武将，由后手玩家开始，按照一次1张-2张-2张-1张的顺序，轮流选择获得明置武将。之后双方各从自己的6名武将中选择2名分别作为主将和副将进行游戏。 - 胜利条件
对方死亡。' +
- " - 双将规则
双将主将决定角色的性别和势力，体力上限为主副将体力上限的平均值，向下取整。体力上限为3的角色可在游戏开始后更换一次起始手牌。 - 牌堆
牌堆中移除【木牛流马】【闪电】，♣花色的【藤甲】和【无懈可击 ♦️Q】️
",
- 无限火力:
- '
1ｖ1火力全开模式
（来自三国杀国际服）- 所有角色的初始体力值和体力上限均为10，护甲均为0
- 每局游戏会有一个固定的Buff和一个随机的Buff，对所有角色生效' +
- "
- 游戏全程会有两个任务，分别为“所有角色造成3点伤害”和“所有角色造成5点伤害”，在任务一完成后才会解锁任务二。
每当任务完成时，系统会发放奖励：所有角色观看三个随机的技能并获得其中一个（每名角色每局有一次刷新的机会），然后摸两张牌。",
+ 血战长坂: '游戏规则
- 选将阶段
双方在游戏开始时由系统随机分配身份。分配到先手身份的玩家优先出牌，分配到后手身份的玩家优先选将。
双方各自随机获得3名暗置武将，同时从将池中随机选出6名明置武将，由后手玩家开始，按照一次1张-2张-2张-1张的顺序，轮流选择获得明置武将。之后双方各从自己的6名武将中选择2名分别作为主将和副将进行游戏。 - 胜利条件
对方死亡。' + " - 双将规则
双将主将决定角色的性别和势力，体力上限为主副将体力上限的平均值，向下取整。体力上限为3的角色可在游戏开始后更换一次起始手牌。 - 牌堆
牌堆中移除【木牛流马】【闪电】，♣花色的【藤甲】和【无懈可击 ♦️Q】️
",
+ 无限火力: '1ｖ1火力全开模式
（来自三国杀国际服）- 所有角色的初始体力值和体力上限均为10，护甲均为0
- 每局游戏会有一个固定的Buff和一个随机的Buff，对所有角色生效' + "
- 游戏全程会有两个任务，分别为“所有角色造成3点伤害”和“所有角色造成5点伤害”，在任务一完成后才会解锁任务二。
每当任务完成时，系统会发放奖励：所有角色观看三个随机的技能并获得其中一个（每名角色每局有一次刷新的机会），然后摸两张牌。",
},
- };
-});
+ }
+}
diff --git a/mode/stone.js b/mode/stone.js
index 8618db3203..d0c9ccd11c 100644
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -1,14 +1,18 @@
-"use strict";
-game.import("mode", function (lib, game, ui, get, ai, _status) {
+import { lib, game, ui, get, ai, _status } from '../noname.js';
+export const type = 'mode';
+/**
+ * @type { () => importModeConfig }
+ */
+export default () => {
return {
name: "stone",
- start: function () {
+ start() {
"step 0";
lib.init.css(lib.assetURL + "layout/mode/", "stone");
_status.mode = "deck";
game.initStone();
var playback = localStorage.getItem(lib.configprefix + "playback");
-
+
if (!playback && _status.mode == "deck") {
var createCardDialog = function () {
ui.deckBuilder = ui.create.div(".popup-container#deck-builder", function () {
@@ -126,7 +130,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var observer = new MutationObserver(removeLine);
observer.observe(rename, { characterData: true, subtree: true });
rename.addEventListener("keyup", removeLine);
-
+
var cardDialog = ui.create.cardDialog(
true,
function (name) {
@@ -277,7 +281,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
cardDialog.listen(function (e) {
e.stopPropagation();
});
-
+
ui.deckBuilder.appendChild(cardDialog);
var deckList = ui.create.div(".shadowed.list", ui.deckBuilder, function (e) {
e.stopPropagation();
@@ -394,7 +398,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}, 500);
}
};
-
+
ui.deckcontrol = ui.create.system(
"卡组管理",
function () {
@@ -421,7 +425,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
true
);
-
+
if (lib.onfree) {
ui.deckcontrol.style.transition = "all 0.5s";
ui.deckcontrol.hide();
@@ -430,7 +434,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
createCardDialog();
}
}
-
+
if (playback) {
ui.create.me();
ui.arena.style.display = "none";
@@ -479,7 +483,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
);
if (get.config("skill_bar")) {
_status.rageEnabled = true;
-
+
ui.friendBar = ui.create.div(".skillbar.right.shadowed.playerbg", ui.arena);
ui.enemyBar = ui.create.div(".skillbar.left.shadowed.playerbg", ui.arena);
// ui.friendBar.dataset.nature='metal';
@@ -494,7 +498,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
// ui.enemyBar.popnode=ui.create.div('.skillbartext',ui.enemyBar);
_status.friendRage = 0;
_status.enemyRage = 0;
-
+
lib.setIntro(ui.friendBar, null, true);
lib.setIntro(ui.enemyBar, null, true);
}
@@ -504,19 +508,19 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.updateStatusCount();
lib.setPopped(_status.friendCount, function () {
var uiintro = ui.create.dialog("hidden");
-
+
if (_status.deadfriend.length) {
uiintro.add("已阵亡");
uiintro.add([_status.deadfriend, "player"]);
}
-
+
uiintro.add("未上场");
if (_status.mylist.length) {
uiintro.add([_status.mylist, "character"]);
} else {
uiintro.add("（无）");
}
-
+
return uiintro;
});
lib.setPopped(_status.enemyCount, function () {
@@ -527,10 +531,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
return uiintro;
}
});
-
+
game.me.side = Math.random() < 0.5;
game.enemy.side = !game.me.side;
-
+
var players = get.players(lib.sort.position);
var info = [];
for (var i = 0; i < players.length; i++) {
@@ -541,7 +545,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
});
}
(_status.videoInited = true), game.addVideo("init", null, info);
-
+
event.trigger("gameStart");
if (_status.mode == "deck") {
game.gameDraw(game.me, 3);
@@ -967,7 +971,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
game.players.push(player);
ui.arena.appendChild(player);
-
+
game.addVideo("stoneSwap", null, {
name: player.name1,
name2: player.name2,
@@ -1021,7 +1025,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.players.push(player);
game.enemy = player;
ui.arena.appendChild(player);
-
+
game.addVideo("stoneSwap", null, {
name: player.name1,
name2: player.name2,
@@ -1280,7 +1284,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[4, 2, "shaman"],
],
-
+
stone_kuangyedoushi: [
"male",
"wu",
@@ -1356,7 +1360,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[3, 3, "druid"],
],
-
+
stone_caoyuanshi: [
"male",
"qun",
@@ -1418,7 +1422,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[2, 3, "hunter"],
],
-
+
stone_shuiyuansu: ["male", "wei", 4, ["mage_bingdong"], ["minskin", "stone"], [4, 2, "mage"]],
stone_wushixuetu: ["female", "wu", 1, ["mage_zhufa"], ["minskin", "stone"], [1, 2, "mage"]],
stone_huoyao: ["male", "shu", 3, ["mage_lieyan"], ["minskin", "stone"], [3, 1, "mage"]],
@@ -1438,7 +1442,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_kaodalalong: ["male", "qun", 4, ["mage_yufa"], ["minskin", "stone"], [5, 4, "mage"]],
stone_yanshushi: ["male", "qun", 2, ["mage_yanshu"], ["minskin", "stone"], [4, 4, "mage"]],
stone_xulingwushi: ["male", "qun", 2, ["mage_pingxu"], ["minskin", "stone"], [3, 3, "mage"]],
-
+
stone_hudunren: [
"male",
"qun",
@@ -1521,7 +1525,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
[4, 4, "paladin"],
],
stone_xunmashi: ["male", "qun", 3, ["paladin_moma"], ["minskin", "stone"], [3, 2, "paladin"]],
-
+
stone_lieyanxiaogui: [
"male",
"qun",
@@ -1620,7 +1624,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[5, 4, "warlock"],
],
-
+
stone_zhihuiguan: [
"female",
"qun",
@@ -1710,7 +1714,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[3, 1, "warrior"],
],
-
+
stone_daomufeizei: [
"male",
"qun",
@@ -1787,7 +1791,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[4, 3, "rogue"],
],
-
+
stone_beijunmushi: [
"male",
"qun",
@@ -1884,15 +1888,15 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone"],
[4, 3, "priest"],
],
-
+
stone_zhongshi: ["male", "wei", 1, ["stone_zhongshi1"], ["minskin", "stone"], [1, 2]],
stone_zhucangzhe: ["male", "wei", 1, ["stone_zhucangzhe1"], ["minskin", "stone"], [1, 2]],
stone_huoqiangshou: ["male", "wei", 3, ["stone_huoqiangshou1"], ["minskin", "stone"], [3, 1]],
-
+
stone_lansaizhanshi: ["male", "shu", 1, ["stone_chongfeng"], ["minskin", "stone"], [1, 2]],
stone_kutongsiseng: ["male", "shu", 1, ["stone_kutongsiseng1"], ["minskin", "stone"], [1, 2]],
stone_yuanguanying: ["male", "shu", 3, ["stone_yuanguanying1"], ["minskin", "stone"], [3, 1]],
-
+
stone_dijieshicong: ["male", "wu", 2, ["stone_dijieshicong1"], ["minskin", "stone"], [1, 1]],
stone_yaosaishouwei: [
"male",
@@ -1903,7 +1907,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
[1, 1],
],
stone_famingjia: ["male", "wu", 3, ["stone_famingjia1"], ["minskin", "stone"], [3, 1]],
-
+
stone_chilundashi: ["male", "qun", 2, ["stone_chilundashi1"], ["minskin", "stone"], [1, 1]],
stone_hanguangzhizhe: [
"male",
@@ -1914,7 +1918,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
[2, 2],
],
stone_aihaozhihun: ["male", "qun", 3, ["stone_aihaozhihun1"], ["minskin", "stone"], [3, 1]],
-
+
stone_fennuxiaoji: ["male", "qun", 1, ["stone_fennuxiaoji1"], ["minskin", "stone"], [1, 2]],
stone_juxingchanchu: [
"male",
@@ -1927,7 +1931,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_wuyi: ["male", "qun", 1, ["jijiu"], ["minskin", "stone", "die:wuyi"], [2, 2]],
stone_langren: ["male", "qun", 1, ["stone_qianxing"], ["minskin", "stone"], [1, 2]],
stone_shishigui: ["male", "qun", 2, ["stone_shishigui1"], ["minskin", "stone"], [2, 1]],
-
+
stone_fatiaozhuru: ["female", "qun", 1, ["stone_fatiaozhuru1"], ["minskin", "stone"], [1, 2]],
stone_mingguangjisi: ["female", "wu", 2, ["shushen"], ["minskin", "stone"], [2, 1]],
stone_nianqingjisi: ["female", "wei", 2, ["stone_zhufu"], ["minskin", "stone"], [2, 1]],
@@ -1935,7 +1939,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_yanjingshe: ["female", "qun", 2, ["stone_yanjingshe1"], ["minskin", "stone"], [3, 2]],
stone_zhiyuzhe: ["female", "qun", 3, ["stone_zhiyu"], ["minskin", "stone"], [3, 1]],
stone_mafengzhuru: ["female", "qun", 1, ["stone_mafengzhuru1"], ["minskin", "stone"], [1, 2]],
-
+
stone_shumiao: ["none", "wu", 1, [], ["minskin", "stone", "stonehidden"], [1, 1]],
stone_shuren: [
"none",
@@ -2019,7 +2023,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone", "stonehidden"],
[1, 1],
],
-
+
stone_tuteng1: [
"none",
"qun",
@@ -2053,7 +2057,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
[2, 0],
],
stone_xinbing: ["none", "qun", 2, [], ["minskin", "stone", "stonehidden"], [2, 0]],
-
+
stone_siwangzhiyi: [
"male",
"qun",
@@ -2094,7 +2098,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["minskin", "stone", "stonehidden", "stonelegend"],
[6, 2],
],
-
+
stone_aolajier: [
"male",
"qun",
@@ -2380,7 +2384,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
lib.card.list.randomSort();
}
-
+
lib.skill._recasting.usable = 3;
for (i in lib.skill) {
if (lib.skill[i].changeSeat) {
@@ -2400,7 +2404,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
}
}
-
+
_status.deadfriend = [];
_status.deadenemy = [];
game.additionaldead = [];
@@ -2429,7 +2433,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
dialog.add("0/" + (get.config("double_character") ? 2 : 1) * get.config("battle_number"));
dialog.add([list.slice(0, get.config("battle_number") * 2 + 5), "character"]);
dialog.open();
-
+
var next = game.me.chooseButton(dialog, true).set("onfree", true);
next.selectButton = function () {
return (get.config("double_character") ? 2 : 1) * get.config("battle_number");
@@ -2449,7 +2453,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.changeCoin(-3);
}
list.randomSort();
-
+
var buttons = ui.create.div(".buttons");
var node = _status.event.dialog.buttons[0].parentNode;
_status.event.dialog.buttons = ui.create.buttons(
@@ -2460,7 +2464,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.event.dialog.content.insertBefore(buttons, node);
buttons.addTempClass("start");
node.remove();
-
+
game.uncheck();
game.check();
};
@@ -2553,7 +2557,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
event.dialog = ui.create.dialog("", "hidden", "forcebutton");
}
-
+
var buttons = ui.create.div(".buttons", event.dialog.content);
var currentNode = null;
var clickButton = function (click) {
@@ -2889,7 +2893,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_fuchoudaji: {
type: "stonecard",
fullimage: true,
@@ -3082,7 +3086,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_jinyingduijue: {
type: "stonecard",
stoneact: 4,
@@ -3278,7 +3282,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_zhenyanshu: {
type: "stonecard",
stoneact: 1,
@@ -3465,7 +3469,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_shalumingling: {
type: "stonecard",
stoneact: 2,
@@ -3647,7 +3651,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_conglinzhihun: {
type: "stonecard",
stoneact: 3,
@@ -3882,7 +3886,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_mengun: {
type: "stonecard",
stoneact: 2,
@@ -4059,7 +4063,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_canying: {
type: "stonecard",
stoneact: 1,
@@ -4282,7 +4286,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_fengnu: {
type: "stonecard",
stoneact: 2,
@@ -4465,7 +4469,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_shenshengxinxing: {
type: "stonecard",
stoneact: 5,
@@ -4682,7 +4686,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_nuxi: {
type: "stonecard",
stoneact: 3,
@@ -4852,7 +4856,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_lierenyinji: {
type: "stonecard",
stoneact: 0,
@@ -5025,7 +5029,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_liliangdaijia: {
type: "stonecard",
fullimage: true,
@@ -5222,7 +5226,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_yexingchengzhang: {
type: "stonecard",
fullimage: true,
@@ -5425,7 +5429,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_cigu: {
type: "stonecard",
fullimage: true,
@@ -5623,7 +5627,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_fengxian: {
type: "stonecard",
fullimage: true,
@@ -5803,7 +5807,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_lianhuanbaolie: {
type: "stonecard",
fullimage: true,
@@ -5979,7 +5983,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_hanbingjian: {
type: "stonecard",
fullimage: true,
@@ -6140,7 +6144,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
},
-
+
spell_chenmo: {
type: "stonecard",
enable: true,
@@ -6791,7 +6795,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
threaten: 1.6,
},
},
-
+
warlock_anyu: {
trigger: { source: "fellow" },
forced: true,
@@ -6936,7 +6940,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
threaten: 1.6,
},
},
-
+
warrior_heiyao: {
trigger: { global: "phaseEnd" },
forced: true,
@@ -7043,7 +7047,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
target.damage();
},
},
-
+
priest_puzhao: {
trigger: { source: "fellow" },
unique: true,
@@ -7189,7 +7193,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ai: {
effect: {
target: function (card) {
- if (card.name == "bingliang") return 0;
+ if (card.name == "bingliang") return [0, 0];
},
},
noPhaseDelay: 1,
@@ -7208,7 +7212,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
player.update();
},
},
-
+
hunter_mishi: {
trigger: { global: "fellow" },
forced: true,
@@ -7317,7 +7321,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
trigger.num += player.countFellowSkill("hunter_zhanhuo", true);
},
},
-
+
rogue_jiaoyi: {
trigger: { source: "fellow" },
forced: true,
@@ -7444,7 +7448,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
player.tempHide();
},
},
-
+
paladin_moma: {
global: "paladin_moma2",
ai: {
@@ -7627,7 +7631,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
},
},
-
+
mage_yufa: {
trigger: { global: "useSkillAfter" },
forced: true,
@@ -7725,7 +7729,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
},
},
-
+
druid_juhuo: {
trigger: { global: "dieAfter" },
filter: function (event, player) {
@@ -7835,7 +7839,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
trigger.num++;
},
},
-
+
shaman_anhun: {
trigger: { global: "dieAfter" },
forced: true,
@@ -7922,7 +7926,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
threaten: 1.5,
},
},
-
+
warlock_fushishu: {
trigger: { player: "phaseAfter" },
forced: true,
@@ -7937,7 +7941,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
threaten: 0.1,
},
},
-
+
paladin_zhengqianghaosheng: {
trigger: { player: "phaseBegin" },
forced: true,
@@ -7972,7 +7976,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
player.storage.paladin_zhihuizhufu.drawDeck();
},
},
-
+
priest_kuaisuzhiliao: {
mark: true,
intro: {
@@ -8045,7 +8049,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
},
},
-
+
druid_conglinzhihun: {
trigger: { player: "dieBegin" },
forced: true,
@@ -8119,7 +8123,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
delete player.storage.shaman_xianzuzhihun;
},
},
-
+
shaman_fengnu: {
unique: true,
trigger: { player: "phaseAfter" },
@@ -8308,7 +8312,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ai: {
effect: {
target: function (card) {
- if (card.name == "bingliang") return 0;
+ if (card.name == "bingliang") return [0, 0];
},
},
noPhaseDelay: 1,
@@ -9609,7 +9613,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ai: {
effect: {
target: function (card) {
- if (card.name == "bingliang") return 0;
+ if (card.name == "bingliang") return [0, 0];
},
},
noPhaseDelay: 1,
@@ -10480,7 +10484,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
paladin: "圣骑士",
hunter: "猎人",
druid: "德鲁伊",
-
+
stone_siwangzhiyi: "死亡之翼",
stone_alaikesita: "阿莱克萨",
stone_yisela: "伊瑟拉",
@@ -10496,7 +10500,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_sainaliusi: "塞纳留斯",
stone_fuding: "弗丁",
stone_weilun: "维纶",
-
+
stone_fushi: "缚誓",
stone_fushi_info: "你出场时，为所有友方角色回复所有体力值。",
stone_mieshi: "灭世",
@@ -10507,7 +10511,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_chenshui_info: "在你的结束阶段，令己方主将获得一张梦境牌。",
stone_mowang: "魔网",
stone_mowang_info: "己方法术对主将伤害+2，对随从伤害+4。",
-
+
stone_zhiyin: "指引",
stone_zhiyin_info: "每当己方主将使用一张法术牌，将一张火球术置于其手牌。",
stone_bianshen: "变身",
@@ -10526,7 +10530,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_shenyou_info: "己方主将的职业技能和法术的治疗效果翻倍。",
stone_jinu: "激怒",
stone_jinu_info: "摸牌阶段，若你己受伤，则额外摸两张牌。",
-
+
spell_shenshengxinxing: "神圣新星",
spell_shenshengxinxing_info: "对所有敌方角色造成1点伤害，令所有友方角色回复1点体力。",
spell_shengguangzhadan: "圣光炸弹",
@@ -10540,7 +10544,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_naluzhiguang_info: "恢复1点体力值，若目标仍处于受伤状态，则召唤一名圣光护卫。",
spell_zhiliaozhihuan: "治疗之环",
spell_zhiliaozhihuan_info: "令所有随从回复3点体力。",
-
+
spell_zhenyanshu: "真言术",
spell_zhenyanshu_info: "令一名随从增加1点体力和体力上限；从牌库中获得一张牌。",
spell_enzeshu: "恩泽术",
@@ -10554,11 +10558,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_xinlinghanbao_info: "对敌方主将造成2点伤害。",
spell_kongxinshu: "控心术",
spell_kongxinshu_info: "复制敌方牌库中的一张随从，将其置入战场。",
-
+
stone_shengguanghuwei: "圣光护卫",
priest_shengguang: "圣光",
priest_shengguang_info: "每当一名随从获得治疗，摸一张牌。",
-
+
spell_nuxi: "怒袭",
spell_nuxi_info: "造成1点伤害，获得2点护甲。",
spell_dunpaimengji: "盾牌猛击",
@@ -10571,7 +10575,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_xuanfengzhan_info: "对所有随从造成1点伤害。",
spell_juemingluandou: "绝命乱斗",
spell_juemingluandou_info: "随机保留一名随从，然后令所有其他随从死亡。",
-
+
spell_zhongnian: "重碾",
spell_zhongnian_info: "造成X点伤害，X为已受伤的友方角色数且不超过3。",
spell_zhandounuhuo: "战斗怒火",
@@ -10584,7 +10588,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_kuangbao_info: "令一名已受伤的友方随从摸四张牌。",
spell_yingyongdaji: "英勇打击",
spell_yingyongdaji_info: "令一名敌方角色对你造成2点伤害，然后对其造成2点伤害。",
-
+
spell_dubiao: "毒镖",
spell_dubiao_info: "对一名随机敌方角色造成1点伤害。",
spell_qiangfengsheji: "强风射击",
@@ -10600,7 +10604,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_zhuizongshu_info: "从牌库中随机选择三张牌，获得其中的一张。",
spell_tianjiangzhuqun: "天降蛛群",
spell_tianjiangzhuqun_info: "召唤三只结网蛛。",
-
+
spell_lierenyinji: "猎人印记",
spell_lierenyinji_info: "将一名随从的体力上限降至1。",
spell_kuaisusheji: "快速射击",
@@ -10613,12 +10617,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_zidanshangtang_info: "随机获得一张猎人职业法术牌，并获得技能〖上膛〗直到回合结束。",
spell_duochongsheji: "多重射击",
spell_duochongsheji_info: "对两名随机敌方随从各造成2点伤害。",
-
+
stone_liegou: "猎狗",
hunter_zidanshangtang: "上膛",
hunter_zidanshangtang_bg: "膛",
hunter_zidanshangtang_info: "每当你使用一张法术牌，便随机获得一张猎人职业法术牌。",
-
+
spell_zuzhou: "诅咒",
spell_zuzhou_info: "将目标随从翻面，摸一张牌。",
spell_xishengqiyue: "牺牲契约",
@@ -10631,7 +10635,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_liliangdaijia_info: "令一名友方随从摸四张牌，将体力值变为5，并在其下个回合结束后死亡。",
spell_emozhinu: "恶魔之怒",
spell_emozhinu_info: "对所有随从造成2点伤害。",
-
+
spell_emozhixin: "恶魔之心",
spell_emozhixin_info: "对一名敌方随从造成4点伤害，或令一名友方随从摸四张牌。",
spell_ansezhadan: "暗色炸弹",
@@ -10646,7 +10650,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_linghunhongxi_info: "令一名随从死亡，回复1点体力。",
spell_siwangchanrao: "死亡缠绕",
spell_siwangchanrao_info: "对一名随从造成1点伤害；若该随从死亡，从牌库中获得一张牌。",
-
+
spell_wuyashenxiang: "乌鸦神像",
spell_wuyashenxiang_info: "从三张法术牌或随从牌中选择一张加入手牌。",
spell_huotigenxu: "活体根须",
@@ -10661,7 +10665,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_yemanpaoxiao_bg: "咆",
spell_yemanpaoxiao2: "咆哮",
spell_yemanpaoxiao_info: "所有友方角色造成的伤害+1，直到你的下个回合开始。",
-
+
spell_conglinzhihun: "丛林之魂",
druid_conglinzhihun: "树魂",
druid_conglinzhihun_info: "你死亡后召唤一个树人。",
@@ -10677,21 +10681,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_heiandiyu: "黑暗低语",
spell_heiandiyu_info:
"召唤若干个小精灵直到你的随从数达到4；或令一名随从增加1点体力和体力上限并摸三张牌。",
-
+
druid_yexingchengzhang: "成长",
druid_yexingchengzhang_bg: "长",
druid_yexingchengzhang_info: "下个出牌阶段开始时获得三点额外行动值。",
druid_ziyang: "滋养",
druid_ziyang_bg: "养",
druid_ziyang_info: "下个出牌阶段开始时获得四点额外行动值。",
-
+
stone_shumiao: "树苗",
stone_shuren: "自爆树人",
stone_shurenx: "树人",
stone_shurenxx: "嘲讽树人",
stone_zibao: "自爆",
stone_zibao_info: "结合结束后立即死亡。",
-
+
spell_cigu: "刺骨",
spell_cigu_info: "造成1点伤害，你可以弃置一张装备区内的牌令伤害+1。",
spell_jianrenluanwu: "剑刃乱舞",
@@ -10704,7 +10708,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_cisha_info: "杀死一名随从。",
spell_modaoyou: "磨刀油",
spell_modaoyou_info: "令你下一次剑刃乱舞造成的伤害+1，并与一名随机友方随从各摸两张牌。",
-
+
spell_mengun: "闷棍",
spell_mengun_info: "令一名敌方随从死亡（不触发死亡技能），将一张该随从的复制置入对手的手牌。",
spell_anzhongpohuai: "暗中破坏",
@@ -10721,7 +10725,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_piaoqie_info: "复制两张对手牌库中的牌加入你的手牌。",
spell_jipao: "疾跑",
spell_jipao_info: "从牌库中获得四张牌。",
-
+
spell_fengxian: "奉献",
spell_fengxian_info: "对所有敌方角色造成1点伤害。",
spell_fuchouzhinu: "复仇之怒",
@@ -10734,7 +10738,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_zuozhandongyuan_info: "召唤两个新兵，随机装备一把武器。",
spell_liliangzhufu: "力量祝福",
spell_liliangzhufu_info: "令一名随从摸两张牌。",
-
+
spell_jinyingduijue: "精英对决",
spell_jinyingduijue_info: "双方各保留体力值最高的一名随从，然后令其他随从死亡。",
spell_shenpan: "审判",
@@ -10752,7 +10756,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_zhihuizhufu: "智慧祝福",
paladin_zhihuizhufu: "智慧祝福",
spell_zhihuizhufu_info: "选择一名随从，在其每个准备阶段，你从牌库中获得一张牌。",
-
+
spell_fengnu: "风怒",
shaman_fengnu: "风怒",
shaman_fengnu_info: "回合结束后，你获得一个额外回合。",
@@ -10774,7 +10778,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shaman_xianzuzhishi: "先祖知识",
shaman_xianzuzhishi_info: "本回合手牌上限-1。",
spell_xianzuzhishi_info: "从牌库中获得两张牌，本回合手牌上限-1（多次使用不叠加）。",
-
+
spell_lianhuanbaolie: "连环爆裂",
spell_lianhuanbaolie_info: "造成1~2点雷电伤害。",
spell_shandianfengbao: "闪电风暴",
@@ -10787,7 +10791,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_shixue_info: "所有友方随从摸两张牌。",
spell_chazhuangshandian: "叉状闪电",
spell_chazhuangshandian_info: "对两个随机敌方随从各造成1点雷电伤害。",
-
+
stone_qingwa: "青蛙",
stone_youlinglang: "幽灵狼",
stone_jingxiang: "镜像",
@@ -10795,7 +10799,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shaman_qingwa: "青蛙",
shaman_qingwa_info: "锁定技，你跳过摸牌阶段。",
stone_xiaojingling: "小精灵",
-
+
spell_laojiuhuoba: "老旧火把",
spell_laojiuhuoba_info: "造成1点伤害，将一张炽热火把置入你的牌库。",
spell_chirehuoba: "炽热火把",
@@ -10812,7 +10816,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
mage_hanbingpingzhang: "寒冰屏障",
mage_hanbingpingzhang_info: "体力值不能降到2以内。",
spell_hanbingpingzhang_info: "令一名角色的体力值不能降到2以内，直到你的下一回合开始。",
-
+
spell_hanbingjian: "寒冰箭",
spell_hanbingjian_info: "对一个随从造成2点伤害，然后将其翻面。",
spell_lieyanfengbao: "烈焰风暴",
@@ -10825,25 +10829,25 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_bianxingshu_info: "将一个随从变成一只绵羊。",
spell_huoqiushu: "火球术",
spell_huoqiushu_info: "造成3点火焰伤害（若目标为主将，伤害不能超过目标的当前体力值）。",
-
+
stone_mianyang: "绵羊",
mage_mianyang: "绵羊",
mage_mianyang_info: "锁定技，你不能使用【杀】。",
-
+
stone_beijunmushi: "北郡牧师",
stone_guangyaozhizi: "光耀之子",
stone_longmianjiaoguan: "龙眠教官",
stone_linghunjisi: "灵魂祭司",
stone_guanliyuan: "管理员",
stone_heianjiaotu: "黑暗教徒",
-
+
stone_shengdianzhishi: "圣殿执事",
stone_suoxiaojishi: "缩小技师",
stone_anyingzisi: "暗影子嗣",
stone_guangmingquan: "光明泉",
stone_muguangchulong: "暮光雏龙",
stone_shenshengyongshi: "神圣勇士",
-
+
priest_puzhao: "普照",
priest_puzhao_info: "你出场时，己方主将可令一名其他友方随从增加2点体力和体力上限。",
priest_suoxiao: "缩小",
@@ -10854,7 +10858,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
priest_muguang_info: "你出场时，若主将手牌中有随从牌，则增加1点体力和体力上限。",
priest_shixin: "蚀心",
priest_shixin_info: "每当己方主将使用一次职业技能，对双方主将各造成1点伤害。",
-
+
priest_shengliao: "圣疗",
priest_shengliao_info: "每当一名随从回复体力，己方主将从牌库中获得一张牌。",
priest_guangyao: "光耀",
@@ -10867,7 +10871,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
priest_faxian_info: "你出场时，己方主将从三张随机随从牌中选择一张加入手牌。",
priest_zhufu: "献身",
priest_zhufu_info: "你死亡时，令一名随机友方随从增加1点体力和体力上限。",
-
+
stone_daomufeizei: "盗墓匪贼",
stone_haidao: "海盗",
stone_haidaotoumu: "海盗头目",
@@ -10875,14 +10879,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_tegong: "特工",
stone_qiezei: "窃贼",
stone_heitieairen: "黑铁矮人",
-
+
stone_duyanhaidao: "独眼海盗",
stone_gangtiewushi: "刚铁武师",
stone_lifaji: "理发机",
stone_shihualong: "石化龙",
stone_xiushuihaidao: "锈水海盗",
stone_zousishangfan: "走私商贩",
-
+
rogue_duxing: "独行",
rogue_duxing_info: "每当敌方主将召唤一名随从，便获得潜行。",
rogue_shoudao: "授道",
@@ -10895,7 +10899,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
rogue_jielue_info: "每当己方主将装备一把武器牌，摸两张牌。",
rogue_jiaoyi: "交易",
rogue_jiaoyi_info: "你出场时，己方主将可以弃置一张装备牌令你摸三张牌。",
-
+
rogue_touqie: "偷窃",
rogue_touqie_info: "每当你造成一次伤害，己方主将从牌库中获得一张牌。",
rogue_xunbao: "寻宝",
@@ -10908,14 +10912,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
rogue_qiancang_info: "你出场时，对所有未受伤害的敌方随从造成1点伤害。",
rogue_zhaomu: "结伙",
rogue_zhaomu_info: "你出场时，召唤一个海盗。",
-
+
stone_zhihuiguan: "指挥官",
stone_jiangong: "监工",
stone_yuanhou: "猿猴",
stone_chidunshinv: "持盾侍女",
stone_zhujiashi: "铸甲师",
stone_kuangzhanshi: "狂战士",
-
+
stone_heiyaoyaoshou: "黑曜妖兽",
stone_honglongyongshi: "红龙勇士",
stone_peilianshi: "陪练师",
@@ -10923,7 +10927,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_shengjiachong: "圣甲虫",
stone_mengmaren: "猛犸人",
stone_zhifuzhe: "掷斧者",
-
+
warrior_heiyao: "黑曜",
warrior_heiyao_info: "在己方主将的结束阶段，召唤一只圣甲虫。",
warrior_peilian: "陪练",
@@ -10934,7 +10938,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
warrior_chuanci_info: "每当你对一名敌方随从造成伤害，对另一名随机敌方随从造成等量的伤害。",
warrior_zhifu: "掷斧",
warrior_zhifu_info: "每当你受到一次伤害，对敌方主将造成1点伤害。",
-
+
warrior_tongling: "统领",
warrior_tongling_info: "每当你召唤一个初始手牌数不大于2的随从，令其获得冲锋。",
warrior_baoluan: "暴乱",
@@ -10945,7 +10949,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
warrior_zhujia_info: "每当你受到一次伤害，己方主将获得1点护甲。",
warrior_tidun: "提盾",
warrior_tidun_info: "你出场时，己方主将获得2点护甲。",
-
+
stone_lieyanxiaogui: "烈焰小鬼",
stone_xiaoguishouling: "小鬼首领",
stone_kongjuzhanma: "恐惧战马",
@@ -10954,14 +10958,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_diyuhuo: "地狱火",
stone_diyuhuox: "地狱火",
stone_xiaogui: "小鬼",
-
+
stone_heishitanfan: "黑市摊贩",
stone_zhaohuanzhe: "召唤者",
stone_meimo: "魅魔",
stone_tongkunvwang: "痛苦女王",
stone_xukongkongmo: "虚空恐魔",
stone_fukongmoyan: "浮空魔眼",
-
+
warlock_anyu: "暗语",
warlock_anyu_info: "你出场时，己方主将从三张随机的行动值消耗为1的牌中选择一张加入手牌。",
warlock_zhaohuan: "召唤",
@@ -10975,7 +10979,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"你出场时，己方主将须令一名其他友方随从死亡，然后你获得其全部的手牌和体力值。",
warlock_shijie: "视界",
warlock_shijie_info: "每当己方主将受到一次伤害，你增加1点体力和体力上限并摸一张牌。",
-
+
warlock_nonghuo: "弄火",
warlock_nonghuo_info: "你出场时，对己方主将造成1点火焰伤害。",
warlock_zhaogui: "召鬼",
@@ -10986,21 +10990,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
warlock_yuhuo_info: "你出场时，对所有其他随从造成1点伤害。",
warlock_zaihuo: "灾祸",
warlock_zaihuo_info: "你出场时，随机弃置主将的两张手牌。",
-
+
stone_hudunren: "护盾人",
stone_junxuguan: "军需官",
stone_yurenqishi: "鱼人骑士",
stone_chidunweishi: "持盾卫士",
stone_liewangshouwei: "列王守卫",
stone_longwangpeiou: "龙王配偶",
-
+
stone_baoweizhe: "保卫者",
stone_guiqishi: "龟骑士",
stone_shenmiqishou: "神秘骑手",
stone_shixiangweishi: "石像卫士",
stone_xuefanzhanshi: "血帆战士",
stone_xunmashi: "训马师",
-
+
paladin_baowei: "保卫",
paladin_baowei_info: "你出场时，己方主将可令一名其他随从获得1点护甲。",
paladin_tuxi: "吐息",
@@ -11014,7 +11018,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
paladin_moma: "秣马",
paladin_moma2: "秣马",
paladin_moma_info: "所有友方新兵摸牌阶段摸牌数+1。",
-
+
paladin_zhaohuan: "召唤",
paladin_zhaohuan2: "召唤",
paladin_zhaohuan_info: "你出场后，你的主将在使用下一张随从牌时获得两点行动值。",
@@ -11028,21 +11032,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
paladin_hudun_info: "你出场时，获得1点护甲值。",
paladin_zhaochao: "招潮",
paladin_zhaochao_info: "每当你的主将使用一次英雄技能，便摸两张牌。",
-
+
stone_shifazhe: "嗜法者",
stone_wushixuetu: "巫师学徒",
stone_shuiyuansu: "水元素",
stone_falifulong: "法力浮龙",
stone_yingxiongzhihun: "英雄之魂",
stone_huoyao: "火妖",
-
+
stone_aoshushi: "奥术师",
stone_faqishi: "法骑士",
stone_fuhuokaijia: "复活铠甲",
stone_kaodalalong: "考达拉龙",
stone_yanshushi: "炎术士",
stone_xulingwushi: "虚灵巫师",
-
+
mage_aoshu: "奥术",
mage_aoshu_info: "你出场时，将一张奥术智慧置入主将的手牌。",
mage_jili: "激励",
@@ -11056,7 +11060,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"你出场时，造成X点火焰伤害，随机分配到敌方随从上，X为己方主将装备区内装备牌的数量。",
mage_pingxu: "冯虚",
mage_pingxu_info: "你出场时，己方主将从三张随机法术牌中选择一张加入手牌。",
-
+
mage_shifa: "嗜法",
mage_shifa_info: "你出场时，将一张随机法术牌置入双方主将的手牌。",
mage_minghuo: "冥火",
@@ -11069,21 +11073,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
mage_zhufa_info: "每当己方主将使用一张法术牌，令其获得1点行动值。",
mage_bingdong: "冰冻",
mage_bingdong_info: "每当你对一个随从造成伤害，该随从将武将牌翻至背面。",
-
+
stone_caoyuanshi: "草原狮",
stone_leiouke: "雷欧克",
stone_misha: "米莎",
stone_huofu: "霍弗",
stone_jiewangzhu: "结网蛛",
stone_xunshoushi: "驯兽师",
-
+
stone_senlinlang: "森林狼",
stone_tujiu: "秃鹫",
stone_muyangren: "牧羊人",
stone_jujishou: "狙击手",
stone_damoshatuo: "大漠沙驼",
stone_huangjialeixiang: "皇家雷象",
-
+
hunter_jiewang: "结网",
hunter_jiewang_info: "你死亡时，己方主将获得一张随机野兽牌。",
hunter_xunshou: "驯兽",
@@ -11094,7 +11098,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
hunter_zhanhuo: "战火",
hunter_zhanhuo2: "战火",
hunter_zhanhuo_info: "其他友方随从摸牌阶段的摸牌数+1。",
-
+
hunter_qunxi: "群袭",
hunter_qunxi_info: "你出场时，所有友方随从摸一张牌。",
hunter_mishi: "觅食",
@@ -11107,21 +11111,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
hunter_muyang_info: "你出场时，随机召唤一个行动值消耗为X的随从，X为其他友方随从数。",
hunter_juji: "狙击",
hunter_juji_info: "你的职业技能可以指定随从为目标。",
-
+
stone_baoqishi: "豹骑士",
stone_conglinshouwei: "从林守卫",
stone_baohuzhishu: "保护之树",
stone_kuangyedoushi: "狂野斗士",
stone_liebao: "猎豹",
stone_zongxiong: "棕熊",
-
+
stone_renyaqishi: "刃牙骑士",
stone_conglinxiaoshou: "丛林枭兽",
stone_huangyeqishi: "荒野骑士",
stone_xunmenglong: "迅猛龙",
stone_lindishuyao: "林地树妖",
stone_huoshanxiemu: "火山邪木",
-
+
druid_renya: "刃牙",
druid_renya_info:
"你出场时，己方主将可以选择一项：令你摸一张牌并将武将牌翻至正面，或令你增加1点体力上限并获得技能潜行。",
@@ -11135,7 +11139,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
druid_yeyou_info: "双方主将各从牌库中获得一张牌。",
druid_juhuo: "举火",
druid_juhuo_info: "己方主将回合内，每有一名随从死亡，令己方主将获得1点行动值。",
-
+
stone_chongfeng: "冲锋",
stone_chongfeng_info: "你出场时，立即将武将牌翻至正面。",
druid_nuhuo: "怒火",
@@ -11146,7 +11150,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
druid_huwei: "护卫",
druid_huwei_info:
"你出场时，己方主将可以选择一项：对一名随从造成1点伤害，或弃置一名随从的所有牌并将其体力上限改为2。",
-
+
stone_fachao: "法潮图腾",
stone_tutengyongshi: "图腾勇士",
stone_huoshe: "火舌图腾",
@@ -11160,7 +11164,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_huoyanweishi: "火焰卫士",
stone_wanshiyuansu: "顽石元素",
stone_shalinxingzhe: "砂鳞行者",
-
+
shaman_anhun: "暗魂",
shaman_anhun_info: "每当一名友方随从死亡，令主将从牌库中获得一张牌。",
shaman_zoushi: "走石",
@@ -11179,7 +11183,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shaman_fachao_info: "己方主将在其每个回合结束阶从牌库中获得一张牌并回复1点体力。",
shaman_huoshe: "火舌",
shaman_huoshe_info: "其他友方随从造成的伤害始终+1。",
-
+
shaman_jili: "激励",
shaman_jili_info: "己方主将的结束阶段，所有友方图腾摸一张牌。",
shaman_tuteng: "图腾",
@@ -11190,7 +11194,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shaman_zhiliao_info: "在你的结束阶段，令所有友方随从回复1点体力。",
shaman_zhuore: "灼热",
shaman_zhuore_info: "已方主将的结束阶段，对一名随机敌方随从造成1点伤害。",
-
+
_shaman_skill: "图腾",
_shaman_skill_info: "召唤一个随机图腾。",
_mage_skill: "火冲",
@@ -11213,14 +11217,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_hunter_skill_info: "对敌方主将造成1点伤害。",
_druid_skill: "猛击",
_druid_skill_info: "视为使用一张不计入出杀次数的【杀】。",
-
+
stone_tuteng1: "石爪图腾",
stone_tuteng2: "灼热图腾",
stone_tuteng3: "空气图腾",
stone_tuteng4: "治疗图腾",
-
+
stone_xinbing: "新兵",
-
+
stone_zhongshi: "中士",
stone_zhongshi1: "叫嚣",
stone_zhongshi1_info: "你出场时，己方主将可以弃置对方一名随从的所有牌。",
@@ -11230,7 +11234,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_huoqiangshou: "火枪手",
stone_huoqiangshou1: "火枪",
stone_huoqiangshou1_info: "你出场时，己方主将可以对对方一名随从造成1点伤害。",
-
+
stone_lansaizhanshi: "蓝腮战士",
stone_kutongsiseng: "苦痛侍僧",
stone_kutongsiseng1: "苦痛",
@@ -11239,7 +11243,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_yuanguanying: "远古暗影",
stone_yuanguanying1: "暗影",
stone_yuanguanying1_info: "你出场时，己方主将可视为对一名敌方角色使用一张【杀】。",
-
+
stone_dijieshicong: "低阶侍从",
stone_dijieshicong1: "持枪",
stone_dijieshicong1_info: "你出场时，敌方主将随机弃置一张装备牌。",
@@ -11249,7 +11253,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_famingjia: "发明家",
stone_famingjia1: "发明",
stone_famingjia1_info: "你出场时，己方主将摸两张牌。",
-
+
stone_chilundashi: "齿轮大师",
stone_chilundashi1: "齿轮",
stone_chilundashi2: "齿轮",
@@ -11260,7 +11264,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_aihaozhihun: "哀嚎之魂",
stone_aihaozhihun1: "哀嚎",
stone_aihaozhihun1_info: "你出场时，敌方随从弃置所有牌。",
-
+
stone_fennuxiaoji: "愤怒小鸡",
stone_fennuxiaoji1: "暴怒",
stone_fennuxiaoji1_info: "准备阶段，若你没有手牌，你摸两张牌。",
@@ -11274,7 +11278,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_langren: "狼人",
stone_qianxing: "潜行",
stone_qianxing_info: "你出场时，获得潜行直到下一回合开始。",
-
+
stone_mingguangjisi: "明光祭司",
stone_nianqingjisi: "年轻祭司",
stone_zhufu: "祝福",
@@ -11292,12 +11296,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
stone_fatiaozhuru: "发条侏儒",
stone_fatiaozhuru1: "发条",
stone_fatiaozhuru1_info: "结束阶段，若你没有手牌，你摸两张牌。",
-
+
stonesha: "进攻",
stonesha_info: "锁定技，你的装备牌均视为【杀】。",
stoneshan: "格挡",
stoneshan_info: "锁定技，你的随从和法术牌均视为闪。",
-
+
stonecharacter: "随从",
spell_shengerpingdeng: "生而平等",
spell_shengerpingdeng_info: "将所有随从体力上限降为1。",
@@ -11330,7 +11334,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
spell_xiaoshi: "消失",
spell_xiaoshi_info:
"令敌方主将将所有装备区内的牌收入手牌，并弃置其若干张手牌，直到其手牌数与你相等。",
-
+
stonecard: "法术",
mode_stone_card_config: "炉石模式",
mode_stone_character_config: "炉石模式",
@@ -11366,5 +11370,5 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
" - 嘲讽：若一方阵营中有嘲讽角色，则同阵营的无嘲讽角色不以能成为杀目标" +
"
- 行动顺序为先主将后随从。主将或随从死亡后立即移出游戏，主将死亡后替补登场，替补登场时摸3+X张牌，X为对方存活的随从数，无替补时游戏结束",
},
- };
-});
+ }
+}
\ No newline at end of file
diff --git a/mode/tafang.js b/mode/tafang.js
index c0e133f0e8..47c147ff20 100644
--- a/mode/tafang.js
+++ b/mode/tafang.js
@@ -1,9 +1,13 @@
-"use strict";
-game.import("mode", function (lib, game, ui, get, ai, _status) {
+import { lib, game, ui, get, ai, _status } from '../noname.js';
+export const type = 'mode';
+/**
+ * @type { () => importModeConfig }
+ */
+export default () => {
return {
name: "tafang",
canvasUpdates2: [],
- start: function () {
+ start() {
"step 0";
_status.gameDrawed = true;
lib.init.css(lib.assetURL + "layout/mode", "chess");
@@ -138,7 +142,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ui.chesswidth = _status.map.size[0];
ui.chessheight = _status.map.size[1];
game.initChess();
-
+
var grids = [];
var gridnum = ui.chessheight * ui.chesswidth;
for (var i = 0; i < gridnum; i++) {
@@ -176,7 +180,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
event.obs.push(cg.toString());
}
}
-
+
if (lib.config.show_handcardbutton) {
lib.setPopped(
ui.create.system("手牌", null, true),
@@ -203,16 +207,16 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
220
);
}
-
+
ui.create.me();
ui.create.fakeme();
-
+
ui.chessinfo = ui.create.div(".fakeme.player", ui.me, function (e) {
e.stopPropagation();
});
ui.create.div(ui.chessinfo);
lib.setScroll(ui.chessinfo.firstChild);
-
+
game.arrangePlayers();
"step 4";
ui.control.style.display = "";
@@ -234,10 +238,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (event.obs) {
game.addVideo("initobs", null, event.obs);
}
-
+
ui.me.querySelector(".fakeme.player").hide();
ui.me.querySelector(".fakeme.avatar").hide();
-
+
var list = [];
for (i in lib.character) {
if (i.indexOf("treasure_") == 0) continue;
@@ -256,7 +260,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.turnTotal = parseInt(get.config("tafang_turn"));
ui.turnCount = ui.create.system("", null, true);
_status.remainingCount = 0;
-
+
_status.tafangend = [];
for (var i = 0; i < ui.chesswidth; i++) {
var tafangdes = ui.chesswidth * (ui.chessheight - 1) + i;
@@ -1181,10 +1185,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
trueColor: "zhu",
falseColor: "wei",
_chessmove: "移动",
-
+
mode_tafang_character_config: "塔防模式",
mode_tafang_card_config: "塔防模式",
-
+
tafang_mech_weixingxianjing: "小型陷阱",
tafang_mech_weixingxianjing_skill: "捕猎",
tafang_mech_weixingxianjing_skill_info: "每一轮令距离你2格以内的一名随机敌人翻面。",
@@ -1205,7 +1209,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
tafang_mech_guangmingquan: "光明泉",
tafang_mech_guangmingquan_skill: "圣疗",
tafang_mech_guangmingquan_skill_info: "每一轮令距离2格以内的所有友方角色各回复1点体力。",
-
+
tafang_mech_dubiaoxianjing: "毒镖陷阱",
tafang_mech_dubiaoxianjing_skill: "毒镖",
tafang_mech_dubiaoxianjing_skill_info: "每当距离2格以内的一名敌方角色。",
@@ -1223,7 +1227,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
// tafang_mech_shenmidiaoxiang:['','',4,[],['boss'],5],
// tafang_mech_shiyuansu:['','',4,[],['boss'],5],
// tafang_mech_jiqishi:['','',4,[],['boss'],5],
-
+
tafang_mech_guangmingquan: ["", "", 3, [], ["boss"], 3],
tafang_mech_nengliangqiu: ["", "", 3, [], ["boss"], 3],
tafang_mech_jiguanren: ["", "", 3, [], ["boss"], 3],
@@ -1244,5 +1248,5 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"战场上最多出现3个相同的机关，每个机关在置入战场3轮后消失。战场上最多招募5名友方角色。
- " +
"敌方角色到达底部出口时游戏失败，已方角色到达底部出口，将被移出游戏",
},
- };
-});
+ }
+}
diff --git a/mode/versus.js b/mode/versus.js
index d844e8b0ba..cf15ed4254 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1,8 +1,12 @@
-"use strict";
-game.import("mode", function (lib, game, ui, get, ai, _status) {
+import { lib, game, ui, get, ai, _status } from '../noname.js';
+export const type = 'mode';
+/**
+ * @type { () => importModeConfig }
+ */
+export default () => {
return {
name: "versus",
- init: function () {
+ init() {
if (get.config("versus_mode") == "jiange") {
lib.characterPack.mode_versus = lib.jiangeboss;
} else if (get.config("versus_mode") == "siguo") {
@@ -25,7 +29,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
delete lib.card.lizhengshangyou;
}
},
- start: function () {
+ start() {
"step 0";
_status.mode = get.config("versus_mode");
if (_status.connectMode) _status.mode = lib.configOL.versus_mode;
@@ -163,7 +167,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (lib.storage.versus_reward == undefined) game.save("versus_reward", 3);
if (lib.storage.versus_punish == undefined) game.save("versus_punish", "弃牌");
if (lib.storage.replace_number == undefined) game.save("replace_number", 3);
-
+
switch (lib.storage.seat_order) {
case "交叉":
lib.storage.cross_seat = true;
@@ -223,7 +227,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["zhu", "ezhu", "zhong", "ezhong", "zhong", "ezhong", "zhong", "ezhong"],
["zhu", "ezhong", "zhong", "ezhong", "zhong", "ezhu", "zhong", "ezhong"],
].randomGet();
-
+
var side = true;
var num = Math.floor(Math.random() * 8);
list = list.splice(8 - num).concat(list);
@@ -271,7 +275,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
rand2--;
}
}
-
+
for (var i in lib.skill) {
if (lib.skill[i].changeSeat) {
lib.skill[i] = {};
@@ -280,7 +284,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
}
}
-
+
var side = Math.random() < 0.5;
var num = Math.floor(Math.random() * 8);
list = list.splice(8 - num).concat(list);
@@ -544,10 +548,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
_status.enemyCount = ui.create.system("杀敌: " + get.cnNumber(0, true), null, true);
_status.friendCount = ui.create.system("阵亡: " + get.cnNumber(0, true), null, true);
-
+
lib.setPopped(_status.friendCount, game.versusHoverFriend);
lib.setPopped(_status.enemyCount, game.versusHoverEnemy);
-
+
if (lib.storage.zhu) {
game.versusPhaseLoop(firstAct);
} else {
@@ -995,7 +999,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"character",
]);
dialog.buttons[7].node.name.innerHTML = get.verticalStr("队友选择");
-
+
var addSetting = function (dialog) {
dialog.add("选择座位").classList.add("add-setting");
var seats = document.createElement("table");
@@ -1039,7 +1043,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
seats.previousSibling.style.display = "none";
seats.style.display = "none";
}
-
+
dialog.add(ui.create.div(".placeholder.add-setting"));
dialog.add(ui.create.div(".placeholder.add-setting"));
if (get.is.phoneLayout()) dialog.add(ui.create.div(".placeholder.add-setting"));
@@ -1058,11 +1062,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
};
event.addSetting = addSetting;
event.removeSetting = removeSetting;
-
+
if (get.config("change_identity")) {
addSetting(dialog);
}
-
+
ui.create.cheat = function () {
_status.createControl = ui.cheat2;
ui.cheat = ui.create.control("更换", function () {
@@ -1214,7 +1218,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
setTimeout(function () {
ui.arena.classList.remove("choose-character");
}, 500);
-
+
ui.longchuanzhibao = ui.create.system("龙船至宝", null, true);
// ui.longchuanzhibao.style.display='none';
lib.setPopped(
@@ -1253,12 +1257,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var bool = Math.random() < 0.5;
var bool2 = Math.random() < 0.5;
var ref = game.players[0];
-
+
ref.side = bool;
ref.next.side = bool2;
ref.next.next.side = !bool;
ref.previous.side = !bool2;
-
+
var firstChoose = game.players.randomGet();
if (firstChoose.next.side == firstChoose.side) {
firstChoose = firstChoose.next;
@@ -1268,7 +1272,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
firstChoose.node.name.innerHTML = get.verticalStr(get.cnNumber(i + 1, true) + "号位");
firstChoose = firstChoose.next;
}
-
+
for (var i = 0; i < game.players.length; i++) {
if (game.players[i].side == game.me.side) {
game.players[i].node.identity.firstChild.innerHTML = "友";
@@ -1299,7 +1303,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var choose = [];
event.list = list;
_status.characterlist = list4;
-
+
var addSetting = function (dialog) {
dialog.add("选择座位").classList.add("add-setting");
var seats = document.createElement("table");
@@ -1354,7 +1358,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
seats.previousSibling.style.display = "none";
seats.style.display = "none";
}
-
+
dialog.add(ui.create.div(".placeholder.add-setting"));
dialog.add(ui.create.div(".placeholder.add-setting"));
if (get.is.phoneLayout()) dialog.add(ui.create.div(".placeholder.add-setting"));
@@ -1373,7 +1377,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
};
event.addSetting = addSetting;
event.removeSetting = removeSetting;
-
+
var characterChoice;
if (_status.brawl && _status.brawl.chooseCharacter) {
characterChoice = _status.brawl.chooseCharacter(list, game.me);
@@ -1400,7 +1404,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
addSetting(dialog);
}
}
-
+
ui.create.cheat = function () {
_status.createControl = ui.cheat2;
ui.cheat = ui.create.control("更换", function () {
@@ -1563,13 +1567,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
}
}
-
+
var firstChoose = game.players.randomGet();
_status.firstAct = firstChoose;
-
+
firstChoose.side = false;
firstChoose.next.side = true;
-
+
for (var i = 0; i < game.players.length; i++) {
if (game.players[i].side == game.me.side) {
game.players[i].node.identity.firstChild.innerHTML = "友";
@@ -1587,11 +1591,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var choose = [];
event.list = list;
_status.endlessListAll = list.slice(0);
-
+
var characterChoice = list.randomGets(6);
var dialog = ui.create.dialog("选择角色", [characterChoice, "character"]);
game.me.chooseButton(true, dialog).set("onfree", true);
-
+
ui.create.cheat = function () {
_status.createControl = ui.cheat2;
ui.cheat = ui.create.control("更换", function () {
@@ -1736,7 +1740,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var i;
var list;
var list2 = [];
-
+
event.list = [];
event.choiceFour = get.config("character_four") || lib.choiceFour;
event.filterChoice = function (name) {
@@ -1952,11 +1956,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
rand2--;
}
}
-
+
var side = Math.random() < 0.5;
var num = game.players.indexOf(_status.firstAct);
list = list.splice(8 - num).concat(list);
-
+
for (var i = 0; i < 8; i++) {
if (list[i][0] == "e") {
game.players[i].side = side;
@@ -1978,7 +1982,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
delete game.players[i].node.name_seat;
}
}
-
+
_status.rechoose = true;
for (var i = 0; i < game.players.length; i++) {
game.players[i].uninit();
@@ -2167,7 +2171,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.friendBackup = event.friendlist.slice(0);
_status.enemyBackup = event.enemylist.slice(0);
_status.coinCoeff = get.coinCoeff(event.friendlist);
-
+
ui.create.players(6);
for (var i = 0; i < game.players.length; i++) {
game.players[i].getId();
@@ -2184,10 +2188,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.prepareArena = true;
ui.create.me();
ui.me.appendChild(ui.fakeme);
-
+
game.friend = [];
game.enemy = [];
-
+
for (var i in lib.skill) {
if (lib.skill[i].changeSeat) {
lib.skill[i] = {};
@@ -2232,13 +2236,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.friendZhu.hp++;
game.friendZhu.update();
}
-
+
if (!game.enemyZhu.isInitFilter("noZhuHp")) {
game.enemyZhu.maxHp++;
game.enemyZhu.hp++;
game.enemyZhu.update();
}
-
+
game.onSwapControl();
});
},
@@ -2334,7 +2338,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
this.dialog.choice = this.dialog
.add(ui.create.switcher("choice", [12, 16, 20, 24, 40, "∞"], lib.storage.choice))
.querySelector(".toggle");
-
+
// if(lib.storage.cross_seat){
// this.dialog.versus_random_seat.parentNode.classList.add('disabled');
// }
@@ -2420,7 +2424,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.friend.length = 0;
_status.enemy.length = 0;
var choice = lib.storage.choice == "∞" ? list.length : lib.storage.choice;
-
+
ui.dialog.content.firstChild.innerHTML = "选择角色";
var buttons = ui.create.div(".buttons");
var node = _status.event.dialog.buttons[0].parentNode;
@@ -2432,7 +2436,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.event.dialog.content.insertBefore(buttons, node);
buttons.addTempClass("start");
node.remove();
-
+
// event.check();
});
delete _status.createControl;
@@ -2626,12 +2630,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"step 1";
_status.friendBackup = _status.friend.slice(0);
_status.enemyBackup = _status.enemy.slice(0);
-
+
_status.friendDied = [];
_status.enemyDied = [];
_status.totalCount = _status.friend.length;
_status.coinCoeff = get.coinCoeff(_status.friend);
-
+
// ui.auto.show();
ui.wuxie.show();
ui.control.style.display = "none";
@@ -2786,7 +2790,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
for (i = 0; i < num; i++) {
game.friend[i].init(_status.friend[i]);
game.enemy[i].init(_status.enemy[i]);
-
+
game.friend[i].node.identity.dataset.color = get.translation(_status.color + "Color");
game.enemy[i].node.identity.dataset.color = get.translation(!_status.color + "Color");
}
@@ -2796,7 +2800,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.friendZhu.hp++;
game.friendZhu.update();
}
-
+
if (!game.enemyZhu.isInitFilter("noZhuHp")) {
game.enemyZhu.maxHp++;
game.enemyZhu.hp++;
@@ -2841,7 +2845,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["zhu", "ezhu", "zhong", "ezhong", "zhong", "ezhong", "zhong", "ezhong"],
["zhu", "ezhong", "zhong", "ezhong", "zhong", "ezhu", "zhong", "ezhong"],
].randomGet();
-
+
var side = true;
var num = Math.floor(Math.random() * 8);
list = list.splice(8 - num).concat(list);
@@ -2863,7 +2867,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
);
game.players[i].getId();
}
-
+
var side = true;
var map = {};
var num = Math.floor(Math.random() * 8);
@@ -2892,7 +2896,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var evt = evt_list[0],
character = evt_list[1];
game.addGlobalSkill(evt);
-
+
var func = function (map, evt, character) {
for (var i in map) {
var player = lib.playerOL[i];
@@ -3334,7 +3338,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
rand2--;
}
}
-
+
var side = Math.random() < 0.5;
var map = {};
var num = Math.floor(Math.random() * 8);
@@ -3371,7 +3375,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.players[i].node.name_seat.style.opacity = 1;
}
}, _status.firstAct);
-
+
var filterChoice = function (name) {
// if(name=='zuoci'||name=='miheng') return true;
if (!lib.choiceFour.includes(name)) {
@@ -3604,10 +3608,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}, 500);
_status.friendDied = [];
_status.enemyDied = [];
-
+
_status.friend = [];
_status.enemy = [];
-
+
_status.enemyCount = ui.create.system(
"杀敌: " + get.cnNumber(0, true),
null,
@@ -3618,10 +3622,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
null,
true
);
-
+
lib.setPopped(_status.friendCount, func1);
lib.setPopped(_status.enemyCount, func2);
-
+
for (var i in result) {
if (!lib.playerOL[i].name1) {
lib.playerOL[i].init(result[i][0]);
@@ -3650,10 +3654,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
_status.friendDied = list1;
_status.enemyDied = list2;
-
+
_status.friend = list3;
_status.enemy = list4;
-
+
_status.enemyCount = ui.create.system(
"杀敌: " + get.cnNumber(_status.enemyDied.length, true),
null,
@@ -3664,10 +3668,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
null,
true
);
-
+
lib.setPopped(_status.friendCount, func1);
lib.setPopped(_status.enemyCount, func2);
-
+
for (var i = 0; i < game.players.length; i++) {
if (game.players[i].side == game.me.side) {
game.players[i].node.identity.firstChild.innerHTML = "友";
@@ -3754,7 +3758,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
},
];
-
+
//22联机分配武将
var list = [];
var libCharacter = {};
@@ -3946,7 +3950,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
};
event.sendback = sendback;
-
+
//发送
event.ai_targets = [];
for (var i = 0; i < game.players.length; i++) {
@@ -4156,26 +4160,26 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
dialog.close();
}
}, event.videoId);
-
+
_status.friendDied = [];
_status.enemyDied = [];
-
+
_status.friend = game.players[0].storage.versuslist;
_status.enemy = game.players[1].storage.versuslist;
-
+
delete game.players[0].storage.versuslist;
delete game.players[1].versuslist;
-
+
_status.enemyCount = ui.create.system("杀敌: " + get.cnNumber(0, true), null, true);
_status.friendCount = ui.create.system("阵亡: " + get.cnNumber(0, true), null, true);
-
+
lib.setPopped(_status.friendCount, game.versusHoverFriend);
lib.setPopped(_status.enemyCount, game.versusHoverEnemy);
-
+
game.me.side = true;
game.players[0].side = true;
game.players[1].side = false;
-
+
var func = function (list1, list2, list3, list4, func1, func2, playerid) {
if (game.me.playerid == playerid) {
game.me.side = true;
@@ -4184,21 +4188,21 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.me.side = false;
game.me.next.side = true;
}
-
+
if (game.me.side) {
_status.enemyDied = list1;
_status.friendDied = list2;
-
+
_status.enemy = list3;
_status.friend = list4;
} else {
_status.friendDied = list1;
_status.enemyDied = list2;
-
+
_status.friend = list3;
_status.enemy = list4;
}
-
+
_status.enemyCount = ui.create.system(
"杀敌: " + get.cnNumber(_status.enemyDied.length, true),
null,
@@ -4209,7 +4213,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
null,
true
);
-
+
lib.setPopped(_status.friendCount, func1);
lib.setPopped(_status.enemyCount, func2);
};
@@ -4233,7 +4237,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
game.versusHoverEnemy,
game.players[0].playerid
);
-
+
var list = [
[game.players[0], ["选择出场角色", [_status.friend, "character"]]],
[game.players[1], ["选择出场角色", [_status.enemy, "character"]]],
@@ -4493,36 +4497,36 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
versusHoverEnemy: function () {
var uiintro = ui.create.dialog("hidden");
-
+
if (_status.enemyDied.length) {
uiintro.add("已阵亡");
uiintro.add([_status.enemyDied, "character"]);
}
-
+
uiintro.add("未上场");
if (_status.enemy.length) {
uiintro.add([_status.enemy, "character"]);
} else {
uiintro.add("（无）");
}
-
+
return uiintro;
},
versusHoverFriend: function () {
var uiintro = ui.create.dialog("hidden");
-
+
if (_status.friendDied.length) {
uiintro.add("已阵亡");
uiintro.add([_status.friendDied, "character"]);
}
-
+
uiintro.add("未上场");
if (_status.friend.length) {
uiintro.add([_status.friend, "character"]);
} else {
uiintro.add("（无）");
}
-
+
return uiintro;
},
versusHoverHandcards: function () {
@@ -4561,12 +4565,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ui.control.hide();
ui.intro = ui.create.dialog();
ui.intro.source = "versusCheckEnemy";
-
+
if (_status.enemyDied.length) {
ui.intro.add("已阵亡");
ui.intro.add([_status.enemyDied, "character"]);
}
-
+
ui.intro.add("未上场");
if (_status.enemy.length) {
ui.intro.add([_status.enemy, "character"]);
@@ -4589,12 +4593,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ui.control.hide();
ui.intro = ui.create.dialog();
ui.intro.source = "versusCheckFriend";
-
+
if (_status.friendDied.length) {
ui.intro.add("已阵亡");
ui.intro.add([_status.friendDied, "character"]);
}
-
+
ui.intro.add("未上场");
if (_status.friend.length) {
ui.intro.add([_status.friend, "character"]);
@@ -4660,7 +4664,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
ui.versushighlight = game.me;
game.me.classList.add("current_action");
-
+
ui.fakeme.style.backgroundImage = game.me.node.avatar.style.backgroundImage;
}
},
@@ -4678,7 +4682,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
ui.lineme.width = ui.window.offsetWidth;
ui.lineme.height = ui.window.offsetHeight;
-
+
var ctx = ui.linemectx;
ctx.shadowBlur = 5;
ctx.shadowColor = "rgba(0,0,0,0.3)";
@@ -4689,9 +4693,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
ctx.strokeStyle = "rgba(255,255,255," + opacity + ")";
ctx.lineWidth = 3;
ctx.setLineDash([8, 2]);
-
+
ctx.beginPath();
-
+
var startx, endx, pos;
var endy = game.me.offsetHeight / 2 + game.me.offsetTop + ui.arena.offsetTop;
var starty = ui.me.offsetTop + ui.arena.offsetTop + ui.me.offsetHeight / 2;
@@ -4783,7 +4787,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["jiangeboss", "hiddenboss", "bossallowed"],
"wei",
],
-
+
boss_jileibaihu: [
"male",
"shu",
@@ -4848,7 +4852,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["jiangemech", "hiddenboss", "bossallowed"],
"wei",
],
-
+
boss_kumuyuanrang: [
"male",
"wei",
@@ -4936,7 +4940,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["heart", 9, "tao"],
["heart", 12, "tao"],
["diamond", 12, "tao"],
-
+
["spade", 2, "bagua"],
["club", 2, "bagua"],
["spade", 5, "jueying"],
@@ -4954,7 +4958,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["diamond", 5, "guanshi"],
["diamond", 12, "fangtian"],
["heart", 5, "qilin"],
-
+
["heart", 3, "wugu"],
["heart", 4, "wugu"],
["heart", 1, "taoyuan"],
@@ -5025,14 +5029,14 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["spade", 9, "jiu"],
["club", 3, "jiu"],
["club", 9, "jiu"],
-
+
["diamond", 13, "hualiu"],
["club", 1, "baiyin"],
["spade", 2, "tengjia"],
["club", 2, "tengjia"],
["spade", 1, "guding"],
["diamond", 1, "zhuque"],
-
+
["heart", 2, "huogong"],
["heart", 3, "huogong"],
["diamond", 12, "huogong"],
@@ -5102,7 +5106,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["heart", 9, "tao"],
["heart", 12, "tao"],
["diamond", 12, "tao"],
-
+
["spade", 2, "bagua"],
["club", 2, "bagua"],
["spade", 5, "jueying"],
@@ -5120,7 +5124,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["diamond", 5, "guanshi"],
["diamond", 12, "fangtian"],
["heart", 5, "qilin"],
-
+
["heart", 3, "wugu"],
["heart", 4, "wugu"],
["heart", 1, "taoyuan"],
@@ -5156,7 +5160,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["heart", 6, "lebu"],
["spade", 1, "hanbing"],
["club", 2, "renwang"],
-
+
["heart", 4, "sha", "fire"],
["heart", 7, "sha", "fire"],
["heart", 10, "sha", "fire"],
@@ -5189,13 +5193,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["spade", 9, "jiu"],
["club", 3, "jiu"],
["club", 9, "jiu"],
-
+
["diamond", 13, "hualiu"],
["club", 1, "baiyin"],
["spade", 2, "tengjia"],
["spade", 1, "guding"],
["diamond", 1, "zhuque"],
-
+
["heart", 2, "huogong"],
["heart", 3, "huogong"],
["diamond", 12, "huogong"],
@@ -5436,10 +5440,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
choice_config: "候选人数",
mode_versus_character_config: "剑阁武将",
mode_versus_card_config: "同舟共济",
-
+
tangzi: "唐咨",
liuqi: "刘琦",
-
+
wenji: "问计",
wenji2: "问计",
wenji_info:
@@ -5453,7 +5457,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
xingzhao_bg: "棹",
xingzhao_info:
"锁定技，若你和队友持有的龙船至宝数合计为：1个以上，你具有技能“恂恂”；2个以上，当你或队友使用装备牌时，其摸一张牌；3个以上，你和队友跳过判定阶段。",
-
+
boss_liedixuande: "烈帝玄德",
boss_gongshenyueying: "工神月英",
boss_tianhoukongming: "天侯孔明",
@@ -5462,7 +5466,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
boss_jiarenzidan: "佳人子丹",
boss_duanyuzhongda: "断狱仲达",
boss_juechenmiaocai: "绝尘妙才",
-
+
boss_jileibaihu: "机雷白虎",
boss_yunpingqinglong: "云屏青龙",
boss_lingjiaxuanwu: "灵甲玄武",
@@ -5471,12 +5475,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
boss_tuntianchiwen: "吞天螭吻",
boss_shihuosuanni: "食火狻猊",
boss_lieshiyazi: "裂石睚眦",
-
+
boss_kumuyuanrang: "枯目元让",
boss_baijiwenyuan: "百计文远",
boss_yihanyunchang: "翊汉云长",
boss_fuweizilong: "扶危子龙",
-
+
boss_xiaorui: "骁锐",
boss_xiaorui2: "骁锐",
boss_xiaorui_info: "友方角色于其回合内使用【杀】造成伤害后，其使用【杀】的次数+1。",
@@ -5727,7 +5731,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.shishengshibai % 10 == 9 &&
card.name == "tiesuo"
)
- return "zerotarget";
+ return [0, 0, 0, 0];
},
},
},
@@ -6872,11 +6876,6 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
ai: {
threaten: 1.5,
- effect: {
- target: function (card, player, target) {
- if (card.name == "guiyoujie") return [0, 1];
- },
- },
},
},
boss_zhenwei: {
@@ -7003,13 +7002,6 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
event.redo();
}
},
- ai: {
- effect: {
- target: function (card, player, target) {
- if (card.name == "guiyoujie") return [0, 1];
- },
- },
- },
},
boss_tanshi: {
trigger: { player: "phaseEnd" },
@@ -7262,7 +7254,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
nodamage: true,
effect: {
target: function (card, player, target, current) {
- if (get.tag(card, "damage") && !get.tag(card, "thunderDamage")) return [0, 0];
+ if (get.tag(card, "damage") && !get.tag(card, "thunderDamage")) return "zeroplayertarget";
},
},
},
@@ -7359,7 +7351,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
nofire: true,
effect: {
target: function (card, player, target, current) {
- if (get.tag(card, "fireDamage")) return 0;
+ if (get.tag(card, "fireDamage")) return "zeroplayertarget";
},
},
},
@@ -8160,7 +8152,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
name: source.name,
stat: source.stat,
});
-
+
game.broadcastAll(
function (source, name, color) {
_status.friend.remove(name);
@@ -8178,7 +8170,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
color
);
game.log(source, "出场");
-
+
source.draw(4);
var evt = event.getParent("dying");
if (evt && evt.parent) {
@@ -8210,10 +8202,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
}
if (!num || typeof num != "number") return this;
-
+
this.storage.longchuanzhibao += num;
this.updateMark("longchuanzhibao");
-
+
if (source) {
source.storage.longchuanzhibao -= num;
source.updateMark("longchuanzhibao");
@@ -8221,7 +8213,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else {
game.log(this, "获得了" + get.cnNumber(num) + "个", "#y龙船至宝");
}
-
+
if (source && source.side != this.side) {
this.draw(num, "nodelay");
var that = this;
@@ -8232,7 +8224,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
friend.draw(num, "nodelay");
}
}
-
+
var map = { wei: 0, shu: 0, wu: 0, qun: 0 };
for (var i = 0; i < game.players.length; i++) {
var current = game.players[i];
@@ -8380,7 +8372,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}
return;
}
-
+
var list = this.side == game.me.side ? _status.friend : _status.enemy;
if (
(list.length == 0 && lib.storage.noreplace_end) ||
@@ -8644,7 +8636,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
_status.enemyCount.innerHTML =
"杀敌: " + get.cnNumber(_status.enemyDied.length, true);
}
-
+
var list = this.side == me.side ? _status.friend : _status.enemy;
if (
(list.length == 0 && lib.storage.noreplace_end) ||
@@ -8804,5 +8796,5 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"8号位游戏开始时额外摸一张牌，7、8号位可在游戏开始时置换一次手牌
- " +
"杀死对方忠臣摸2+x张牌，x为对方（含刚被杀的忠臣）与己方的存活人数之差；主公杀死己方忠臣须弃置所有牌",
},
- };
-});
+ }
+}
diff --git a/node_modules/@types/noname-typings/Skill.d.ts b/node_modules/@types/noname-typings/Skill.d.ts
index 1fbb75517e..992347e2a1 100644
--- a/node_modules/@types/noname-typings/Skill.d.ts
+++ b/node_modules/@types/noname-typings/Skill.d.ts
@@ -825,6 +825,22 @@ declare interface Skill {
*/
zhuSkill?: boolean;
+ /**
+ * 是否为势力技：
+ *
+ * 请填写对应势力
+ */
+ groupSkill?: string;
+
+ /**
+ * 是否与【杀】相关：
+ * 用于DIY张绣〖百鸣〗检测
+ * 默认技能描述中含“【杀】”的是“与杀相关的技能”
+ * 若shaRelated为true，则直接视为该技能是符合条件的技能
+ * 若shaRelated为false，则直接视为该技能不是符合条件的技能
+ */
+ shaRelated?: boolean;
+
//主动技能（主动使用技能，包含技能使用的相关操作配置）
/**
* 可使用的阶段
@@ -1417,6 +1433,12 @@ declare interface Skill {
* 比如伊籍的【急援】，可能会出现“同时将一些牌交给了多名角色”的情况
*/
getIndex?: (event, player, triggername) => number | Player[];
+
+ /**
+ * 持恒技
+ */
+ persevereSkill?: boolean;
+
//日后还有很多属性要添加的
[key: string]: any;
}
@@ -1538,6 +1560,7 @@ declare interface SkillAI {
nomingzhi?: boolean;
/**
* 反转装备的优先值，用于设置装备卡牌card.ai.basic.order的默认优先度；
+ * 一般是用来顶装备刷收益的，如〖枭姬〗
*/
reverseEquip?: boolean;
/** 非身份，国战使用，濒死阶段，有该标记，可以强行进行复活求帮助 */
@@ -1564,11 +1587,19 @@ declare interface SkillAI {
usedu?: boolean;
/** 不受毒影响 */
nodu?: boolean;
+ /** 免疫锦囊 */
notrick?: boolean;
+ /** 免疫锦囊牌造成的伤害 */
notricksource?: boolean;
+ /** 【闪】能用则用，即使数量不够 */
useShan?: boolean;
+ /** 不用【闪】，即使挨打要濒死 */
noShan?: boolean;
+ /** 此时让技能持有者获得牌没有收益，如〖自书〗 */
+ nogain?: boolean;
+ /** 此时让技能持有者失去牌没有收益，如〖屯田〗 */
nolose?: boolean;
+ /** 此时让技能持有者弃置牌没有收益，如〖屯田〗 */
nodiscard?: boolean;
/** 玩家不响应无懈 */
@@ -1953,4 +1984,4 @@ interface ChooseButtonConfigData {
* @param player
*/
chooseControl?(event: GameEvent, player: Player): string[];
-}
\ No newline at end of file
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/game/codemirror.d.ts b/node_modules/@types/noname-typings/nonameModules/game/codemirror.d.ts
index 83a361e3d0..5caf2e315a 100644
--- a/node_modules/@types/noname-typings/nonameModules/game/codemirror.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/game/codemirror.d.ts
@@ -2,4 +2,4 @@ export default CodeMirror;
/**
* @type { typeof import('codemirror/index') }
*/
-declare var CodeMirror: typeof import("codemirror/index");
+declare var CodeMirror: typeof import('codemirror/index');
diff --git a/node_modules/@types/noname-typings/nonameModules/noname.d.ts b/node_modules/@types/noname-typings/nonameModules/noname.d.ts
index 0074af79c2..2b570c8752 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname.d.ts
@@ -1,5 +1,4 @@
export const rootURL: URL;
-export { boot } from "./noname/init/index.js";
export { GNC, gnc, setGNC } from "./noname/gnc/index.js";
export { AI, ai, setAI } from "./noname/ai/index.js";
export { Game, game, setGame } from "./noname/game/index.js";
@@ -7,3 +6,4 @@ export { Get, get, setGet } from "./noname/get/index.js";
export { Library, lib, setLibrary } from "./noname/library/index.js";
export { status, _status, setStatus } from "./noname/status/index.js";
export { UI, ui, setUI } from "./noname/ui/index.js";
+export { boot, onload } from "./noname/init/index.js";
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/ai/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/ai/index.d.ts
index 70c9609f77..19013932e5 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/ai/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/ai/index.d.ts
@@ -1,6 +1,12 @@
export class AI {
basic: Basic;
get: import("../get/index.js").Get;
+ /**
+ * @param { any } obj
+ * @param { boolean } [similar] true伪equals, false统一前缀
+ * @returns { string } cacheKey
+ */
+ getCacheKey(obj: any, similar?: boolean): string;
}
export let ai: AI;
export function setAI(instance?: InstanceType): void;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/game/PauseManager.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/game/PauseManager.d.ts
new file mode 100644
index 0000000000..fa10d6c646
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/game/PauseManager.d.ts
@@ -0,0 +1,18 @@
+export default class PauseManager {
+ #private;
+ pause: Deferred;
+ pause2: Deferred;
+ pause3: Deferred;
+ over: Deferred;
+ delay: Deferred;
+ setDelay(promise: Promise): Promise;
+ waitPause(): Promise;
+}
+declare class Deferred {
+ #private;
+ get isStarted(): boolean;
+ start(): void;
+ resolve(): void;
+ then(onfulfilled?: ((value: void) => void | PromiseLike) | null, onrejected?: ((reason: any) => never | PromiseLike) | null): Promise;
+}
+export {};
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/game/compatible.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/game/compatible.d.ts
new file mode 100644
index 0000000000..1505e3391e
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/game/compatible.d.ts
@@ -0,0 +1,29 @@
+/**
+ * @param { InstanceType } [instance]
+ */
+export function setGameCompatible(instance?: InstanceType): void;
+export class GameCompatible {
+ /**
+ * `game/game.js`中退出客户端用到的代码
+ *
+ * @author Spmario233
+ */
+ exit(): void;
+ /**
+ * @async
+ * @param {UpdateReason} type
+ * @param {string} [text]
+ * @returns {Promise}
+ */
+ tryUpdateClient(type: UpdateReason, text?: string): Promise;
+}
+export let game: GameCompatible;
+/**
+ * *
+ */
+export type UpdateReason = number;
+export namespace UpdateReason {
+ let DEBUG: number;
+ let FALLBACK: number;
+ let UNDERSUPPORT: number;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/game/dynamic-style/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/game/dynamic-style/index.d.ts
index 46cb93dc8f..64e1ceb645 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/game/dynamic-style/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/game/dynamic-style/index.d.ts
@@ -37,7 +37,7 @@ export class DynamicStyle {
*/
get(name: string): {
[x: string]: string | number;
- } | null;
+ };
/**
* Callback of `DynamicStyle#find`, getting the rule wanted.
* `DynamicStyle#find`的回调函数，用于获取符合要求的规则
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts
index e5444619ea..75bef2ec4b 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/game/index.d.ts
@@ -15,7 +15,7 @@ export class Game extends GameCompatible {
* @type { { [key: string]: Player } }
*/
playerMap: {
- [key: string]: Player;
+ [key: string]: import("noname-typings/nonameModules/noname/library/element/player.js").Player;
};
phaseNumber: number;
roundNumber: number;
@@ -64,7 +64,7 @@ export class Game extends GameCompatible {
/**
* 洗牌
*/
- washCard(): false | any[] | (import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise);
+ washCard(): false | any[] | import("../library/element/gameEvent.js").GameEvent;
/**
* 基于钩子的添加势力方法
*/
@@ -81,7 +81,7 @@ export class Game extends GameCompatible {
* @param {Parameters} args
*/
callHook(name: Name, args: Parameters): void;
- yingbianEffect(event: any, content: any, ...args: any[]): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ yingbianEffect(event: any, content: any, ...args: any[]): import("../library/element/gameEvent.js").GameEvent;
setYingbianConditionColor(yingbianCondition: any, color: any): void;
setComplexYingbianCondition(yingbianCondition: any, condition: any): void;
setSimpleYingbianCondition(yingbianCondition: any, condition: any): void;
@@ -168,7 +168,7 @@ export class Game extends GameCompatible {
*/
loseAsync(arg?: {
[key: string]: any;
- }): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ }): import("../library/element/gameEvent.js").GameEvent;
callFuncUseStepCache(prefix: any, func: any, params: any): any;
/**
* @param {string} name
@@ -189,7 +189,7 @@ export class Game extends GameCompatible {
* @param { GameEventPromise } [last]
* @returns { void }
*/
- checkGlobalHistory(key: T, filter: (event: GameEventPromise) => boolean, last?: GameEventPromise): void;
+ checkGlobalHistory(key: T_1, filter: (event: GameEventPromise) => boolean, last?: GameEventPromise): void;
/**
* @overload
* @returns { GameHistory }
@@ -203,7 +203,7 @@ export class Game extends GameCompatible {
* @param { GameEventPromise } [last]
* @returns { GameHistory[T] }
*/
- getGlobalHistory(key: T, filter?: (event: GameEventPromise) => boolean, last?: GameEventPromise): GameHistory[T];
+ getGlobalHistory(key: T_2, filter?: (event: GameEventPromise) => boolean, last?: GameEventPromise): GameHistory[T_2];
/**
* @template { keyof GameHistory } T
* @param { T } key
@@ -211,7 +211,7 @@ export class Game extends GameCompatible {
* @param { GameEventPromise } [last]
* @returns { boolean }
*/
- hasAllGlobalHistory(key: T, filter: (event: GameEventPromise) => boolean, last?: GameEventPromise): boolean;
+ hasAllGlobalHistory(key: T_3, filter: (event: GameEventPromise) => boolean, last?: GameEventPromise): boolean;
/**
* @template { keyof GameHistory } T
* @param { T } key
@@ -219,7 +219,7 @@ export class Game extends GameCompatible {
* @param { GameEventPromise } [last]
* @returns { void }
*/
- checkAllGlobalHistory(key: T, filter: (event: GameEventPromise) => boolean, last?: GameEventPromise): void;
+ checkAllGlobalHistory(key: T_4, filter: (event: GameEventPromise) => boolean, last?: GameEventPromise): void;
/**
* @overload
* @returns { GameHistory[] }
@@ -233,7 +233,7 @@ export class Game extends GameCompatible {
* @param { GameEventPromise } [last]
* @returns { GameHistory[T] }
*/
- getAllGlobalHistory(key: T, filter?: (event: GameEventPromise) => boolean, last?: GameEventPromise): GameHistory[T];
+ getAllGlobalHistory(key: T_5, filter?: (event: GameEventPromise) => boolean, last?: GameEventPromise): GameHistory[T_5];
/**
* @overload
* @returns { void }
@@ -279,14 +279,14 @@ export class Game extends GameCompatible {
* @param { 'toRenku' | false } [bool] 为false时不触发trigger，为'toRenku'时牌放到仁库
* @returns { GameEventPromise }
*/
- cardsGotoSpecial(cards: Card, bool?: "toRenku" | false): GameEventPromise;
+ cardsGotoSpecial(cards: Card, bool?: 'toRenku' | false): GameEventPromise;
/**
* @overload
* @param {Card[]} cards
* @param { 'toRenku' | false } [bool] 为false时不触发trigger，为'toRenku'时牌放到仁库
* @returns { GameEventPromise }
*/
- cardsGotoSpecial(cards: Card[], bool?: "toRenku" | false): GameEventPromise;
+ cardsGotoSpecial(cards: Card[], bool?: 'toRenku' | false): GameEventPromise;
/**
*
* @param {...(
@@ -298,7 +298,10 @@ export class Game extends GameCompatible {
* )} args
* @returns
*/
- cardsGotoPile(...args: (Card[] | Card | Function | "insert" | "washCard" | "triggeronly" | [string, any])[]): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ cardsGotoPile(...args: (Card[] | Card | Function | 'insert' | 'washCard' | 'triggeronly' | [
+ string,
+ any
+ ])[]): import("../library/element/gameEvent.js").GameEvent;
/**
* @param { GameEventPromise } event
*/
@@ -340,7 +343,7 @@ export class Game extends GameCompatible {
/**
* @param { 'hidden' } [type]
*/
- randomMapOL(type?: "hidden"): void;
+ randomMapOL(type?: 'hidden'): void;
closeMenu(): void;
closeConnectMenu(): void;
closePopped(): void;
@@ -351,7 +354,31 @@ export class Game extends GameCompatible {
* @param { ...Parameters } args
* @returns { void }
*/
- broadcast(func: T, ...args: Parameters<(typeof lib.message.client)[T]>[]): void;
+ broadcast(func: T_6, ...args: Parameters<{
+ log: (arr: any) => void;
+ opened: () => void;
+ onconnection: (id: any) => void;
+ onmessage: (id: any, message: any) => void;
+ onclose: (id: any) => void;
+ selfclose: () => void;
+ reloadroom: (forced: any) => void;
+ createroom: (index: any, config: any, mode: any) => void;
+ enterroomfailed: () => void;
+ roomlist: (list: any, events: any, clients: any, wsid: any) => void;
+ updaterooms: (list: any, clients: any) => void;
+ updateclients: (clients: any, bool: any) => void;
+ updateevents: (events: any) => void;
+ eventsdenied: (reason: any) => void;
+ init: (id: any, config: any, ip: any, servermode: any, roomId: any) => void;
+ reinit: (config: any, state: any, state2: any, ip: any, observe: any, onreconnect: any, cardtag: any, postReconnect: any) => void;
+ exec: (func: any, ...args: any[]) => void;
+ denied: (reason: any) => void;
+ cancel: (id: any) => void;
+ closeDialog: (id: any) => void;
+ createDialog: (id: any, ...args: any[]) => void;
+ gameStart: () => void;
+ updateWaiting: (map: any) => void;
+ }[T_6]>): void;
/**
* @template { any[] } T
* @overload
@@ -359,7 +386,7 @@ export class Game extends GameCompatible {
* @param { ...T } args
* @returns { void }
*/
- broadcast(func: (...args: T) => void, ...args: T[]): void;
+ broadcast(func: (...args: T_6) => void, ...args: T_6): void;
/**
* @template { keyof typeof lib.message.client } T
* @overload
@@ -367,7 +394,31 @@ export class Game extends GameCompatible {
* @param { ...Parameters } args
* @returns { void }
*/
- broadcastAll(func: T, ...args: Parameters<(typeof lib.message.client)[T]>[]): void;
+ broadcastAll(func: T_7, ...args: Parameters<{
+ log: (arr: any) => void;
+ opened: () => void;
+ onconnection: (id: any) => void;
+ onmessage: (id: any, message: any) => void;
+ onclose: (id: any) => void;
+ selfclose: () => void;
+ reloadroom: (forced: any) => void;
+ createroom: (index: any, config: any, mode: any) => void;
+ enterroomfailed: () => void;
+ roomlist: (list: any, events: any, clients: any, wsid: any) => void;
+ updaterooms: (list: any, clients: any) => void;
+ updateclients: (clients: any, bool: any) => void;
+ updateevents: (events: any) => void;
+ eventsdenied: (reason: any) => void;
+ init: (id: any, config: any, ip: any, servermode: any, roomId: any) => void;
+ reinit: (config: any, state: any, state2: any, ip: any, observe: any, onreconnect: any, cardtag: any, postReconnect: any) => void;
+ exec: (func: any, ...args: any[]) => void;
+ denied: (reason: any) => void;
+ cancel: (id: any) => void;
+ closeDialog: (id: any) => void;
+ createDialog: (id: any, ...args: any[]) => void;
+ gameStart: () => void;
+ updateWaiting: (map: any) => void;
+ }[T_7]>): void;
/**
* @template { any[] } T
* @overload
@@ -375,7 +426,7 @@ export class Game extends GameCompatible {
* @param { ...T } args
* @returns { void }
*/
- broadcastAll(func: (...args: T) => void, ...args: T[]): void;
+ broadcastAll(func: (...args: T_7) => void, ...args: T_7): void;
syncState(): void;
updateWaiting(): void;
/**
@@ -436,7 +487,7 @@ export class Game extends GameCompatible {
* @param { ...string | number | ((evt: Event) => void) } args
* @returns { HTMLAudioElement }
*/
- playAudio(...args: (string | number | ((evt: Event) => void))[]): HTMLAudioElement;
+ playAudio(...args: string | number | ((evt: Event) => void)): HTMLAudioElement;
/**
* @param { object } options
* @param { string[] } options.audioList
@@ -500,7 +551,12 @@ export class Game extends GameCompatible {
audioname2?: {
[playerName: string]: string | number | boolean | [string, number];
};
- } | (string | number | boolean | [string, number])): import("../get/audio.js").TextMap[];
+ } | (string | number | boolean | [string, number])): {
+ name: string;
+ file: string;
+ text: string;
+ type: string;
+ }[];
/**
* @deprecated 请使用get.Audio.die().audioList
*
@@ -508,7 +564,12 @@ export class Game extends GameCompatible {
* @param { string | Player } player 角色名
* @returns 语音地址列表
*/
- parseDieTextMap(player: string | Player): import("../get/audio.js").TextMap[];
+ parseDieTextMap(player: string | Player): {
+ name: string;
+ file: string;
+ text: string;
+ type: string;
+ }[];
/**
*
* @param { string } skill
@@ -516,9 +577,10 @@ export class Game extends GameCompatible {
* @param { boolean } [directaudio]
* @param { boolean } [nobroadcast]
* @param { any } [skillInfo]
+ * @param { any[] } [args] logAudio的参数
* @returns
*/
- trySkillAudio(skill: string, player: Player | string, directaudio?: boolean, nobroadcast?: boolean, skillInfo?: any): HTMLAudioElement | (() => HTMLAudioElement);
+ trySkillAudio(skill: string, player: Player | string, directaudio?: boolean, nobroadcast?: boolean, skillInfo?: any, args?: any[]): HTMLAudioElement | (() => HTMLAudioElement);
/**
* @param { Player | string } player
* @returns
@@ -550,7 +612,7 @@ export class Game extends GameCompatible {
* ) => importCharacterConfig } content
* @param {*} [url]
*/
- import(type: "character", content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importCharacterConfig, url?: any): any;
+ import(type: 'character', content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importCharacterConfig, url?: any): any;
/**
* @overload
* @param { 'card' } type
@@ -564,7 +626,7 @@ export class Game extends GameCompatible {
* ) => importCardConfig } content
* @param {*} [url]
*/
- import(type: "card", content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importCardConfig, url?: any): any;
+ import(type: 'card', content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importCardConfig, url?: any): any;
/**
* @overload
* @param { 'mode' } type
@@ -578,7 +640,7 @@ export class Game extends GameCompatible {
* ) => importModeConfig } content
* @param {*} [url]
*/
- import(type: "mode", content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importModeConfig, url?: any): any;
+ import(type: 'mode', content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importModeConfig, url?: any): any;
/**
* @overload
* @param { 'player' } type
@@ -592,7 +654,7 @@ export class Game extends GameCompatible {
* ) => importPlayerConfig } content
* @param {*} [url]
*/
- import(type: "player", content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importPlayerConfig, url?: any): any;
+ import(type: 'player', content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importPlayerConfig, url?: any): any;
/**
* @overload
* @param { 'extension' } type
@@ -606,7 +668,7 @@ export class Game extends GameCompatible {
* ) => importExtensionConfig } content
* @param {*} [url]
*/
- import(type: "extension", content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importExtensionConfig, url?: any): any;
+ import(type: 'extension', content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importExtensionConfig, url?: any): any;
/**
* @overload
* @param { 'play' } type
@@ -620,53 +682,77 @@ export class Game extends GameCompatible {
* ) => importPlayConfig } content
* @param {*} [url]
*/
- import(type: "play", content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importPlayConfig, url?: any): any;
+ import(type: 'play', content: (lib: InstanceType, game: InstanceType, ui: InstanceType, get: InstanceType, ai: InstanceType, _status: InstanceType) => importPlayConfig, url?: any): any;
loadExtension(object: any): Promise;
/**
* 下载文件
* @type { undefined | ((url: string, folder: string, onsuccess?: Function, onerror?: (e: Error) => void, dev?: 'nodev', onprogress?: Function) => void) }
*/
- download: undefined | ((url: string, folder: string, onsuccess?: Function, onerror?: (e: Error) => void, dev?: "nodev", onprogress?: Function) => void);
+ download: (url: string, folder: string, onsuccess?: Function, onerror?: (e: Error) => void, dev?: 'nodev', onprogress?: Function) => void;
+ /**
+ * 检查指定的路径是否是一个文件
+ *
+ * @param {string} fileName - 需要查询的路径
+ * @param {(result: -1 | 0 | 1) => void} [callback] - 回调函数；接受的参数意义如下:
+ * - `-1`: 路径不存在或无法访问
+ * - `0`: 路径的内容不是文件
+ * - `1`: 路径的内容是文件
+ * @param {(err: Error) => void} [onerror] - 接收错误的回调函数
+ * @return {void} - 由于三端的异步需求和历史原因，文件管理必须为回调异步函数
+ */
+ checkFile: any;
+ /**
+ * 检查指定的路径是否是一个目录
+ *
+ * @param {string} dir - 需要查询的路径
+ * @param {(result: -1 | 0 | 1) => void} [callback] - 回调函数；接受的参数意义如下:
+ * - `-1`: 路径不存在或无法访问
+ * - `0`: 路径的内容不是目录
+ * - `1`: 路径的内容是目录
+ * @param {(err: Error) => void} [onerror] - 接收错误的回调函数
+ * @return {void} - 由于三端的异步需求和历史原因，文件管理必须为回调异步函数
+ */
+ checkDir: any;
/**
* 读取文件为arraybuffer
* @type { undefined | ((filename: string, callback?: (data: Buffer | ArrayBuffer) => any, onerror?: (e: Error) => void) => void) }
*/
- readFile: undefined | ((filename: string, callback?: (data: Buffer | ArrayBuffer) => any, onerror?: (e: Error) => void) => void);
+ readFile: (filename: string, callback?: (data: Buffer | ArrayBuffer) => any, onerror?: (e: Error) => void) => void;
/**
* 读取文件为文本
* @type { undefined | ((filename: string, callback?: (data: string) => any, onerror?: (e: Error) => void) => void) }
*/
- readFileAsText: undefined | ((filename: string, callback?: (data: string) => any, onerror?: (e: Error) => void) => void);
+ readFileAsText: (filename: string, callback?: (data: string) => any, onerror?: (e: Error) => void) => void;
/**
* 将数据写入文件
* @type { undefined | ((data: File | ArrayBuffer, path: string, name: string, callback?: (e: Error) => void) => void) }
*/
- writeFile: undefined | ((data: File | ArrayBuffer, path: string, name: string, callback?: (e: Error) => void) => void);
+ writeFile: (data: File | ArrayBuffer, path: string, name: string, callback?: (e: Error) => void) => void;
/**
* 移除文件
* @type { undefined | ((filename: string, callback?: (e: Error) => void) => void) }
*/
- removeFile: undefined | ((filename: string, callback?: (e: Error) => void) => void);
+ removeFile: (filename: string, callback?: (e: Error) => void) => void;
/**
* 获取文件列表
* @type { undefined | ((dir: string, success: (folders: string[], files: string[]) => any, failure?: (e: Error) => void) => void) }
*/
- getFileList: undefined | ((dir: string, success: (folders: string[], files: string[]) => any, failure?: (e: Error) => void) => void);
+ getFileList: (dir: string, success: (folders: string[], files: string[]) => any, failure?: (e: Error) => void) => void;
/**
* 按路径依次创建文件夹
* @type { undefined | ((list: string | string[], callback: Function, file?: boolean) => void) }
*/
- ensureDirectory: undefined | ((list: string | string[], callback: Function, file?: boolean) => void);
+ ensureDirectory: (list: string | string[], callback: Function, file?: boolean) => void;
/**
* 创建文件夹
* @type { undefined | ((directory: string, successCallback?: Function, errorCallback?: Function) => void) }
*/
- createDir: undefined | ((directory: string, successCallback?: Function, errorCallback?: Function) => void);
+ createDir: (directory: string, successCallback?: Function, errorCallback?: Function) => void;
/**
* 删除文件夹
* @type { undefined | ((directory: string, successCallback?: Function, errorCallback?: Function) => void) }
*/
- removeDir: undefined | ((directory: string, successCallback?: Function, errorCallback?: Function) => void);
+ removeDir: (directory: string, successCallback?: Function, errorCallback?: Function) => void;
/**
* @type { (forcecheck?: boolean | null, dev?: boolean) => Promise }
*/
@@ -717,6 +803,11 @@ export class Game extends GameCompatible {
playVideoContent(video: Videos): void;
videoContent: {
arrangeLib: (content: any) => void;
+ cardtag: (cardtag: any) => void;
+ addVirtualEquip: (player: any, map: any) => void;
+ addVirtualJudge: (player: any, map: any) => void;
+ removeVirtualEquip: (player: any, card: any) => void;
+ removeVirtualJudge: (player: any, card: any) => void;
$syncDisable: (player: any, map: any) => void;
$syncExpand: (player: any, map: any) => void;
$disableJudge: (player: any, map: any) => void;
@@ -858,11 +949,11 @@ export class Game extends GameCompatible {
run(): void;
/**
* @param { string } type
- * @param { Player } player
+ * @param { Player|null } player
* @param { any } [content]
* @returns
*/
- addVideo(type: string, player: Player, content?: any): void;
+ addVideo(type: string, player: Player | null, content?: any): void;
/**
* @param { Function } func
*/
@@ -881,21 +972,21 @@ export class Game extends GameCompatible {
/**
* @param { [number, number | {opacity:any, color:any, dashed:any, duration:any} | string, number, number] } path
*/
- linexy(path: [number, number | {
+ linexy(path: [number, string | number | {
opacity: any;
color: any;
dashed: any;
duration: any;
- } | string, number, number], ...args: any[]): any;
+ }, number, number], ...args: any[]): any;
/**
* @param { [number, number | {opacity:any, color:any, dashed:any, duration:any} | string, number, number] } path
*/
- _linexy(path: [number, number | {
+ _linexy(path: [number, string | number | {
opacity: any;
color: any;
dashed: any;
duration: any;
- } | string, number, number], ...args: any[]): void;
+ }, number, number], ...args: any[]): void;
/**
* @param { string } name
* @param { string } skill
@@ -909,9 +1000,9 @@ export class Game extends GameCompatible {
*
* @param { string } name
* @param { false } [trigger]
- * @param { GameEventPromise } [triggerEvent]
+ * @param { GameEvent } [triggerEvent]
*/
- createEvent(name: string, trigger?: false, triggerEvent?: GameEventPromise): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ createEvent(name: string, trigger?: false, triggerEvent?: GameEvent): import("../library/element/gameEvent.js").GameEvent;
/**
* @param { string } name
* @param { { extension: string, sex: Sex, group: string, hp: string | number, skills?: string[], tags?: any[], translate: string } } information
@@ -930,15 +1021,15 @@ export class Game extends GameCompatible {
* @param { string } [packagename]
*/
addCharacterPack(pack: {
+ [key: string]: any;
mode?: string;
forbid?: any;
character: {
[key: string]: Character;
};
skill: {
- [key: string]: object;
+ [key: string]: any;
};
- [key: string]: any;
}, packagename?: string): void;
/**
* @param { string } name
@@ -962,10 +1053,10 @@ export class Game extends GameCompatible {
forbid?: string[];
list: any[];
card: {
- [key: string]: Card;
+ [key: string]: import("noname-typings/nonameModules/noname/library/element/card.js").Card;
};
skill: {
- [key: string]: object;
+ [key: string]: any;
};
}, packagename?: string): void;
/**
@@ -977,7 +1068,7 @@ export class Game extends GameCompatible {
* @param { string } [abInfo]
*/
addSkill(name: string, info: {
- [key: string]: object;
+ [key: string]: any;
}, translate?: string, description?: string, appendInfo?: string, abInfo?: string): boolean;
/**
* @param { string } name
@@ -987,7 +1078,7 @@ export class Game extends GameCompatible {
addMode(name: string, info: any, info2: {
translate: string;
config: {
- [key: string]: object;
+ [key: string]: any;
};
}): void;
/**
@@ -1062,63 +1153,59 @@ export class Game extends GameCompatible {
*/
over(result?: boolean | string, bool?: boolean, ...args: any[]): void;
/**
- * @type { Map> }
- *
- * 以Promise储存异步事件的执行链，使async content调用事件时无需必须使用await
- *
- * 但是需要事件结果的除外
- */
- executingAsyncEventMap: Map>;
- /**
- * @type { GameEventPromise[] }
- */
- belongAsyncEventList: GameEventPromise[];
- /**
- * @param { GameEventPromise } [belongAsyncEvent]
- */
- loop(belongAsyncEvent?: GameEventPromise): Promise;
- /**
- * @param { GameEventPromise } [belongAsyncEvent]
+ * @param { GameEvent } [event]
*/
- runContent(belongAsyncEvent?: GameEventPromise): Promise;
- pause(): void;
- pause2(): void;
+ loop(event?: GameEvent): Promise;
+ pause(): {
+ "__#2@#promise": Promise;
+ "__#2@#resolver": () => void;
+ readonly isStarted: boolean;
+ start(): void;
+ resolve(): void;
+ then(onfulfilled?: (value: void) => void | PromiseLike, onrejected?: (reason: any) => PromiseLike): Promise;
+ };
+ pause2(): {
+ "__#2@#promise": Promise;
+ "__#2@#resolver": () => void;
+ readonly isStarted: boolean;
+ start(): void;
+ resolve(): void;
+ then(onfulfilled?: (value: void) => void | PromiseLike, onrejected?: (reason: any) => PromiseLike): Promise;
+ };
resume(): void;
resume2(): void;
- delaye(...args: any[]): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
- delayex(...args: any[]): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
/**
* @param { number } [time]
* @param { number } [time2]
*/
- delay(time?: number, time2?: number): void;
+ delaye(time?: number, time2?: number, ...args: any[]): import("../library/element/gameEvent.js").GameEvent;
/**
* @param { number } [time]
* @param { number } [time2]
*/
- delayx(time?: number, time2?: number): void;
+ delayex(time?: number, time2?: number, ...args: any[]): import("../library/element/gameEvent.js").GameEvent;
/**
- * 在async content中对game.delay的代替使用方法
- *
- * 因为async content里不应该使用game.pause和game.resume
- *
* @param { number } [time]
* @param { number } [time2]
*/
- asyncDelay(time?: number, time2?: number): Promise;
+ delay(time?: number, time2?: number): Promise;
/**
- * 在async content中对game.delayx的代替使用方法
- *
- * 因为async content里不应该使用game.pause和game.resume
- *
* @param { number } [time]
* @param { number } [time2]
*/
- asyncDelayx(time?: number, time2?: number): Promise;
+ delayx(time?: number, time2?: number): Promise;
/**
- * @param { GameEventPromise } [event]
+ * @deprecated
+ */
+ asyncDelay(time: any, time2: any): Promise;
+ /**
+ * @deprecated
+ */
+ asyncDelayx(time: any, time2: any): Promise;
+ /**
+ * @param { GameEvent } [event]
*/
- check(event?: GameEventPromise): boolean;
+ check(event?: GameEvent): boolean;
Check: Check;
uncheck(...args: any[]): void;
/**
@@ -1145,9 +1232,10 @@ export class Game extends GameCompatible {
findNext(player: Player): import("noname-typings/nonameModules/noname/library/element/player.js").Player;
/**
* @param { string } name
- * @param { Function } callback
+ * @param { (exports: importModeConfig) => any } [callback]
+ * @param { (error: unknown) => any } [onerror]
*/
- loadModeAsync(name: string, callback: Function): void;
+ loadModeAsync(name: string, callback?: (exports: importModeConfig) => any, onerror?: (error: unknown) => any): Promise;
/**
* @param { string } name
* @param {*} configx
@@ -1168,7 +1256,7 @@ export class Game extends GameCompatible {
/**
* @param { Player } [player]
*/
- gameDraw(player?: Player, num?: number): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ gameDraw(player?: Player, num?: number): import("../library/element/gameEvent.js").GameEvent;
chooseCharacterDouble(...args: any[]): void;
updateRoundNumber(): void;
/**
@@ -1179,7 +1267,7 @@ export class Game extends GameCompatible {
*/
asyncDraw(players: Player[], num?: number | number[] | ((player: Player) => number), drawDeck?: {
drawDeck: boolean;
- }, bottom?: boolean): Promise;
+ }, bottom?: boolean): Promise[]>;
/**
* @param { Player[] } players
* @param { number | number[] | (player: Player) => number } num
@@ -1195,9 +1283,9 @@ export class Game extends GameCompatible {
*/
checkMod(...args: any[]): any;
/**
- * @param { number } num
+ * @param { number } [num]
*/
- prepareArena(num: number): void;
+ prepareArena(num?: number): void;
clearArena(): void;
clearConnect(): void;
log(...args: any[]): void;
@@ -1249,9 +1337,9 @@ export class Game extends GameCompatible {
* @param { string } key
* @param { * } [value]
* @param { string | boolean } [local]
- * @param { Function } [callback]
+ * @param { function(): void } [callback]
*/
- saveConfig(key: string, value?: any, local?: string | boolean, callback?: Function): void;
+ saveConfig(key: string, value?: any, local?: string | boolean, callback?: () => void): void;
/**
* @param { string } key
*/
@@ -1291,7 +1379,7 @@ export class Game extends GameCompatible {
/**
* @param { Player } player
*/
- triggerEnter(player: Player): import("../library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ triggerEnter(player: Player): import("../library/element/gameEvent.js").GameEvent;
/**
* @param { Player } player
*/
@@ -1342,12 +1430,7 @@ export class Game extends GameCompatible {
* @param { (player: Player) => boolean } func
* @param { boolean } [includeOut]
*/
- countPlayer2(func: (player: Player) => boolean, includeOut?: boolean): number;
- /**
- * @overload
- * @returns { Player[] }
- */
- filterPlayer(): Player[];
+ countPlayer2(func?: (player: Player) => boolean, includeOut?: boolean): number;
/**
* @overload
* @param { (player: Player) => boolean } func
@@ -1356,11 +1439,6 @@ export class Game extends GameCompatible {
* @returns { Player[] }
*/
filterPlayer(func: (player: Player) => boolean, list?: Player[], includeOut?: boolean): Player[];
- /**
- * @overload
- * @returns { Player[] }
- */
- filterPlayer2(): Player[];
/**
* @overload
* @param { (player: Player) => boolean } func
@@ -1430,3 +1508,4 @@ import { GamePromises } from "./promises.js";
import { DynamicStyle } from "./dynamic-style/index.js";
import { lib } from "../library/index.js";
import { Check } from "./check.js";
+import { delay } from "../util/index.js";
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/game/promises.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/game/promises.d.ts
index 64459709ff..362e5e3b06 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/game/promises.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/game/promises.d.ts
@@ -43,4 +43,45 @@ export class GamePromises {
* @returns { Promise<[string[], string[]]> } 返回一个数组，第一个元素是文件夹列表，第二个元素是文件列表
*/
getFileList(dir: string): Promise<[string[], string[]]>;
+ /**
+ * @param { string } key
+ * @param { * } [value]
+ * @param { string | boolean } [local]
+ */
+ saveConfig(key: string, value?: any, local?: string | boolean): Promise;
+ /**
+ * @param { string } key
+ */
+ saveConfigValue(key: string): Promise;
+ /**
+ * @param { string } extension
+ * @param { string } key
+ * @param { * } [value]
+ */
+ saveExtensionConfig(extension: string, key: string, value?: any): Promise;
+ /**
+ * @param { string } extension
+ * @param { string } key
+ */
+ saveExtensionConfigValue(extension: string, key: string): Promise;
+ /**
+ * 检查指定的路径是否是一个文件
+ *
+ * @param {string} fileName - 需要查询的路径
+ * @return {Promise<(-1 | 0 | 1)>} - 返回值意义如下:
+ * - `-1`: 路径不存在或无法访问
+ * - `0`: 路径的内容不是文件
+ * - `1`: 路径的内容是文件
+ */
+ checkFile(fileName: string): Promise<(-1 | 0 | 1)>;
+ /**
+ * 检查指定的路径是否是一个目录
+ *
+ * @param {string} dir - 需要查询的路径
+ * @return {Promise<(-1 | 0 | 1)>} - 返回值意义如下:
+ * - `-1`: 路径不存在或无法访问
+ * - `0`: 路径的内容不是目录
+ * - `1`: 路径的内容是目录
+ */
+ checkDir(dir: string): Promise<(-1 | 0 | 1)>;
}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/get/audio.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/get/audio.d.ts
index 16e8c5499b..bbfe23999b 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/get/audio.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/get/audio.d.ts
@@ -1,162 +1,84 @@
-/**
- * @typedef { (string | number | boolean)[] | string | number | boolean } AudioInfo
- * @typedef { {
- * audio: AudioInfo,
- * audioname?: string[],
- * audioname2?: { [playerName: string]: AudioInfo }
- * } } SkillInfo
- * @typedef { {
- * name: string,
- * sex:Sex,
- * name1?: string,
- * name2?: string,
- * tempname: string[]
- * skin: { name?:string }
- * } } FormatedPlayer
- * @typedef { {
- * name: string,
- * file: string,
- * text: string | undefined,
- * type: string,
- * } } TextMap
- */
-export class Audio {
- /**
- * @type { { [key: string]: TextMap[] } }
- */
- static "__#28@#audioCache": {
- [key: string]: TextMap[];
+///
+type logAudio = (...args: any[]) => AudioInfo;
+type AudioInfo = AudioInfo[] | string | number | boolean;
+type SkillInfo = {
+ audio?: AudioInfo;
+ audioname?: string[];
+ audioname2?: {
+ [playerName: string]: AudioInfo;
};
+ logAudio?: logAudio;
+ logAudio2?: {
+ [playerName: string]: logAudio;
+ };
+};
+type FormatedPlayer = {
+ name: string;
+ sex: Sex;
+ name1?: string;
+ name2?: string;
+ tempname: string[];
+ skin: {
+ name?: string;
+ };
+};
+type TextMap = {
+ name: string;
+ file: string;
+ text: string | undefined;
+ type: string;
+};
+export declare class Audio {
+ #private;
/**
* 根据skill中的audio,audioname,audioname2和player来获取技能台词列表及其对应的源文件名
- * @param { object } options
- * @param { string } options.skill 技能名
- * @param { Player | string } [options.player] 角色/角色名
- * @param { AudioInfo | SkillInfo } [options.info] 使用指定的skillInfo/audioInfo
- * @returns { Audio }
+ * @param skill 技能名
+ * @param player 角色/角色名
+ * @param info 使用指定的skillInfo/audioInfo
+ * @param args
*/
- static skill({ skill, player, info }: {
+ static skill({ skill, player, info, args }: {
skill: string;
- player?: Player | string;
+ player: Player | string;
info?: AudioInfo | SkillInfo;
+ args?: any[];
}): Audio;
/**
* 获取角色死亡时能播放的所有阵亡台词列表及其对应的源文件名
- * @param { object } options
- * @param { Player | string } options.player 角色/角色名
- * @param { AudioInfo } [options.info] 使用指定的audioInfo
- * @returns { Audio }
+ * @param player 角色/角色名
+ * @param info 使用指定的audioInfo
+ * @param args
*/
- static die({ player, info }: {
+ static die({ player, info, args }: {
player: Player | string;
info?: AudioInfo;
+ args?: any[];
}): Audio;
- /**
- * @param { Player | string } player
- * @returns { FormatedPlayer }
- */
static formatPlayer(player: Player | string): FormatedPlayer;
- /**
- * @param {TextMap[]} list
- * @returns {string[]}
- */
static toFile(list: TextMap[]): string[];
- /**
- * @param {TextMap[]} list
- * @returns {string[]}
- */
static toText(list: TextMap[]): string[];
- /**
- * @param {AudioBase} audio
- * @param {string[]} history
- */
- constructor(audio: AudioBase, history?: string[]);
- get type(): string;
get name(): string;
- /**
- * @type { TextMap[] }
- */
+ get type(): string;
get audioList(): TextMap[];
get fileList(): string[];
get textList(): string[];
initAudioList(): void;
- getAudio(name: any, info: any): TextMap[];
+ constructor(audio: AudioBase, args?: any[], history?: string[]);
+ getReferenceAudio(name: string, info?: any): TextMap[];
checkHistory(): boolean;
- /**
- * @param {string} name
- * @param {AudioInfo} audioInfo
- * @returns {TextMap[]}
- */
parseAudio(name: string, audioInfo: AudioInfo): TextMap[];
- #private;
}
-export type AudioInfo = (string | number | boolean)[] | string | number | boolean;
-export type SkillInfo = {
- audio: AudioInfo;
- audioname?: string[];
- audioname2?: {
- [playerName: string]: AudioInfo;
- };
-};
-export type FormatedPlayer = {
- name: string;
- sex: Sex;
- name1?: string;
- name2?: string;
- tempname: string[];
- skin: {
- name?: string;
- };
-};
-export type TextMap = {
- name: string;
- file: string;
- text: string | undefined;
+interface AudioBase {
type: string;
-};
-/**
- * @interface
- */
-declare class AudioBase {
- /**
- * @type { string }
- */
- type: string;
- /**
- * @type { string }
- */
name: string;
- /**
- * @type { (name: string) => boolean }
- */
isExist: (name: string) => boolean;
- /**
- * @type { string }
- */
defaultPath: string;
- /**
- * @type { boolean }
- */
+ defaultInfo: AudioInfo;
useCache: boolean;
- /**
- * @type { () => string }
- */
getCacheKey: () => string;
- /**
- * @type { () => AudioInfo }
- */
- getAudioInfo: () => AudioInfo;
- /**
- * @type { (name: string, info?: AudioInfo) => AudioBase }
- */
- getAudio: (name: string, info?: AudioInfo) => AudioBase;
- /**
- * @type { ( path: string, ext: string, name: string ) => TextMap }
- */
+ getAudioInfo: (useDefaultInfo: boolean, args?: any[]) => AudioInfo;
+ getReferenceAudio: (name: string, info?: AudioInfo) => AudioBase;
textMap: (path: string, ext: string, name: string) => TextMap;
- /**
- * @type { ( path: string, ext: string, index?: number ) => TextMap }
- */
textMapWithIndex: (path: string, ext: string, index?: number) => TextMap;
}
export {};
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/get/compatible.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/get/compatible.d.ts
new file mode 100644
index 0000000000..a737264703
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/get/compatible.d.ts
@@ -0,0 +1,27 @@
+/**
+ * @param { InstanceType } [instance]
+ */
+export function setGetCompatible(instance?: InstanceType): void;
+/**
+ * 用于老版本能用的`get`
+ */
+export class GetCompatible {
+ /**
+ *
+ * @param {[majorVersion: number, minorVersion: number, patchVersion: number]} require
+ * @param {[majorVersion: number, minorVersion: number, patchVersion: number]} current
+ * @returns
+ */
+ checkVersion(require: [majorVersion: number, minorVersion: number, patchVersion: number], current: [majorVersion: number, minorVersion: number, patchVersion: number]): boolean;
+ /**
+ * 获取当前内核版本信息
+ *
+ * 目前仅考虑`chrome`, `firefox`和`safari`三种浏览器的信息，其余均归于其他范畴
+ *
+ * > 其他后续或许会增加，但`IE`永无可能
+ *
+ * @returns {["firefox" | "chrome" | "safari" | "other", number, number, number]}
+ */
+ coreInfo(): ["firefox" | "chrome" | "safari" | "other", number, number, number];
+}
+export let get: GetCompatible;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts
index 5726dfe18d..a3dedf500e 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/get/index.d.ts
@@ -2,6 +2,12 @@ export class Get extends GetCompatible {
is: Is;
promises: Promises;
Audio: typeof Audio;
+ /**
+ * 获取装备牌对应的技能
+ * @param { Card[]|VCard[] } cards
+ * @returns { any[] }
+ */
+ skillsFromEquips(cards: Card[] | VCard[]): any[];
/**
* 将一个传统格式的character转化为Character对象格式
* @param { Array|Object|import("../library/element/character").Character } data
@@ -107,6 +113,14 @@ export class Get extends GetCompatible {
numOf(obj: any, item: any): any;
connectNickname(): any;
zhinangs(filter: any): any;
+ /**
+ * 用于获取武将的姓氏和名字
+ * @param { string } str
+ * @param { string|undefined } defaultSurname
+ * @param { string|undefined } defaultName
+ * @returns { Array }
+ */
+ characterSurname(str: string, defaultSurname: string | undefined, defaultName: string | undefined): any[];
/**
* 返回角色对应的原角色
* @param { string } str
@@ -136,7 +150,7 @@ export class Get extends GetCompatible {
cardOffset(): number;
colorspan(str: any): any;
evtprompt(next: any, str: any): void;
- autoViewAs(card: any, cards: any): import("../library/element/vcard.js").VCard;
+ autoViewAs(card: any, cards: any, owner: any, ...args: any[]): import("../library/element/vcard.js").VCard;
/**
* @deprecated
*/
@@ -156,7 +170,7 @@ export class Get extends GetCompatible {
* @param { T } num
* @returns { Character[T] }
*/
- character(name: string, num: T): Character[T];
+ character(name: string, num: T): Character[T];
characterInitFilter(name: any): string[];
/**
* 返回武将介绍
@@ -199,7 +213,8 @@ export class Get extends GetCompatible {
playerNumber(): number;
benchmark(func1: any, func2: any, iteration: any, arg: any): number;
/**
- * @param {any} obj
+ * 此方法仅用作将技能/卡牌代码转为字符串，返回值无法直接进行反序列化
+ * @param { any } obj
* @param { number } [level = 0]
*/
stringify(obj: any, level?: number): any;
@@ -214,7 +229,7 @@ export class Get extends GetCompatible {
* @param {WeakMap} [map] - 拷贝用的临时存储，用于处理循环引用（请勿自行赋值）
* @returns {T} - 深拷贝后的对象，若传入值不是对象则为传入值
*/
- copy(obj: T, copyKeyDeep?: boolean, map?: WeakMap): T;
+ copy(obj: T_1, copyKeyDeep?: boolean, map?: WeakMap): T_1;
plainTextMap: Map;
/**
* 用于将HTML代码转换为纯文本。
@@ -241,7 +256,7 @@ export class Get extends GetCompatible {
arenaState(): {
number: string;
players: {};
- mode: any;
+ mode: string;
dying: any[];
servermode: any;
roomId: any;
@@ -263,8 +278,12 @@ export class Get extends GetCompatible {
infoTargets(infos: any): import("noname-typings/nonameModules/noname/library/element/player.js").Player[];
cardInfo(card: any): any[];
cardsInfo(cards?: any[]): any[][];
- infoCard(info: any): import("../library/element/card.js").Card;
- infoCards(infos: any): import("../library/element/card.js").Card[];
+ infoCard(info: any): any;
+ infoCards(infos: any): any[];
+ vcardInfo(card: any): {};
+ vcardsInfo(cards?: any[]): {}[];
+ infoVCard(card: any): any;
+ infoVCards(infos: any): any[];
cardInfoOL(card: any): string;
infoCardOL(info: any): any;
cardsInfoOL(cards: any): string[];
@@ -311,6 +330,10 @@ export class Get extends GetCompatible {
* @param {string} item
*/
infoEventOL(item: string): string | import("../library/element/gameEvent.js").GameEvent;
+ vcardInfoOL(item: any): string;
+ vcardsInfoOL(cards: any): string[];
+ infoVCardOL(item: any): any;
+ infoVCardsOL(infos: any): any[];
stringifiedResult(item: any, level: any, nomore: any): any;
parsedResult(item: any): any;
verticalStr(str: any, sp: any): string;
@@ -334,7 +357,58 @@ export class Get extends GetCompatible {
xyDistance(from: any, to: any): number;
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
+ *
+ * @overload
+ * @param { string } obj
+ * @returns { 'position' | 'natures' | 'nature' }
+ *
+ * @overload
+ * @param { Player[] } obj
+ * @returns { 'players' }
+ *
+ * @overload
+ * @param { Card[] } obj
+ * @returns { 'cards' }
+ *
+ * @overload
+ * @param { [number, number] } obj
+ * @returns { 'select' }
+ *
+ * @overload
+ * @param { [number, number, number, number] } obj
+ * @returns { 'divposition' }
+ *
+ * @overload
+ * @param { Button } obj
+ * @returns { 'button' }
+ *
+ * @overload
+ * @param { Card } obj
+ * @returns { 'card' }
+ *
+ * @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
+ * @param { Player } obj
+ * @returns { 'player' }
+ *
+ * @overload
+ * @param { Dialog } obj
+ * @returns { 'dialog' }
+ *
+ * @overload
+ * @param { GameEvent | GameEventPromise } obj
+ * @returns { 'event' }
+ */
+ itemtype(obj: any): 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void;
+ /**
+ * @overload
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -365,6 +439,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -376,10 +454,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(): void;
+ itemtype(obj: string): 'position' | 'natures' | 'nature';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -410,6 +489,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -421,10 +504,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: string): "position" | "natures" | "nature";
+ itemtype(obj: Player[]): 'players';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -455,6 +539,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -466,10 +554,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: Player[]): "players";
+ itemtype(obj: Card[]): 'cards';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -500,6 +589,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -511,10 +604,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: Card[]): "cards";
+ itemtype(obj: [number, number]): 'select';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -545,6 +639,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -556,10 +654,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: [number, number]): "select";
+ itemtype(obj: [number, number, number, number]): 'divposition';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -590,6 +689,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -601,10 +704,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: [number, number, number, number]): "divposition";
+ itemtype(obj: Button): 'button';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -635,6 +739,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -646,10 +754,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: Button): "button";
+ itemtype(obj: Card): 'card';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -680,6 +789,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -691,10 +804,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: Card): "card";
+ itemtype(obj: VCard): 'vcard';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -725,6 +839,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -736,10 +854,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: Player): "player";
+ itemtype(obj: Player): 'player';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -770,6 +889,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -781,10 +904,11 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: Dialog): "dialog";
+ itemtype(obj: Dialog): 'dialog';
/**
* @overload
- * @returns { void }
+ * @param { any } obj
+ * @returns { 'position' | 'natures' | 'nature' | 'players' | 'cards' | 'select' | 'divposition' | 'button' | 'card' | 'vcard' | 'player' | 'dialog' | 'event' | void }
*
* @overload
* @param { string } obj
@@ -815,6 +939,10 @@ export class Get extends GetCompatible {
* @returns { 'card' }
*
* @overload
+ * @param { VCard } obj
+ * @returns { 'vcard' }
+ *
+ * @overload
* @param { Player } obj
* @returns { 'player' }
*
@@ -826,7 +954,7 @@ export class Get extends GetCompatible {
* @param { GameEvent | GameEventPromise } obj
* @returns { 'event' }
*/
- itemtype(obj: GameEvent | GameEventPromise): "event";
+ itemtype(obj: GameEvent | GameEventPromise): 'event';
equipNum(card: any): number;
/**
* 返回对象的实际类型
@@ -862,7 +990,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: any[]): "array";
+ objtype(obj: any[]): 'array';
/**
* 返回对象的实际类型
* @overload
@@ -897,7 +1025,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: any): "object";
+ objtype(obj: any): 'object';
/**
* 返回对象的实际类型
* @overload
@@ -932,7 +1060,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: HTMLDivElement): "div";
+ objtype(obj: HTMLDivElement): 'div';
/**
* 返回对象的实际类型
* @overload
@@ -967,7 +1095,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: HTMLTableElement): "table";
+ objtype(obj: HTMLTableElement): 'table';
/**
* 返回对象的实际类型
* @overload
@@ -1002,7 +1130,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: HTMLTableRowElement): "tr";
+ objtype(obj: HTMLTableRowElement): 'tr';
/**
* 返回对象的实际类型
* @overload
@@ -1037,7 +1165,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: HTMLTableCellElement): "td";
+ objtype(obj: HTMLTableCellElement): 'td';
/**
* 返回对象的实际类型
* @overload
@@ -1072,7 +1200,7 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: HTMLBodyElement): "td";
+ objtype(obj: HTMLBodyElement): 'td';
/**
* 返回对象的实际类型
* @overload
@@ -1107,37 +1235,16 @@ export class Get extends GetCompatible {
* @param { DocumentFragment } obj
* @returns { 'fragment' }
*/
- objtype(obj: DocumentFragment): "fragment";
+ objtype(obj: DocumentFragment): 'fragment';
/**
* 返回牌的类型
* @overload
- * @param { string } obj
- * @param { 'trick' } [method]
- * @param { Player } [player]
- * @returns { string }
- *
- * @overload
- * @param { Card } obj
- * @param { 'trick' } [method]
- * @param { Player } [player]
- * @returns { string }
- */
- type(obj: string, method?: "trick", player?: Player): string;
- /**
- * 返回牌的类型
- * @overload
- * @param { string } obj
- * @param { 'trick' } [method]
- * @param { Player } [player]
- * @returns { string }
- *
- * @overload
- * @param { Card } obj
- * @param { 'trick' } [method]
- * @param { Player } [player]
+ * @param { Card | string } obj
+ * @param { 'trick' | null} [method]
+ * @param { Player | false } [player]
* @returns { string }
*/
- type(obj: Card, method?: "trick", player?: Player): string;
+ type(obj: Card | string, method?: 'trick' | null, player?: Player | false): string;
type2(card: any, player: any): string;
/**
* 返回牌的副类型
@@ -1229,7 +1336,7 @@ export class Get extends GetCompatible {
* @param {T} key
* @returns {GameEvent[T]}
*/
- event(key: T): GameEvent[T];
+ event(key: T_2): import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent[T_2];
player(): import("noname-typings/nonameModules/noname/library/element/player.js").Player;
/**
* 返回玩家的数组
@@ -1239,6 +1346,14 @@ export class Get extends GetCompatible {
* @returns { Player[] }
*/
players(sort?: any, dead?: boolean, out?: boolean): Player[];
+ /**
+ * 返回指定角色所有的id，用于统一双将和单将的检查
+ *
+ * @author tangXins
+ * @param {Player} player
+ * @returns {string[]}
+ */
+ nameList(player: Player): string[];
position(card: any, ordering: any): number | "h" | "e" | "j" | "s" | "x" | "c" | "d" | "o";
/**
*
@@ -1259,6 +1374,12 @@ export class Get extends GetCompatible {
* @returns { string }
*/
strNumber(num: number): string;
+ /**
+ * 返回扑克牌中的表示形式对应的数字
+ * @param { string } str
+ * @returns { number }
+ */
+ numString(str: string): number;
/**
* 将阿拉伯数字转换为中文的表达形式
* @param { number } num
@@ -1277,13 +1398,13 @@ export class Get extends GetCompatible {
* @param {((a: Button, b: Button) => number)} [sort] 排序函数
* @returns { Button[] }
*/
- selectableButtons(sort?: ((a: Button, b: Button) => number)): Button[];
+ selectableButtons(sort?: (a: Button, b: Button) => number): Button[];
/**
* 返回可以选择的牌
* @param {((a: Card, b: Card) => number)} [sort] 排序函数
* @returns { Card[] }
*/
- selectableCards(sort?: ((a: Card, b: Card) => number)): Card[];
+ selectableCards(sort?: (a: Card, b: Card) => number): Card[];
/**
* @returns { string[] } 技能名数组
*/
@@ -1296,7 +1417,7 @@ export class Get extends GetCompatible {
* @param {((a: Player, b: Player) => number)} [sort] 排序函数
* @returns { Player[] }
*/
- selectableTargets(sort?: ((a: Player, b: Player) => number)): Player[];
+ selectableTargets(sort?: (a: Player, b: Player) => number): Player[];
filter(filter: any, i: any): any;
/**
* 返回玩家本回合牌的使用次数
@@ -1365,7 +1486,7 @@ export class Get extends GetCompatible {
* @param { 'judge' } [method]
* @returns { Player | undefined }
*/
- owner(card: Card, method?: "judge"): Player | undefined;
+ owner(card: Card, method?: 'judge'): Player | undefined;
noSelected(): boolean;
population(identity: any): number;
totalPopulation(identity: any): number;
@@ -1376,11 +1497,11 @@ export class Get extends GetCompatible {
cardtag(item: Card | VCard, tag: string): any;
tag(item: any, tag: any, item2: any, bool: any): any;
sortCard(sort: any): (card: any) => any;
- difficulty(): 2 | 1 | 3;
+ difficulty(): 1 | 2 | 3;
cardPile(name: any, create: any): any;
cardPile2(name: any): any;
discardPile(name: any): any;
- aiStrategy(): 2 | 1 | 3 | 4 | 5 | 6;
+ aiStrategy(): 5 | 1 | 2 | 3 | 4 | 6;
skillintro(name: any, learn: any, learn2: any): string;
intro(name: any): string;
storageintro(type: any, content: any, player: any, dialog: any, skill: any): any;
@@ -1400,7 +1521,7 @@ export class Get extends GetCompatible {
unuseful3(card: any): number;
value(card: any, player: any, method: any): any;
equipResult(player: any, target: any, name: any): number;
- equipValue(card: any, player: any): number;
+ equipValue(card: any, player: any): any;
equipValueNumber(card: any): number;
disvalue(card: any, player: any): number;
disvalue2(card: any, player: any): number;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts
index 5f43cd24b9..b2bf2063e4 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/get/is.d.ts
@@ -142,16 +142,10 @@ export class Is {
object(obj: any): boolean;
/**
* @overload
- * @param { Function } func
- * @returns { false }
- */
- singleSelect(func: Function): false;
- /**
- * @overload
- * @param { number | [number, number] } func
+ * @param { Function | number | [number, number] } func
* @returns { boolean }
*/
- singleSelect(func: number | [number, number]): boolean;
+ singleSelect(func: Function | number | [number, number]): boolean;
/**
* @param { string | Player } name
*/
@@ -176,8 +170,9 @@ export class Is {
empty(obj: {}): boolean;
/**
* @param { string } str
+ * @returns { str is "h" | "e" | "j" | "he" | "hej" | "ej" | "hj" }
*/
- pos(str: string): str is "h" | "e" | "j" | "he" | "hej" | "ej" | "hj";
+ pos(str: string): str is "h" | "e" | "j" | "hej" | "he" | "ej" | "hj";
/**
* @param { string } skill
* @param { Player } player
@@ -190,4 +185,13 @@ export class Is {
* @returns
*/
zhuanhuanji(skill: string, player: Player): boolean;
+ /**
+ * 检查指定玩家的名称的子串是否包含指定字符串
+ *
+ * @author tangXins
+ * @param {Player} player
+ * @param {string} name
+ * @returns {boolean}
+ */
+ playerNames(player: Player, name: string): boolean;
}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/gnc/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/gnc/index.d.ts
index 0d1fb68dfa..b90b248263 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/gnc/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/gnc/index.d.ts
@@ -1,9 +1,10 @@
export class GNC {
/**
- * @param {GeneratorFunction} fn
- * @returns
+ * @template {GeneratorFunction} T
+ * @param {T} fn
+ * @returns { (...args: Parameters) => Promise> }
*/
- of(fn: GeneratorFunction): (...args: Parameters) => Promise>;
+ of(fn: T): (...args: Parameters) => Promise>;
is: Is;
}
export let gnc: GNC;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/init/import.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/init/import.d.ts
index f2362bb817..5f037dfa01 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/init/import.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/init/import.d.ts
@@ -1,20 +1,4 @@
-/**
- * @param {string} name - 卡牌包名
- * @returns {Promise}
- */
-export const importCardPack: (name: string) => Promise;
-/**
- * @param {string} name - 武将包名
- * @returns {Promise}
- */
-export const importCharacterPack: (name: string) => Promise;
-/**
- * @param {string} name - 扩展名
- * @returns {Promise}
- */
-export const importExtension: (name: string) => Promise;
-/**
- * @param {string} name - 模式名
- * @returns {Promise}
- */
-export const importMode: (name: string) => Promise;
+export function importCardPack(name: string): Promise;
+export function importCharacterPack(name: string): Promise;
+export function importExtension(name: string): Promise;
+export function importMode(name: string): Promise;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/init/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/init/index.d.ts
index 51456cf8cf..8360a96a7d 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/init/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/init/index.d.ts
@@ -5,3 +5,4 @@ export function canUseHttpProtocol(): boolean;
*/
export function sendUpdate(): string | void;
export function boot(): Promise;
+export { onload } from "./onload.js";
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/init/loading.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/init/loading.d.ts
new file mode 100644
index 0000000000..29cb434043
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/init/loading.d.ts
@@ -0,0 +1,29 @@
+/**
+ * 读取导入的卡牌包信息
+ *
+ * @param {importCardConfig} cardConfig
+ */
+export function loadCard(cardConfig: importCardConfig): void;
+/**
+ * 读取牌堆信息
+ */
+export function loadCardPile(): void;
+/**
+ * 读取导入的武将包信息
+ *
+ * @param {importCharacterConfig} character
+ */
+export function loadCharacter(character: importCharacterConfig): void;
+export function loadExtension(extension: any): Promise;
+/**
+ * 读取当前的模式信息
+ *
+ * @param {importModeConfig} mode
+ */
+export function loadMode(mode: importModeConfig): void;
+/**
+ * 读取导入的play信息
+ *
+ * @param {importPlayConfig} playConfig
+ */
+export function loadPlay(playConfig: importPlayConfig): void;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/init/onload.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/init/onload.d.ts
index ac51a2127a..1797f40dce 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/init/onload.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/init/onload.d.ts
@@ -1 +1 @@
-export function onload(resetGameTimeout: any): Promise;
+export function onload(): Promise;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/init/onload/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/init/onload/index.d.ts
new file mode 100644
index 0000000000..e01f04e746
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/init/onload/index.d.ts
@@ -0,0 +1,3 @@
+export const defaultSplashs: (DefaultSplash | WideSplash)[];
+import { DefaultSplash } from "./default-splash.js";
+import { WideSplash } from "./wide-splash.js";
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/channel/index.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/channel/index.d.ts
index 3933715011..a929b8a42f 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/channel/index.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/channel/index.d.ts
@@ -9,7 +9,7 @@ export class Channel {
/**
* @type {PromiseResolve | [T, PromiseResolve] | null}
*/
- _buffer: ((value?: T | PromiseLike) => void) | [T, (value?: void | PromiseLike) => void] | null;
+ _buffer: ((value?: T | PromiseLike) => void) | [T, (value?: void | PromiseLike) => void];
/**
* 向该频道发送消息，在消息未被接受前将等待
*
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/GameEventManager.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/GameEventManager.d.ts
new file mode 100644
index 0000000000..7c203da255
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/GameEventManager.d.ts
@@ -0,0 +1,11 @@
+import { GameEvent } from "../gameEvent.js";
+export default class GameEventManager {
+ get [Symbol.toStringTag](): string;
+ eventStack: GameEvent[];
+ rootEvent?: GameEvent;
+ tempEvent?: GameEvent;
+ get event(): GameEvent;
+ getStartedEvent(): GameEvent;
+ getStatusEvent(): GameEvent;
+ setStatusEvent(event: GameEvent): void;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ArrayCompiler.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ArrayCompiler.d.ts
new file mode 100644
index 0000000000..7d49a00c10
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ArrayCompiler.d.ts
@@ -0,0 +1,7 @@
+import ContentCompilerBase from "./ContentCompilerBase.ts";
+import { EventContent, GameEvent } from "./IContentCompiler.ts";
+export default class ArrayCompiler extends ContentCompilerBase {
+ type: string;
+ filter(content: EventContent): boolean;
+ compile(content: EventContent): (event: GameEvent) => Promise;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/AsyncCompiler.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/AsyncCompiler.d.ts
new file mode 100644
index 0000000000..df42ad4631
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/AsyncCompiler.d.ts
@@ -0,0 +1,7 @@
+import ContentCompilerBase from "./ContentCompilerBase.ts";
+import { EventContent } from "./IContentCompiler.ts";
+export default class AsyncCompiler extends ContentCompilerBase {
+ type: string;
+ filter(content: EventContent): boolean;
+ compile(content: EventContent): import("./IContentCompiler.ts").EventCompiledContent;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ContentCompiler.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ContentCompiler.d.ts
new file mode 100644
index 0000000000..bb64cb7f83
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ContentCompiler.d.ts
@@ -0,0 +1,35 @@
+import IContentCompiler, { EventCompileable, EventCompiledContent } from "./IContentCompiler.ts";
+declare class ContentCompiler {
+ #private;
+ /**
+ * ```plain
+ * 注册一个编译器实例
+ *
+ * 如果后面开始全面迁移到 TypeScript，那么请使用依赖注入代替这个方法喵
+ * ```
+ *
+ * @todo 应该使用依赖注入替代
+ * @param compiler 编译器实例对象
+ */
+ addCompiler(compiler: IContentCompiler): void;
+ /**
+ * ```plain
+ * 对无法直接编译的数据做处理
+ * ```
+ *
+ * @param content
+ * @returns
+ */
+ private regularize;
+ /**
+ * ```plain
+ * 集成的编译函数
+ * 通过责任链模式将content分发给所有注册的编译器喵
+ * ```
+ *
+ * @param content
+ */
+ compile(content: EventCompileable): EventCompiledContent;
+}
+declare const compiler: ContentCompiler;
+export default compiler;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ContentCompilerBase.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ContentCompilerBase.d.ts
new file mode 100644
index 0000000000..674afaadd5
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/ContentCompilerBase.d.ts
@@ -0,0 +1,34 @@
+import IContentCompiler, { EventContent, GameEvent } from "./IContentCompiler.js";
+/**
+ * 向子类提供统一的公共方法
+ */
+export default abstract class ContentCompilerBase implements IContentCompiler {
+ abstract type: string;
+ abstract filter(content: EventContent): boolean;
+ abstract compile(content: EventContent): ((e: GameEvent) => Promise);
+ /**
+ * ```plain
+ * 对于事件执行前的一些准备工作
+ * ```
+ *
+ * @param event 事件
+ */
+ beforeExecute(event: GameEvent): void;
+ /**
+ * ```plain
+ * 判断事件能否继续执行
+ * ```
+ *
+ * @param event 事件
+ * @returns 当返回true时，代表event.finish()已经被调用
+ */
+ isPrevented(event: GameEvent): boolean;
+ /**
+ * ```plain
+ * 对于事件执行后的一些收尾工作
+ * ```
+ *
+ * @param event 事件
+ */
+ afterExecute(event: GameEvent): void;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/IContentCompiler.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/IContentCompiler.d.ts
new file mode 100644
index 0000000000..610f8a5f13
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/IContentCompiler.d.ts
@@ -0,0 +1,37 @@
+import { lib } from "../../../../../noname.js";
+import { GameEvent } from "../../gameEvent.js";
+export type EventContent = Function | Function[];
+export type EventCompileable = EventContent | Iterable | keyof typeof lib.element.content;
+export { GameEvent };
+export type EventCompiledContent = ((e: GameEvent) => Promise) & {
+ compiled: true;
+ type: string;
+ original: EventCompileable;
+ /**
+ * array content的原始值
+ */
+ originals?: Function[];
+};
+export default interface IContentCompiler {
+ /**
+ * ```plain
+ * 当前编译器的事件content类型
+ * ```
+ */
+ type: string;
+ /**
+ * ```plain
+ * 判断事件content是否被当前编译器支持
+ * ```
+ *
+ * @param content 事件content
+ */
+ filter(content: EventContent): boolean;
+ /**
+ * 对content执行编译
+ * 并返回标准的事件content
+ *
+ * @param content 要编译的content
+ */
+ compile(content: EventCompileable): ((e: GameEvent) => Promise);
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/StepCompiler.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/StepCompiler.d.ts
new file mode 100644
index 0000000000..1bf872781c
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/StepCompiler.d.ts
@@ -0,0 +1,7 @@
+import { EventContent, GameEvent } from "./IContentCompiler.ts";
+import ContentCompilerBase from "./ContentCompilerBase.ts";
+export default class StepCompiler extends ContentCompilerBase {
+ type: string;
+ filter(content: EventContent): boolean;
+ compile(content: EventContent): (e: GameEvent) => Promise;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/YieldCompiler.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/YieldCompiler.d.ts
new file mode 100644
index 0000000000..13b83b3fee
--- /dev/null
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/GameEvent/compilers/YieldCompiler.d.ts
@@ -0,0 +1,8 @@
+import { EventContent, GameEvent } from "./IContentCompiler.ts";
+import ContentCompilerBase from "./ContentCompilerBase.ts";
+export default class YieldCompiler extends ContentCompilerBase {
+ #private;
+ type: string;
+ filter(content: EventContent): boolean;
+ compile(content: EventContent): (event: GameEvent) => Promise;
+}
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/button.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/button.d.ts
index 4ea7a8776d..2432db0576 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/button.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/button.d.ts
@@ -6,7 +6,7 @@ export class Button extends HTMLDivElement {
* @param {true} [noClick]
* @param { Button } [button]
*/
- constructor(item: {}, type: keyof typeof ui.create.buttonPresets | ((item: {}, type: Function, position?: HTMLDivElement | DocumentFragment, noClick?: true, button?: Button) => Button), position?: HTMLDivElement | DocumentFragment, noClick?: true, button?: Button);
+ constructor(item: {}, type: "player" | "card" | "tdnodes" | "blank" | "vcard" | "character" | "characterx" | ((item: {}, type: Function, position?: HTMLDivElement | DocumentFragment, noClick?: true, button?: Button) => Button), position?: HTMLDivElement | DocumentFragment, noClick?: true, button?: Button);
/**
* @type { string | undefined }
*/
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts
index 4c7e11d493..8b3d590010 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/card.d.ts
@@ -7,7 +7,7 @@ export class Card extends HTMLDivElement {
* @param {'noclick'} [info]
* @param {true} [noclick]
*/
- build(info?: "noclick", noclick?: true): this;
+ build(info?: 'noclick', noclick?: true): this;
buildEventListener(info: any): void;
buildProperty(): void;
/**
@@ -38,6 +38,12 @@ export class Card extends HTMLDivElement {
* @type { boolean }
*/
isCard: boolean;
+ /**
+ * @type { string[] }
+ * 卡牌“占用的装备栏”
+ * TODO: 补充对应的typings
+ */
+ subtypes: string[];
selfDestroy(event: any): void;
willBeDestroyed(targetPosition: any, player: any, event: any): any;
hasNature(nature: any, player: any): boolean;
@@ -103,10 +109,10 @@ export class Card extends HTMLDivElement {
classListContainsAll(...args: any[]): boolean;
/**
* 返回一个键值，用于在缓存中作为键名。
- *
+ * @param { boolean } [similar] false统一前缀
* @returns {string} cacheKey
*/
- getCacheKey(): string;
+ getCacheKey(similar?: boolean): string;
discard(bool: any): void;
hasTag(tag: any): boolean;
hasPosition(): boolean;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/character.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/character.d.ts
index 02a5282716..a354199439 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/character.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/character.d.ts
@@ -23,6 +23,11 @@ export class Character {
* @type { number }
**/
hujia: number;
+ /**
+ * 武将姓名
+ * @type { string|undefined }
+ */
+ names: string | undefined;
/**
* 武将牌的势力
* @type { string }
@@ -143,6 +148,11 @@ export class Character {
* @type { string[] }
**/
clans: string[];
+ /**
+ * 武将牌的图片信息
+ * @type {string | undefined}
+ */
+ img: string | undefined;
/**
* 武将牌拥有的全部阵亡语音
* @type { string[] }
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/client.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/client.d.ts
index 9da74b3dae..14b7ec7692 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/client.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/client.d.ts
@@ -3,7 +3,7 @@ export class Client {
* @param {import('../index.js').NodeWS | InstanceType | Client} ws
* @param {boolean} temp
*/
- constructor(ws: import("../index.js").NodeWS | InstanceType | Client, temp?: boolean);
+ constructor(ws: import('../index.js').NodeWS | InstanceType | Client, temp?: boolean);
ws: any;
/**
* @type { string }
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/content.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/content.d.ts
index a0abf206b4..e2782fd4c5 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/content.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/content.d.ts
@@ -1,5 +1,5 @@
export namespace Content {
- function emptyEvent(): void;
+ function emptyEvent(event: any): Promise;
function changeCharacter(event: any, trigger: any, player: any): Promise;
function changeSkills(event: any, trigger: any, player: any): Promise;
function addShownCards(): void;
@@ -10,8 +10,10 @@ export namespace Content {
function disableEquip(): void;
function enableEquip(): void;
function expandEquip(): void;
- function replaceEquip(): void;
- function equip(): void;
+ function replaceEquip(event: any, trigger: any, player: any): Promise;
+ function replaceEquip_old(): void;
+ function equip(event: any, trigger: any, player: any): Promise;
+ function equip_old(): void;
function changeGroup(): void;
function chooseToDebate(): void;
function delay(): void;
@@ -28,8 +30,8 @@ export namespace Content {
function cardsGotoOrdering(): void;
function cardsGotoSpecial(): void;
function cardsGotoPile(): void;
- function chooseToEnable(): void;
- function chooseToDisable(): void;
+ function chooseToEnable(event: import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent, trigger: import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent, player: import("noname-typings/nonameModules/noname/library/element/player.js").Player): Promise;
+ function chooseToDisable(event: import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent, trigger: import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent, player: import("noname-typings/nonameModules/noname/library/element/player.js").Player): Promise;
function swapEquip(): void;
function disableJudge(): void;
function enableJudge(): void;
@@ -44,7 +46,7 @@ export namespace Content {
function gameDraw(): void;
function phaseLoop(): void;
function loadPackage(): void;
- function loadMode(): void;
+ function loadMode(event: any): Promise;
function forceOver(): void;
function arrangeTrigger(event: any, trigger: any, player: any): Promise;
function createTrigger(): any;
@@ -110,7 +112,8 @@ export namespace Content {
function changeHujia(): void;
function dying(): void;
function die(): void;
- function addJudge(): void;
+ function addJudge(event: any, trigger: any, player: any): Promise;
+ function addJudge_old(): void;
function judge(): void;
function turnOver(): void;
function link(): void;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/contents.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/contents.d.ts
deleted file mode 100644
index 64d9acd0f7..0000000000
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/contents.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * @type { SMap<((event: GameEventPromise, trigger: GameEventPromise, player: Player) => Promise)[]> }
- */
-export const Contents: SMap<((event: GameEventPromise, trigger: GameEventPromise, player: Player) => Promise)[]>;
diff --git a/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts b/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts
index 4b6bc6a9f1..2b8a1fd8f7 100644
--- a/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts
+++ b/node_modules/@types/noname-typings/nonameModules/noname/library/element/gameEvent.d.ts
@@ -1,49 +1,34 @@
-export class GameEvent {
- static initialGameEvent(): GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+/**
+ * @implements { PromiseLike> }
+ */
+export class GameEvent implements PromiseLike> {
+ static initialGameEvent(): GameEvent;
/**
- * @param {string | GameEvent} [name]
- * @param {false} [trigger]
+ * @param { string | GameEvent } [name]
+ * @param { boolean } [trigger]
+ * @param { GameEventManager } [manager]
*/
- constructor(name?: string | GameEvent, trigger?: false);
+ constructor(name?: string | GameEvent, trigger?: boolean, manager?: GameEventManager);
/**
* @type { string }
*/
name: string;
- step: number;
- finished: boolean;
/**
- * @type {GameEventPromise[]}
+ * @type { GameEventManager }
*/
- next: GameEventPromise[];
+ manager: GameEventManager;
/**
- * @type {GameEventPromise[]}
+ * @type { number | null }
*/
- after: GameEventPromise[];
- custom: {
- add: {};
- replace: {};
- };
- _aiexclude: any[];
- _notrigger: any[];
+ _triggered: number | null;
/**
* @type { Result }
*/
- _result: Result;
- _set: any[];
- /**
- * @type {boolean} 这个事件是否使用异步函数处理
- **/
- async: boolean;
- /**
- * @type {null|((event: GameEvent | PromiseLike)=>void)} 这个异步事件对应Promise的resolve函数
- **/
- resolve: null | ((event: GameEvent | PromiseLike) => void);
+ result: Result;
/**
- * @type {null|((value?: any) => void)} 另一种结束event.content的resolve形式
- **/
- resolveContent: null | ((value?: any) => void);
- _triggered: number;
- __args: any;
+ * @type { string }
+ */
+ type: string;
/**
* @type { Player }
*/
@@ -84,58 +69,88 @@ export class GameEvent {
* @type { number }
*/
num: number;
+ /**
+ * @type { number }
+ */
+ original_num: number;
/**
* @type { GameEvent }
*/
_trigger: GameEvent;
/**
- * @type { number }
+ * @type { string }
*/
- baseDamage: number;
+ triggername: string;
/**
- * @type { Player }
+ * @type { boolean }
*/
- customSource: Player;
+ notrigger: boolean;
/**
- * @type { number }
+ * @type { Player[] }
*/
- extraDamage: number;
+ _notrigger: Player[];
/**
- * @type { string }
+ * @type { Result }
*/
- nature: string;
+ _result: Result;
+ /**
+ * @type { any[] }
+ */
+ _args: any[];
+ /**
+ * @type { [string, any][] }
+ */
+ _set: [string, any][];
+ /**
+ * @type { {
+ * add: {[type: string]: () => void}
+ * replace: {[type :string]: () => void}
+ * } }
+ */
+ custom: {
+ add: {
+ [type: string]: () => void;
+ };
+ replace: {
+ [type: string]: () => void;
+ };
+ };
/**
* @type { boolean }
*/
- notrigger: boolean;
+ directHit: boolean;
/**
* @type { number }
*/
- original_num: number;
+ baseDamage: number;
/**
- * @type { boolean }
+ * @type { number }
*/
- unreal: boolean;
+ extraDamage: number;
/**
- * @type { Button[] }
+ * @type { Player }
*/
- excludeButton: Button[];
+ customSource: Player;
/**
- * @type { Result }
+ * @type { string }
*/
- result: Result;
+ nature: string;
+ /**
+ * @type { boolean }
+ */
+ unreal: boolean;
/**
- * @type { GameEventPromise | void | null }
+ * @type { Button[] }
*/
- parent: GameEventPromise | void | null;
+ excludeButton: Button[];
/**
- * @type { (this: GameEventPromise) => any | undefined | void | null }
+ * @type { ((this: this) => boolean) | undefined }
*/
- filterStop: (this: GameEventPromise) => any | undefined | void | null;
+ filterStop: (this: this) => boolean;
/**
* @type { Result['cost_data'] }
*/
- cost_data: Result["cost_data"];
+ cost_data: Result['cost_data'];
/**
* @type { boolean }
*/
@@ -161,13 +176,9 @@ export class GameEvent {
*/
ai: Function | undefined;
/**
- * @type { string }
- */
- triggername: string;
- /**
- * @type { ContentFuncByAll | GeneratorContentFuncByAll | OldContentFuncByAll }
+ * @type { string[] }
*/
- content: ContentFuncByAll | GeneratorContentFuncByAll | OldContentFuncByAll;
+ _aiexclude: string[];
/**
* @type { boolean }
*/
@@ -211,22 +222,23 @@ export class GameEvent {
* @returns {this}
*/
callHandler(type: Parameters[0], event: GameEvent, option: {
- state?: "begin" | "end";
+ state?: 'begin' | 'end';
}): this;
getDefaultHandlerType(): string;
+ getDefaultNextHandlerType(): string;
/**
* @param {Parameters[0]} [type]
* @returns {((event: GameEvent, option: {
* state?: 'begin' | 'end';
* }) => void)[]}
*/
- getHandler(type?: Parameters[0]): ((event: GameEvent, option: {
- state?: "begin" | "end";
+ getHandler(type?: any): ((event: GameEvent, option: {
+ state?: 'begin' | 'end';
}) => void)[];
/**
* @param {`on${Capitalize}`} [type]
*/
- hasHandler(type?: `on${Capitalize}`): boolean;
+ hasHandler(type?: `on${Capitalize}`): any;
/**
* @overload
* @param {...((event: GameEvent, option: {
@@ -235,8 +247,8 @@ export class GameEvent {
* @returns {number}
*/
pushHandler(...handlers: ((event: GameEvent, option: {
- state?: "begin" | "end";
- }) => void)[][]): number;
+ state?: 'begin' | 'end';
+ }) => void)[]): number;
/**
* @overload
* @param {Parameters[0]} type
@@ -246,11 +258,8 @@ export class GameEvent {
* @returns {number}
*/
pushHandler(type: Parameters[0], ...handlers: ((event: GameEvent, option: {
- state?: "begin" | "end";
- }) => void)[][]): number;
- changeToZero(): this;
- numFixed: boolean;
- finish(): this;
+ state?: 'begin' | 'end';
+ }) => void)[]): number;
putStepCache(key: any, value: any): this;
_stepCache: {};
getStepCache(key: any): any;
@@ -259,27 +268,35 @@ export class GameEvent {
putTempCache(key1: any, key2: any, value: any): any;
_tempCache: {};
getTempCache(key1: any, key2: any): any;
- cancel(arg1: any, arg2: any, notrigger: any): GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
- neutralize(event: any): this;
+ changeToZero(): this;
+ numFixed: boolean;
+ finish(): void;
+ /**
+ * @type { boolean }
+ */
+ finished: boolean;
+ cancel(all: any, player: any, notrigger: any): GameEvent;
+ neutralize(event?: import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent): Promise>;
+ /**
+ * @type { boolean }
+ */
_neutralized: boolean;
- _neutralize_event: any;
- unneutralize(): this;
- directHit: boolean;
+ _neutralize_event: import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent;
+ unneutralize(): void;
goto(step: any): this;
+ set step(num: number);
+ get step(): number;
redo(): this;
setHiddenSkill(skill: any): this;
set(key: any, value: any, ...args: any[]): this;
/**
- * @param {ArrayLike | Function | keyof typeof lib.element.content} item
+ * @param {import("./GameEvent/compilers/IContentCompiler.js").EventCompileable} content
*/
- setContent(item: ArrayLike | Function | keyof typeof lib.element.content): this;
+ setContent(content: import("./GameEvent/compilers/IContentCompiler.js").EventCompileable): this;
/**
- *
- * @param {Function | keyof typeof lib.element.contents} contents
- * @returns {GameEvent}
+ * @type { import("./GameEvent/compilers/IContentCompiler.js").EventCompiledContent }
*/
- setContents(contents: Function | keyof typeof lib.element.contents): GameEvent;
- contents: (string | number | Function) & any[];
+ content: import("./GameEvent/compilers/IContentCompiler.js").EventCompiledContent;
getLogv(): any;
send(): this;
resume(): this;
@@ -292,13 +309,13 @@ export class GameEvent {
* @param {boolean} [includeSelf] 若level不是数字，指定搜索时是否包含事件本身
* @returns {GameEvent|{}|null}
*/
- getParent(level?: number | string | ((evt: GameEvent) => boolean), forced?: boolean, includeSelf?: boolean): GameEvent | {} | null;
+ getParent(level?: string | number | ((evt: GameEvent) => boolean), forced?: boolean, includeSelf?: boolean): GameEvent | {} | null;
getTrigger(): any;
getRand(name: any): any;
_rand_map: {};
_rand: number;
- insert(content: any, map: any): GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
- insertAfter(content: any, map: any): GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ insert(content: any, map: any): GameEvent;
+ insertAfter(content: any, map: any): GameEvent;
backup(skill: any): this;
_backup: any;
filterButton: any;
@@ -328,12 +345,214 @@ export class GameEvent {
isPhaseUsing(player: any): boolean;
addTrigger(skills: any, player: any): this;
removeTrigger(skills: any, player: any): this;
- trigger(name: any): GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ /**
+ *
+ * @param { string } name
+ * @returns { GameEvent }
+ */
+ trigger(name: string): GameEvent;
untrigger(all: boolean, player: any): this;
/**
- * 事件转为Promise化
+ * @deprecated
+ */
+ toPromise(): this;
+ /**
+ * @deprecated
+ */
+ toEvent(): this;
+ /**
+ * @type { GameEvent | void | null }
*/
- toPromise(): this & import("noname-typings/nonameModules/noname/library/element/gameEvent.js").GameEvent & import("noname-typings/nonameModules/noname/library/element/gameEventPromise.js").GameEventPromise;
+ parent: GameEvent | void | null;
+ /**
+ * @type { GameEvent[] }
+ */
+ childEvents: GameEvent[];
+ /**
+ * @type { GameEvent | undefined }
+ */
+ _triggering: GameEvent | undefined;
+ updateStep(): void;
+ /**
+ * @type { GameEvent[] }
+ */
+ next: GameEvent[];
+ /**
+ * @type { GameEvent[] }
+ */
+ after: GameEvent[];
+ /**
+ * @template TResult1
+ * @template TResult2
+ * Attaches callbacks for the resolution and/or rejection of the Promise.
+ * @param { ((event: Omit