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

Merge pull request #1321 from PZ157/PR-Branch 

更换武将牌补充
This commit is contained in:
Spmario233 2024-05-06 21:45:36 +08:00 committed by GitHub
parent 1553089c45 3d576e3784
commit dd288220eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
character/diy/skill.js
View File

@ -5396,7 +5396,7 @@ const skills = {
unique: true,
forceunique: true,
init(player) {
if (player.storage.nscongjun_show) return false;
if (player.storage.nscongjun_show || ![player.name1, player.name2].includes("ns_huamulan")) return false;
var change = function (target) {
if (target == player) {
var list;
@ -5427,7 +5427,12 @@ const skills = {
show: {
trigger: { global: "useCard" },
filter(event, player) {
return player.getEnemies().includes(event.player) && event.card.name == "wuxie" && event.getRand() < 0.1;
return (
player.storage.nscongjun_show &&
event.card.name == "wuxie" &&
event.getRand() < 0.1 &&
player.getEnemies().includes(event.player)
);
},
direct: true,
skillAnimation: true,

2
character/gujian.js
View File

@ -630,7 +630,7 @@ game.import("character", function () {
player.turnOver(false);
"step 3";
player.draw(4);
player.reinit("gjqt_xieyi", "gjqt_chuqi");
player.reinit(get.character(player.name2, 3).includes("humeng") ? player.name2 : player.name1, "gjqt_chuqi");
player.hp = player.maxHp;
"step 4";
if (event.yanjia) {

4
character/hearth.js
View File

@ -2382,7 +2382,7 @@ game.import("character", function () {
trigger: { player: "phaseBefore" },
unique: true,
skillAnimation: true,
forceunique: true,
//forceunique: true,
filter() {
return game.roundNumber >= 3;
},
@ -2407,7 +2407,7 @@ game.import("character", function () {
};
player.awakenSkill("szbianshen");
"step 1";
player.reinit("hs_shizugui", result.links[0]);
player.reinit(get.character(player.name2, 3).includes("szbianshen") ? player.name2 : player.name1, result.links[0]);
player.hp = player.maxHp;
player.update();
},

1
character/huicui/skill.js
View File

@ -12431,6 +12431,7 @@ const skills = {
if (evt.player != event.player) return false;
return true;
},
usable: 1,
logTarget: "player",
check: function (event, player) {
var target = event.player;

4
character/key/skill.js
View File

@ -7569,6 +7569,7 @@ const skills = {
trigger: { player: "phaseZhunbeiBegin" },
limited: true,
unique: true,
forceunique: true,
charlotte: true,
skillAnimation: true,
animationColor: "water",
@ -7576,6 +7577,7 @@ const skills = {
return player.isDamaged();
},
check(event, player) {
if (![player.name1, player.name2].includes("key_mio")) return false;
return player.hp <= 1 || player.getDamagedHp() > 1;
},
content() {
@ -7644,12 +7646,14 @@ const skills = {
limited: true,
charlotte: true,
unique: true,
forceunique: true,
skillAnimation: true,
animationColor: "water",
filter(event, player) {
return player.isDamaged();
},
check(event, player) {
if (![player.name1, player.name2].includes("key_midori")) return false;
return player.hp <= 1 || player.getDamagedHp() > 1;
},
content() {

5
character/sp/skill.js
View File

@ -19319,7 +19319,6 @@ const skills = {
limited: true,
skillAnimation: true,
animationColor: "orange",
forceunique: true,
filter: function (event, player) {
return player.storage.fanghun2 > 0;
},
@ -19377,7 +19376,7 @@ const skills = {
player.awakenSkill("fuhan");
"step 1";
event.num = Math.min(event.num, 8);
player.reinitCharacter("zhaoxiang", result.links[0]);
player.reinitCharacter(get.character(player.name2, 3).includes("fuhan") ? player.name2 : player.name1, result.links[0]);
"step 2";
var num = event.num - player.maxHp;
if (num > 0) player.gainMaxHp(num);
@ -19395,7 +19394,6 @@ const skills = {
limited: true,
skillAnimation: true,
animationColor: "orange",
forceunique: true,
filter: function (event, player) {
return player.countMark("fanghun") > 0;
},
@ -24477,7 +24475,6 @@ const skills = {
audio: 2,
unique: true,
juexingji: true,
forceunique: true,
derivation: "xiaoji",
trigger: { player: "phaseZhunbeiBegin" },
filter: function (event, player) {

1
character/tw/skill.js
View File

@ -15585,7 +15585,6 @@ const skills = {
limited: true,
skillAnimation: true,
animationColor: "orange",
forceunique: true,
filter: function (event, player) {
return player.countMark("fanghun") > 0;
},

2
character/xianjian.js
View File

@ -2811,7 +2811,7 @@ game.import("character", function () {
unique: true,
forceunique: true,
filter: function () {
return Math.random() < 0.5;
return Math.random() < 0.5 && [player.name1, player.name2].includes("pal_longkui");
},
derivation: ["diesha", "guijiang"],
content: function () {

12
character/yxs.js
View File

@ -816,7 +816,11 @@ game.import("character", function () {
forceunique: true,
enable: "phaseUse",
filter: function (event, player) {
return !player.hasSkill("tongyu_guiyin") && !player.getStat("damage");
return (
!player.hasSkill("tongyu_guiyin") &&
!player.getStat("damage") &&
[player.name1, player.name2].includes("yxs_luobinhan")
);
},
derivation: ["lzhangyi", "jimin", "tongyu"],
content: function () {
@ -848,7 +852,11 @@ game.import("character", function () {
forceunique: true,
enable: "phaseUse",
filter: function (event, player) {
return player.countCards("he") > 0 && !player.hasSkill("tongyu_guiyin");
return (
player.countCards("he") > 0 &&
!player.hasSkill("tongyu_guiyin") &&
[player.name1, player.name2].includes("yxs_luobinhan")
);
},
filterCard: true,
position: "he",

2
mode/guozhan.js
View File

@ -6455,7 +6455,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
})
)
return false;
return event.toShow.some((name) => lib.character[name][3].includes("gzjinyu"));
return event.toShow.some((name) => get.character(name, 3).includes("gzjinyu"));
},
logTarget: function (event, player) {
return game

2
noname/ui/create/index.js
View File

@ -1042,7 +1042,7 @@ export class Create {
.setContent(function () {
game.log(player, "投降");
player.popup("投降");
player.die("nosource").includeOut = true;
player.die("nosource").set("_triggered", null).includeOut = true;
}).player = player;
}
if (_status.paused && _status.imchoosing && !_status.auto) {