YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1437 from lieren2023/codespace-automatic-computing-machine-rjpj96xj55q2596j 

bug fix
This commit is contained in:
Spmario233 2024-06-05 20:14:32 +08:00 committed by GitHub
parent 268d590ef2 ec4d1871b2
commit f2258c42b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 78 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
audio/skill/shouyue_liegong1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_liegong2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_longdan1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_longdan2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_paoxiao1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_paoxiao2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_tieji1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_tieji2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_wusheng1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/shouyue_wusheng2.mp3 Normal file
View File

Binary file not shown.

4
card/guozhan.js
View File

@ -1831,7 +1831,9 @@ game.import("card", function () {
mod: {
maxHandcard: function (player, num) {
if (get.mode() == "guozhan") {
if (player.hasSkill("huangjintianbingfu")) {
// if (player.hasSkill("hongfa")) {
// 村规
if (player.hasSkill("hongfa", null, null, false)) {
num += player.getExpansions("huangjintianbingfu").length;
}
return (

3
character/refresh/skill.js
View File

@ -1191,7 +1191,7 @@ const skills = {
//OL界火诸葛
olhuoji: {
audio: "rehuoji",
audioname: ["ol_sp_zhugeliang"],
audioname: ["ol_sp_zhugeliang", "ol_pangtong"],
trigger: { player: "huogongBegin" },
forced: true,
locked: false,
@ -12493,6 +12493,7 @@ const skills = {
dc_guansuo: "wusheng_guansuo",
guanzhang: "wusheng_guanzhang",
guansuo: "wusheng_guansuo",
gz_jun_liubei: "shouyue_wusheng"
},
enable: ["chooseToRespond", "chooseToUse"],
filterCard: function (card, player) {

2
character/refresh/voices.js
View File

@ -413,7 +413,7 @@ export default {
"#liuli_re_daqiao2": "帮帮人家嘛~",
"#re_daqiao:die": "伯符，再也没人能欺负我了……",
"#rekurou1": "我这把老骨头，不算什么！",
"#rekurou2": "为成大业，死不足惜！",
"#rekurou2": "为成大义，死不足惜！",
"#zhaxiang1": "铁锁连舟而行，东吴水师可破！",
"#zhaxiang2": "两军阵前，不斩降将！",
"#re_huanggai:die": "盖，有负公瑾重托……",

2
character/xianding/skill.js
View File

@ -965,7 +965,7 @@ const skills = {
return delt < 0 || (delt > 0 && player.countCards("h"));
},
locked(skill, player) {
return player && player.storage.dcshouzhi_modified;
return !(player && player.storage.dcshouzhi_modified);
},
derivation: ["dcshouzhi_modified"],
onremove: ["dcshouzhi_modified"],

5
mode/boss.js
View File

@ -1406,7 +1406,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"shen",
"1/8",
["boss_jiang", "boss_hunzi", "boss_hunyou", "boss_taoni"],
["qun", "boss", "bossallowed", "InitFilter:noZhuHp:noZhuSkill"],
["qun", "boss", "bossallowed", "InitFilter:noZhuHp:noZhuSkill", "die:sunce"],
"wu",
],
@ -10508,7 +10508,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"觉醒技，准备阶段，若你的体力值为1，你减1点体力上限，失去技能〖魂佑〗并获得技能〖英姿〗和〖英魂〗。",
boss_jiang: "激昂",
boss_jiang_info:
"①锁定技，〖激昂〗不会无效。<br>②每当你使用或打出红色牌时，你可以摸一张牌。若你是因响应其他角色使用或打出的牌，则你获得对方使用或打出的牌。<br>③当有其他角色使用或打出红色牌指定你为目标或响应你后，你可以摸一张牌并获得这些牌。",
"①锁定技，〖激昂〗不会无效。②每当你使用或打出红色牌时，你可以摸一张牌。若你是因响应其他角色使用或打出的牌，则你获得对方使用或打出的牌。③当有其他角色使用或打出红色牌指定你为目标或响应你后，你可以摸一张牌并获得这些牌。",
boss_hunyou: "魂佑",
boss_hunyou_info: "锁定技，你的体力值变化和体力上限变化无效。",
boss_taoni: "讨逆",
@ -10584,7 +10584,6 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"#wansha_boss_lvbu31": "蝼蚁，怎容偷生？",
"#wansha_boss_lvbu32": "沉沦吧，在这无边的恐惧！",
"#boss_lvbu3:die": "你们的项上人头，我改日再取！",
"#boss_sunce:die": "内事不决问张昭，外事不决问周瑜……",
},
get: {
rawAttitude: function (from, to) {

91
mode/guozhan.js
View File

@ -859,7 +859,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
gz_cuimao: ["male", "wei", 3, ["gzzhengbi", "gzfengying"], []],
gz_yujin: ["male", "wei", 4, ["gzjieyue"], ["gzskin"]],
gz_wangping: ["male", "shu", 4, ["jianglue"], ["gzskin"]],
gz_fazheng: ["male", "shu", 3, ["gzxuanhuo", "gzenyuan"], ["gzskin"]],
gz_fazheng: ["male", "shu", 3, ["gzxuanhuo", "gzenyuan"], ["gzskin", "die:xin_fazheng"]],
gz_wuguotai: ["female", "wu", 3, ["gzbuyi", "ganlu"], ["gzskin"]],
gz_lukang: ["male", "wu", 4, ["fakejueyan", "fakekeshou"], ["gzskin"]],
gz_yuanshu: ["male", "qun", 4, ["gzweidi", "gzyongsi"], ["gzskin"]],
@ -6722,7 +6722,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
mod: {
maxHandcard: function (player, num) {
if (!player.hasEmptySlot(2)) return;
if (player.hasSkill("huangjintianbingfu")) {
// if (player.hasSkill("hongfa")) {
// 村规
if (player.hasSkill("hongfa", null, null, false)) {
num += player.getExpansions("huangjintianbingfu").length;
}
return (
@ -9822,6 +9824,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
//黄忠
gzliegong: {
audio: "liegong",
audioname2: { gz_jun_liubei: "shouyue_liegong" },
locked: false,
mod: {
targetInRange: function (card, player, target) {
@ -9940,7 +9943,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
gzwushuang: {
shaRelated: true,
audio: "wushuang",
audioname: ["re_lvbu", "shen_lvbu", "lvlingqi"],
audioname2: { gz_lvlingqi: "wushuang_lvlingqi" },
forced: true,
locked: true,
group: ["wushuang1", "wushuang2"],
@ -10083,6 +10086,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
derivation: "gzwushuang",
},
wushuang_lvlingqi: { audio: 2 },
//荀谌
gzfenglve: {
audio: "refenglve",
@ -15889,7 +15893,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
trigger: { player: "equipAfter" },
forced: true,
filter: function (event, player) {
if (!player.skills.includes("gzzongyu")) return false;
// if (!player.hasSkill("gzzongyu")) return false;
// 村规
if (!player.hasSkill("gzzongyu", null, null, false)) return false;
if (!["equip3", "equip4"].includes(get.subtype(event.card))) return false;
for (var i = 0; i < ui.discardPile.childElementCount; i++) {
if (ui.discardPile.childNodes[i].name == "liulongcanjia") return true;
@ -16482,11 +16488,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
gzxuanhuo: {
audio: "rexuanhuo",
audio: "xinxuanhuo",
global: "gzxuanhuo_others",
derivation: [
"fz_new_rewusheng",
"fz_gzpaoxiao",
"fz_wusheng",
"fz_new_paoxiao",
"fz_new_longdan",
"fz_new_tieji",
"fz_liegong",
@ -16505,7 +16511,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
subSkill: {
others: {
audio: "rexuanhuo",
audio: "xinxuanhuo",
forceaudio: true,
enable: "phaseUse",
usable: 1,
@ -16556,7 +16562,15 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
.set("prompt", "选择并获得一项技能直到回合结束");
"step 1";
player.popup(result.control);
player.addTempSkill("fz_" + result.control);
var map = {
new_rewusheng: "fz_wusheng",
gzpaoxiao: "fz_new_paoxiao",
new_longdan: "fz_new_longdan",
new_tieji: "fz_new_tieji",
liegong: "fz_liegong",
xinkuanggu: "fz_xinkuanggu"
};
player.addTempSkill(map[result.control]);
game.log(player, "获得了技能", "#g【" + get.translation(result.control) + "】");
game.delay();
},
@ -16571,7 +16585,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
// audio:['xuanhuo',2],
},
fz_gzpaoxiao: {
fz_new_paoxiao: {
audio: true,
inherit: "gzpaoxiao",
},
@ -16579,7 +16593,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
audio: true,
inherit: "new_tieji",
},
fz_new_rewusheng: {
fz_wusheng: {
audio: true,
inherit: "new_rewusheng",
},
@ -16752,7 +16766,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
gzenyuan: {
locked: true,
audio: "reenyuan",
audio: "xinenyuan",
group: ["gzenyuan_gain", "gzenyuan_damage"],
preHidden: true,
ai: {
@ -16767,7 +16781,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
subSkill: {
gain: {
audio: "reenyuan",
audio: "xinenyuan",
trigger: { target: "useCardToTargeted" },
forced: true,
filter: function (event, player) {
@ -16779,7 +16793,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
damage: {
audio: "reenyuan",
audio: "xinenyuan",
trigger: { player: "damageEnd" },
forced: true,
filter: function (event, player) {
@ -17295,6 +17309,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
},
new_longdan: {
audio: "longdan_sha",
audioname2: { gz_jun_liubei: "shouyue_longdan" },
group: [
"new_longdan_sha",
"new_longdan_shan",
@ -17306,6 +17322,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shanafter: {
sub: true,
audio: "longdan_sha",
audioname2: { gz_jun_liubei: "shouyue_longdan" },
trigger: {
player: "useCard",
},
@ -17341,6 +17358,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
shamiss: {
sub: true,
audio: "longdan_sha",
audioname2: { gz_jun_liubei: "shouyue_longdan" },
trigger: {
player: "shaMiss",
},
@ -17373,6 +17391,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
player: ["useCard", "respond"],
},
audio: "longdan_sha",
audioname2: { gz_jun_liubei: "shouyue_longdan" },
forced: true,
locked: false,
filter: function (event, player) {
@ -17387,6 +17406,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
sha: {
audio: "longdan_sha",
audioname2: { gz_jun_liubei: "shouyue_longdan" },
enable: ["chooseToUse", "chooseToRespond"],
filterCard: {
name: "shan",
@ -17420,6 +17440,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
shan: {
audio: "longdan_sha",
audioname2: { gz_jun_liubei: "shouyue_longdan" },
enable: ["chooseToRespond", "chooseToUse"],
filterCard: {
name: "sha",
@ -17452,6 +17473,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
gzpaoxiao: {
audio: "paoxiao",
audioname2: { gz_jun_liubei: "shouyue_paoxiao" },
trigger: {
player: "useCard",
},
@ -17957,6 +17979,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
new_tieji: {
audio: "retieji",
audioname2: { gz_jun_liubei: "shouyue_tieji" },
trigger: {
player: "useCardToPlayered",
},
@ -19914,6 +19937,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
hongfa: {
audio: 3,
locked: false,
derivation: "huangjintianbingfu",
unique: true,
forceunique: true,
@ -20046,7 +20070,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
dialog.addSmall(content);
}
dialog.addText(
'<ul style="margin-top:5px;padding-left:22px;"><li>当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。<li>每当你失去体力时，你可改为将一张“天兵”置入弃牌堆。<li>与你势力相同的角色可将一张“天兵”当【杀】使用或打出。',
'<ul style="margin-top:5px;padding-left:22px;"><li>锁定技，当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。<li>每当你失去体力时，你可改为将一张“天兵”置入弃牌堆。<li>与你势力相同的角色可将一张“天兵”当【杀】使用或打出。',
false
);
},
@ -20061,7 +20085,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
content: function () {
"step 0";
var num = get.population("qun");
if (player.hasSkill("huangjintianbingfu")) {
// if (player.hasSkill("hongfa")) {
// 村规
if (player.hasSkill("hongfa", null, null, false)) {
num += player.getExpansions("huangjintianbingfu").length;
}
var cards = get.cards(num);
@ -20087,6 +20113,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
},
zhangwu: {
audio: 2,
derivation: "feilongduofeng",
unique: true,
forceunique: true,
ai: {
@ -20213,13 +20240,18 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
unique: true,
forceunique: true,
global: "wuhujiangdaqi",
derivation: "wuhujiangdaqi",
derivation: ["wuhujiangdaqi", "new_rewusheng", "gzpaoxiao", "new_longdan", "new_tieji", "gzliegong"],
mark: true,
lordSkill: true,
init(player) {
player.markSkill("wuhujiangdaqi");
},
},
shouyue_wusheng: { audio: 2 },
shouyue_paoxiao: { audio: 2 },
shouyue_longdan: { audio: 2 },
shouyue_tieji: { audio: 2 },
shouyue_liegong: { audio: 2 },
wuhujiangdaqi: {
unique: true,
forceunique: true,
@ -23338,7 +23370,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
gz_jun_caocao: "君曹操",
gz_jun_caocao_prefix: "君",
jianan: "建安",
jianan_info: "君主技，只要此武将处于明置状态，你便拥有“五子良将纛”。",
jianan_info: "君主技，只要此武将牌处于明置状态，你便拥有“五子良将纛”。",
g_jianan: "五子良将纛",
wuziliangjiangdao: "五子良将纛",
wuziliangjiangdao_ab: "将纛",
@ -23511,7 +23543,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
jiahe_skill: "缘江烽火图",
yuanjiangfenghuotu: "缘江烽火图",
yuanjiangfenghuotu_info:
"每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。<br>根据“烽火”的数量，所有吴势力角色可于其准备阶段选择并获得其中一个技能直到回合结束：一张及以上：〖英姿〗；两张及以上：〖好施〗；三张及以上：〖涉猎〗；四张及以上：〖度势〗；五张及以上：可额外选择一项。<br>锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。",
"①每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。②根据“烽火”的数量，所有吴势力角色可于其准备阶段选择并获得其中一个技能直到回合结束：一张及以上：〖英姿〗；两张及以上：〖好施〗；三张及以上：〖涉猎〗；四张及以上：〖度势〗；五张及以上：可额外选择一项。③锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。",
yuanjiangfenghuotu_ab: "江图",
yuanjiangfenghuotu_bg: "图",
wuxin: "悟心",
@ -23522,7 +23554,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
hongfa_respond: "天兵",
hongfa_hp: "黄巾天兵符",
hongfa_info:
"君主技，锁定技，此武将牌明置时，你获得“黄巾天兵符”；准备阶段，若没有“天兵”，你将牌堆顶的X张牌置于“黄巾天兵符”上，称为“天兵”（X为群势力角色的数量）。",
"君主技。①只要此武将牌处于明置状态，你便拥有“黄巾天兵符”。②准备阶段，若没有“天兵”，你将牌堆顶的X张牌置于“黄巾天兵符”上，称为“天兵”（X为群势力角色的数量）。",
wendao: "问道",
wendao_info:
"出牌阶段限一次，你可以弃置一张不为【太平要术】的红色牌，然后获得弃牌堆或场上的一张【太平要术】。",
@ -23530,7 +23562,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
huangjintianbingfu_ab: "兵符",
huangjintianbingfu_bg: "符",
huangjintianbingfu_info:
"锁定技，当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。<br>当你失去体力时，你可改为将一张“天兵”置入弃牌堆。<br>与你势力相同的角色可将一张“天兵”当作【杀】使用或打出。",
"①锁定技，当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。②当你失去体力时，你可改为将一张“天兵”置入弃牌堆。③与你势力相同的角色可将一张“天兵”当作【杀】使用或打出。",
wuhujiangdaqi: "五虎将大旗",
wuhujiangdaqi_ab: "将旗",
wuhujiangdaqi_bg: "旗",
@ -24258,6 +24290,16 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"#rerende_gz_jun_liubei1": "勿以恶小而为之，勿以善小而不为。",
"#rerende_gz_jun_liubei2": "君才十倍于丕，必能安国成事。",
"#shouyue": "布德而昭仁，见旗如见朕！",
"#shouyue_wusheng1": "关将军雄姿，由你再现！",
"#shouyue_wusheng2": "再次威震华雄，必成汉兴佳话！",
"#shouyue_paoxiao1": "杀！把他捅成马蜂窝！",
"#shouyue_paoxiao2": "昔日长坂坡，今日再咆哮！",
"#shouyue_longdan1": "请收好，此乃子龙枪法。",
"#shouyue_longdan2": "子龙将助你一臂之力。",
"#shouyue_tieji1": "西凉的马蹄声，真好听。",
"#shouyue_tieji2": "马家军风采何在？！",
"#shouyue_liegong1": "当年老将军冲锋，也是这时机。",
"#shouyue_liegong2": "百步穿杨，立功拜将！",
"#gz_jun_liubei:die": "若嗣子可辅，辅之；如其不才，君可自取……",
"#wuxin1": "冀悟迷惑之心。",
"#wuxin2": "吾已明此救世之术矣。",
@ -24336,7 +24378,12 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
"#jianglue1": "奇谋为短，将略为要。",
"#jianglue2": "为将者，需有谋略。",
"#gz_wangping:die": "无当飞军，也有困于深林之时……",
"#gz_fazheng:die": "辅翼既折，蜀汉衰矣……",
"#fz_wusheng": "武节不减，圣德加身。",
"#fz_new_paoxiao": "刚勇奋战，绝不退缩！",
"#fz_new_longdan": "盘龙卧旋，攻防无解。",
"#fz_new_tieji": "战骑铁甲，撼动踏阵。",
"#fz_liegong": "挽弓箭出，流火漫天。",
"#fz_xinkuanggu": "猎战沙场，我的乐趣。",
"#gz_wuguotai:die": "卿等，务必用心辅佐仲谋……",
"#keshou1": "仁以待民，自处不败之势。",
"#keshou2": "宽济百姓，则得战前养备之机。",