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

调整刚直和绝情tag

This commit is contained in:
157 2024-06-01 13:29:32 +08:00
parent d58e7f72a2
commit c1d2a49960
10 changed files with 54 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
character/extra/skill.js
View File

@ -1997,7 +1997,7 @@ const skills = {
if (
!get.tag(card, "damage") ||
player.countMark("dcxianjin") % 2 ||
!player.hasSkillTag("jueqing", null, target)
!player.hasSkillTag("jueqing", false, target)
) return;
if (player.isMaxHandcard()) return [1, 1];
return [1, Math.min(3, 1 + player.getStorage("dctuoyu").length)];
@ -5782,7 +5782,7 @@ const skills = {
if (!target.hasFriend()) return;
let rec = get.tag(card, "recover"), damage = get.tag(card, "damage");
if (!rec && !damage) return;
if (damage && player.hasSkillTag("jueqing", null, target)) return 1.7;
if (damage && player.hasSkillTag("jueqing", false, target)) return 1.7;
let die = [null, 1],
temp;
game.filterPlayer(i => {

16
character/offline/skill.js
View File

@ -845,8 +845,6 @@ const skills = {
var go = false,
d1 = false;
if (get.attitude(player, trigger.player) > 0) {
d1 = true;
if (trigger.player.hasSkill("jueqing") || trigger.player.hasSkill("gangzhi")) d1 = false;
for (var target of trigger.targets) {
if (
!target.mayHaveShan(
@ -866,15 +864,17 @@ const skills = {
true
)
) {
if (!target.hasSkill("gangzhi")) d1 = false;
if (
target.hasSkillTag("filterDamage", null, {
get.attitude(player, target) < 0 &&
!trigger.player.hasSkillTag("jueqing", false, target) &&
!target.hasSkillTag("filterDamage", null, {
player: trigger.player,
card: trigger.card,
}) ||
get.attitude(player, target) >= 0
)
d1 = false;
})
) {
d1 = true;
break;
}
}
}
if (trigger.addCount === false || !trigger.player.isPhaseUsing()) go = false;

2
character/onlyOL/skill.js
View File

@ -869,7 +869,7 @@ const skills = {
true
)
) {
if (player.hasSkill("jueqing") || target.hasSkill("gangzhi")) extra_num--;
if (player.hasSkillTag("jueqing", false, target)) extra_num--;
else if (
target.hasSkillTag("filterDamage", null, {
player: event.player,

6
character/refresh/skill.js
View File

@ -3199,7 +3199,7 @@ const skills = {
threaten: 0.9,
effect: {
target: function (card, player, target) {
if (player.hasSkillTag("jueqing")) return;
if (player.hasSkillTag("jueqing", false, target)) return;
if (target.hujia) return;
if (player._shibei_tmp) return;
if (target.hasSkill("shibei_ai")) return;
@ -12842,8 +12842,8 @@ const skills = {
ai: {
effect: {
target: (card, player, target) => {
if (typeof card !== "object" || !get.tag(card, "damage") || target.hasSkill("gangzhi")) return;
if (player.hasSkillTag("jueqing", null, true)) return;
if (typeof card !== "object" || !get.tag(card, "damage")) return;
if (player.hasSkillTag("jueqing", false, target)) return;
if (get.color(card) === "red") return [1, 0, 1, 0.6];
return [1, 0.6];
},

25
character/sp2/skill.js
View File

@ -8687,6 +8687,31 @@ const skills = {
ai: {
jueqing: true,
},
init(player) {
game.addGlobalSkill("gangzhi_jueqing");
},
onremove(player) {
game.removeGlobalSkill("gangzhi_jueqing");
},
subSkill: {
jueqing: {
trigger: {player: "dieAfter"},
filter(event, player) {
return !game.hasPlayer(cur => cur.hasSkill("gangzhi"));
},
silent: true,
forceDie: true,
content() {
game.removeGlobalSkill("gangzhi_jueqing");
},
ai: {
jueqing: true,
skillTagFilter(player, tag, arg) {
if (tag === "jueqing") return arg && arg.hasSkill("gangzhi");
}
}
}
},
},
beizhan: {
trigger: { player: "phaseJieshuBegin" },

2
character/standard/skill.js
View File

@ -496,7 +496,7 @@ const skills = {
threaten: 0.9,
effect: {
target: function (card, player, target) {
if (player.hasSkillTag("jueqing")) return;
if (player.hasSkillTag("jueqing", false, target)) return;
if (player._stdjinjian_tmp) return;
const count = player.storage.counttrigger;
if (count && count.stdjinjian_player && count.stdjinjian_player > 0) return;

30
character/tw/skill.js
View File

@ -1942,8 +1942,7 @@ const skills = {
.set(
"goon",
(function () {
var d1 = true;
if (player.hasSkill("jueqing") || player.hasSkill("gangzhi")) d1 = false;
var d1 = false;
if (
!target.mayHaveShan(
player,
@ -1962,15 +1961,7 @@ const skills = {
true
)
) {
if (!target.hasSkill("gangzhi")) d1 = false;
if (
!target.hasSkillTag("filterDamage", null, {
player: player,
card: trigger.card,
}) &&
get.attitude(player, target) < 0
)
return true;
if (get.attitude(player, target) < 0 && !player.hasSkillTag("jueqing", false, target)) return true;
}
if (d1) return get.damageEffect(player, player, player) > 0;
return false;
@ -13720,8 +13711,6 @@ const skills = {
"goon",
(function () {
if (get.attitude(target, player) < 0) return false;
var d1 = true;
if (trigger.player.hasSkill("jueqing") || trigger.player.hasSkill("gangzhi")) d1 = false;
for (var target of trigger.targets) {
if (
!target.mayHaveShan(
@ -13741,18 +13730,19 @@ const skills = {
true
)
) {
if (!target.hasSkill("gangzhi")) d1 = false;
if (
get.attitude(player, target) < 0 &&
!trigger.player.hasSkillTag("jueqing", false, target) &&
!target.hasSkillTag("filterDamage", null, {
player: trigger.player,
card: trigger.card,
}) &&
get.attitude(player, target) < 0
})
)
return true;
}
}
return d1;
return false;
})()
);
if (!event.target.isUnderControl(true) && !event.target.isOnline()) game.delayx();
@ -16112,9 +16102,8 @@ const skills = {
return event.card.name == "sha" && (event.player == player || player.inRange(event.player)) && player.countCards("he") > 0;
},
checkx(event, player) {
let d1 = true,
let d1 = false,
e = false;
if (event.player.hasSkill("jueqing") || event.player.hasSkill("gangzhi")) d1 = false;
for (let tar of event.targets) {
if (event.card.name == "sha") {
if (
@ -16135,13 +16124,14 @@ const skills = {
true
)
) {
if (!tar.hasSkill("gangzhi")) d1 = false;
if (
!event.player.hasSkillTag("jueqing", false, tar) &&
!tar.hasSkillTag("filterDamage", null, {
player: event.player,
card: event.card,
})
) {
d1 = true;
let att = get.attitude(_status.event.player, tar);
if (att > 0) return false;
if (att < 0) e = true;

4
character/xianding/skill.js
View File

@ -3705,7 +3705,7 @@ const skills = {
ai: {
effect: {
target: function (card, player, target) {
if (target.countCards("h") > target.getHp() || player.hasSkillTag("jueqing")) return;
if (target.countCards("h") > target.getHp() || player.hasSkillTag("jueqing", false, target)) return;
if (player._dcxiongmu_temp) return;
if (_status.event.getParent("useCard", true) || _status.event.getParent("_wuxie", true)) return;
if (get.tag(card, "damage")) {
@ -12999,7 +12999,7 @@ const skills = {
threaten: 0.9,
effect: {
target: function (card, player, target) {
if (player.hasSkillTag("jueqing")) return;
if (player.hasSkillTag("jueqing", false, target)) return;
//if(target.hujia) return;
if (player._jinjian_tmp) return;
if (_status.event.getParent("useCard", true) || _status.event.getParent("_wuxie", true)) return;

2
character/yijiang/skill.js
View File

@ -14383,7 +14383,7 @@ const skills = {
threaten: 0.9,
effect: {
target: function (card, player, target) {
if (player.hasSkillTag("jueqing")) return;
if (player.hasSkillTag("jueqing", false, target)) return;
if (target.hujia) return;
if (player._shibei_tmp) return;
if (target.hasSkill("shibei_ai")) return;

4
noname/library/element/player.js
View File

@ -9028,9 +9028,7 @@ export class Player extends HTMLDivElement {
*/
hasSkillTag(tag, hidden, arg, globalskill) {
var skills = this.getSkills(hidden);
if (globalskill) {
skills.addArray(lib.skill.global);
}
if (globalskill !== false) skills.addArray(lib.skill.global);
game.expandSkills(skills);
for (var i = 0; i < skills.length; i++) {
var info = lib.skill[skills[i]];