Merge branch 'libccy:PR-Branch' into PR-Branch
This commit is contained in:
commit
edf585ec0c
|
@ -84,6 +84,8 @@ const skills = {
|
|||
if (name !== "dc_wuyi") {
|
||||
const skills = get.character(name, 3);
|
||||
skills.forEach(skill => {
|
||||
const info = get.info(skill);
|
||||
if (!info || (info.ai && info.ai.combo)) return;
|
||||
if (skill in _status.dcbenxi_map) return;
|
||||
const voices = game.parseSkillText(skill, name);
|
||||
if (
|
||||
|
|
|
@ -12198,7 +12198,7 @@ const skills = {
|
|||
filter: function (event, player, name) {
|
||||
if (player.hasSkill("zhiwei2")) return false;
|
||||
if (!game.hasPlayer(current => current != player)) return false;
|
||||
if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow(name => {
|
||||
if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow.some(name => {
|
||||
return get.character(name, 3).includes("zhiwei");
|
||||
});
|
||||
return event.name != "showCharacter" && (name != "phaseBefore" || game.phaseNumber == 0);
|
||||
|
|
|
@ -14207,7 +14207,7 @@ const skills = {
|
|||
.set("ai", () => {
|
||||
const player = get.event("player"),
|
||||
trigger = get.event().getTrigger();
|
||||
const cards = trigger.cards.filterInD();
|
||||
const cards = trigger.cards ? trigger.cards.filterInD() : [];
|
||||
if (get.event().controls.includes("拿牌")) {
|
||||
if (
|
||||
cards.reduce((sum, card) => {
|
||||
|
|
|
@ -142,17 +142,14 @@ Reflect.defineProperty(HTMLDivElement.prototype, "setBackground", {
|
|||
gzbool = false;
|
||||
const mode = get.mode();
|
||||
if (type == "character") {
|
||||
nameinfo = get.character(name);
|
||||
if (lib.characterPack[`mode_${mode}`] && lib.characterPack[`mode_${mode}`][name]) {
|
||||
if (mode == "guozhan") {
|
||||
nameinfo = lib.character[name];
|
||||
if (name.startsWith("gz_shibing")) name = name.slice(3, 11);
|
||||
else {
|
||||
if (
|
||||
lib.config.mode_config.guozhan.guozhanSkin &&
|
||||
lib.character[name] &&
|
||||
lib.character[name].hasSkinInGuozhan
|
||||
)
|
||||
if (lib.config.mode_config.guozhan.guozhanSkin && nameinfo && nameinfo.hasSkinInGuozhan){
|
||||
gzbool = true;
|
||||
}
|
||||
name = name.slice(3);
|
||||
}
|
||||
} else modeimage = mode;
|
||||
|
@ -161,8 +158,6 @@ Reflect.defineProperty(HTMLDivElement.prototype, "setBackground", {
|
|||
name = name.split("::");
|
||||
modeimage = name[0];
|
||||
name = name[1];
|
||||
} else {
|
||||
nameinfo = get.character(name);
|
||||
}
|
||||
}
|
||||
let imgPrefixUrl;
|
||||
|
|
Loading…
Reference in New Issue