Merge pull request #1267 from PZ157/PR-Branch

调整/修复部分技能
This commit is contained in:
Spmario233 2024-04-25 23:04:34 +08:00 committed by GitHub
commit 77d23f4105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 74 additions and 28 deletions

View File

@ -4657,6 +4657,9 @@ game.import("character", function () {
)
player.storage.nsfuzhou_draw = true;
},
ai: {
combo: "nsfuzhou"
},
derivation: ["nsfuzhou_damage", "nsfuzhou_draw"],
},
nsweiyuan: {
@ -7587,6 +7590,7 @@ game.import("character", function () {
},
},
nschangshi: {
mode: ["identity"],
enable: "phaseUse",
usable: 1,
filter(event, player) {
@ -7602,17 +7606,20 @@ game.import("character", function () {
multitarget: true,
selectTarget: 2,
content() {
var tmp = targets[0].hp;
targets[0].hp = targets[1].hp;
targets[1].hp = tmp;
targets[0].update();
targets[1].update();
if (Math.abs(targets[0].hp - targets[1].hp) == 1) {
player.loseHp();
}
//else{
//player.die();
//}
game.broadcastAll(function (player, targets) {
player.showIdentity();
var tmp = targets[0].hp;
targets[0].hp = targets[1].hp;
targets[1].hp = tmp;
targets[0].update();
targets[1].update();
if (Math.abs(targets[0].hp - targets[1].hp) == 1) {
player.loseHp();
}
//else{
//player.die();
//}
}, player, targets);
},
ai: {
order: 10,
@ -7636,6 +7643,7 @@ game.import("character", function () {
},
},
nsjianning: {
mode: ["identity"],
enable: "phaseUse",
usable: 1,
filter(event, player) {
@ -7646,6 +7654,11 @@ game.import("character", function () {
},
content() {
"step 0";
if (!player.identityShown) {
game.broadcastAll(function (player) {
player.showIdentity();
}, player);
}
player.swapHandcards(target);
"step 1";
target.damage();
@ -7675,6 +7688,7 @@ game.import("character", function () {
},
},
nscuanquan: {
mode: ["identity"],
init(player) {
player.storage.nscuanquan = 0;
},
@ -7707,16 +7721,19 @@ game.import("character", function () {
},
content() {
player.awakenSkill("nscuanquan");
var tmp = player.maxHp;
player.identity = "zhu";
player.maxHp = game.zhu.hp;
player.showIdentity();
player.update();
game.zhu.identity = "zhong";
game.zhu.maxHp = tmp;
game.zhu.showIdentity();
game.zhu.update();
game.zhu = player;
game.broadcastAll(function (player) {
var tmp = player.maxHp;
player.identity = "zhu";
player.maxHp = game.zhu.hp;
player.showIdentity();
player.update();
game.zhu.identity = "zhong";
game.zhu.maxHp = tmp;
game.zhu.showIdentity();
game.zhu.update();
game.zhu = player;
}, player);
event.trigger("zhuUpdate");
},
},
nstianji: {
@ -7991,6 +8008,9 @@ game.import("character", function () {
},
},
group: "nsshijun_hp",
ai: {
halfneg: true
},
},
nszhaoxin: {
mark: true,
@ -8012,6 +8032,9 @@ game.import("character", function () {
}
},
},
ai: {
neg: true
},
},
nsxiuxin: {
mod: {
@ -10000,6 +10023,9 @@ game.import("character", function () {
"step 2";
trigger.cancel();
},
ai: {
combo: "jugong"
},
},
nsxinsheng: {
trigger: { source: "damageEnd" },
@ -10563,6 +10589,7 @@ game.import("character", function () {
},
ai: {
expose: 0.2,
combo: "zhucheng"
},
},
zhucheng: {
@ -11093,16 +11120,25 @@ game.import("character", function () {
inherit: "jianxiong",
},
diyjianxiong: {
mode: ["identity"],
mode: ["identity", "guozhan"],
trigger: { global: "dieBefore" },
forced: true,
filter(event, player) {
return event.player != game.zhu && _status.currentPhase == player;
if (_status.currentPhase !== player) return false;
if (get.mode() === "identity") return event.player != game.zhu;
return get.mode() === "guozhan" && event.player.isFriendOf(player);
},
content() {
trigger.player.identity = "fan";
trigger.player.setIdentity("fan");
trigger.player.identityShown = true;
game.broadcastAll(function (target, group) {
if (get.mode() === "identity") {
target.identity = group;
target.setIdentity(group);
target.identityShown = true;
}
else {
target.trueIdentity = lib.group.slice(0).filter(i => group !== i).randomGet();
}
}, trigger.player, get.mode() === "identity" ? "fan" : player.getGuozhanGroup());
},
},
nsshuaiyan: {
@ -12178,7 +12214,7 @@ game.import("character", function () {
nsshijun_info: "锁定技,你造成伤害时,你令此伤害+1并在结算后失去1点体力。",
nshunyou: "魂佑",
nshunyou_info:
"出阶段限一次你可以弃置一张基本牌获得弃牌堆底的一张装备牌和一张锦囊牌然后你可以将那张装备牌装备给一名角色允许替换。如果弃牌堆没有装备以及锦囊牌则改为摸X张牌X为损失的体力加一最多3张。",
"出阶段限一次你可以弃置一张基本牌获得弃牌堆底的一张装备牌和一张锦囊牌然后你可以将那张装备牌装备给一名角色允许替换。如果弃牌堆没有装备以及锦囊牌则改为摸X张牌X为你已损失的体力值+1最多3张。",
nswulie: "武烈",
nswulie_info:
"限定技准备阶段你可以失去1点体力上限从弃牌堆选择最多三张牌以任意顺序放置于牌堆顶。若如此做此回合的结束阶段你可以重复此操作。",

View File

@ -149,6 +149,9 @@ const skills = {
if (draws) player.draw(draws).gaintag = ["fuuko_chuanyuan"];
player.addSkill("fuuko_chuanyuan_effect");
},
ai: {
combo: "fuuko_xingdiao"
},
subSkill: {
effect: {
mod: {
@ -4450,6 +4453,7 @@ const skills = {
return player.getUseValue({ name: "kaihua" });
},
},
combo: "kotori_yumo"
},
},
kotori_huazhan2: { onremove: true, charlotte: true },
@ -9223,6 +9227,9 @@ const skills = {
content() {
player.turnOver();
},
ai: {
combo: "yusa_yanyi"
},
},
misa_yusa: {
charlotte: true,

View File

@ -9763,6 +9763,9 @@ game.import("character", function () {
content:
"出牌阶段开始时,你可以亮出牌堆顶的四张牌。你可弃置任意张手牌,并可获得任意张点数之和不大于你弃置的牌点数之和的牌。然后你可将以此法得到的牌以任意方式交给其他角色。",
},
ai: {
combo: "mubing"
},
},
diaoling: {
audio: 2,

View File

@ -24327,7 +24327,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
["heart", 3, "jingfanma", null, ["lianheng"]],
["heart", 4, "shan"],
["heart", 5, "shan"],
["heart", 6, "shan"],
["heart", 6, "shan", null, ["lianheng"]],
["heart", 7, "shan"],
["heart", 8, "tao"],
["heart", 9, "tao"],