Merge branch 'libccy:PR-Branch' into PR-Branch

This commit is contained in:
157 2024-04-24 23:21:51 +08:00 committed by GitHub
commit bfc0b3dcb5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 2 deletions

View File

@ -3767,6 +3767,12 @@ game.import("character", function () {
.chooseToDuiben(target) .chooseToDuiben(target)
.set("title", "谋弈") .set("title", "谋弈")
.set("namelist", ["反抗", "归顺", "镇压", "安抚"]) .set("namelist", ["反抗", "归顺", "镇压", "安抚"])
.set("translationList", [
`对方选择镇压:${get.translation(player)}对你造成1点伤害然后其摸1张牌<br>对方选择安抚:${get.translation(player)}受到1点伤害然后其摸2张牌`,
`对方选择镇压:${get.translation(player)}获得你1张牌然后其交给你2张牌<br>对方选择安抚:你须交给${get.translation(player)}两张牌若你牌数不足2张则改为其令你跳过你下个摸牌阶段`,
`对方选择反抗:你对${get.translation(target)}造成1点伤害然后你摸1张牌<br>对方选择归顺:你获得${get.translation(target)}1张牌然后你交给其2张牌`,
`对方选择反抗你受到1点伤害然后你摸2张牌<br>对方选择归顺:${get.translation(target)}须交给你两张牌(若其牌数不足两张,则改为令其跳过其下个摸牌阶段)`,
])
.set("ai", (button) => 1 + Math.random()); .set("ai", (button) => 1 + Math.random());
"step 1"; "step 1";
if (result.bool) { if (result.bool) {

View File

@ -5654,6 +5654,12 @@ game.import("character", function () {
.chooseToDuiben(target) .chooseToDuiben(target)
.set("title", "谋弈") .set("title", "谋弈")
.set("namelist", ["固守城池", "突出重围", "围城断粮", "擂鼓进军"]) .set("namelist", ["固守城池", "突出重围", "围城断粮", "擂鼓进军"])
.set("translationList", [
`以防止${get.translation(player)}通过此技能对你使用【决斗】`,
`以防止${get.translation(player)}通过此技能对你使用【兵粮寸断】`,
`若成功,将牌堆顶的牌当做【兵粮寸断】对${get.translation(target)}使用`,
`若成功,视为对${get.translation(target)}使用【决斗】`,
])
.set("ai", (button) => { .set("ai", (button) => {
var source = _status.event.getParent().player, var source = _status.event.getParent().player,
target = _status.event.getParent().target; target = _status.event.getParent().target;
@ -5886,6 +5892,12 @@ game.import("character", function () {
.chooseToDuiben(target) .chooseToDuiben(target)
.set("title", "谋弈") .set("title", "谋弈")
.set("namelist", ["出阵迎战", "拱卫中军", "直取敌营", "扰阵疲敌"]) .set("namelist", ["出阵迎战", "拱卫中军", "直取敌营", "扰阵疲敌"])
.set("translationList", [
`以防止${get.translation(player)}摸2张牌`,
`以防止${get.translation(player)}获得你1张牌`,
`若成功,你获得${get.translation(target)}1张牌`,
`若成功你摸2张牌`,
])
.set("ai", (button) => { .set("ai", (button) => {
var source = get.event().getParent().player, var source = get.event().getParent().player,
target = get.event().getParent().target; target = get.event().getParent().target;

View File

@ -1496,13 +1496,14 @@ export const Content = {
chooseToDuiben: function () { chooseToDuiben: function () {
"step 0"; "step 0";
if (!event.namelist) event.namelist = ["全军出击", "分兵围城", "奇袭粮道", "开城诱敌"]; if (!event.namelist) event.namelist = ["全军出击", "分兵围城", "奇袭粮道", "开城诱敌"];
game.broadcastAll(function (list) { game.broadcastAll(function (list, translationList = []) {
var list2 = ["db_atk1", "db_atk2", "db_def1", "db_def2"]; var list2 = ["db_atk1", "db_atk2", "db_def1", "db_def2"];
for (var i = 0; i < 4; i++) { for (var i = 0; i < 4; i++) {
lib.card[list2[i]].image = "card/" + list2[i] + (list[0] == "全军出击" ? "" : "_" + list[i]); lib.card[list2[i]].image = "card/" + list2[i] + (list[0] == "全军出击" ? "" : "_" + list[i]);
lib.translate[list2[i]] = list[i]; lib.translate[list2[i]] = list[i];
lib.translate[list2[i] + "_info"] = translationList[i];
} }
}, event.namelist); }, event.namelist, event.translationList);
if (!event.title) event.title = "对策"; if (!event.title) event.title = "对策";
game.log(player, "向", target, "发起了", "#y" + event.title); game.log(player, "向", target, "发起了", "#y" + event.title);
if (!event.ai) if (!event.ai)