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

进一步进行垃圾分类

This commit is contained in:
Spmario233 2024-04-23 21:26:29 +08:00
parent 5732a3b328
commit 88c31a49a0
13 changed files with 109 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mode/boss.js
View File

@ -25,13 +25,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} }
for (var i in lib.characterPack.mode_boss) { for (var i in lib.characterPack.mode_boss) {
lib.character[i] = lib.characterPack.mode_boss[i]; lib.character[i] = lib.characterPack.mode_boss[i];
if (!lib.character[i][4]) {
lib.character[i][4] = [];
} }
}
// for(var i in lib.cardPack.mode_boss){
// lib.card[i]=lib.cardPack.mode_boss[i];
// }
for (var i in lib.skill) { for (var i in lib.skill) {
if (lib.skill[i].changeSeat) { if (lib.skill[i].changeSeat) {
lib.skill[i] = {}; lib.skill[i] = {};
@ -82,7 +76,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (lib.storage.current == undefined) lib.storage.current = "boss_hundun"; if (lib.storage.current == undefined) lib.storage.current = "boss_hundun";
for (var i in lib.character) { for (var i in lib.character) {
var info = lib.character[i]; var info = lib.character[i];
if (info[4].includes("boss")) { if (info.isBoss) {
// var cfg=i+'_bossconfig'; // var cfg=i+'_bossconfig';
// if(get.config(cfg)==undefined){ // if(get.config(cfg)==undefined){
// game.saveConfig(cfg,true,true); // game.saveConfig(cfg,true,true);
@ -1443,7 +1437,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
}, },
init: function () { init: function () {
for (var i in lib.characterPack.mode_boss) { for (var i in lib.characterPack.mode_boss) {
if (lib.characterPack.mode_boss[i][4].includes("hiddenboss")) continue; if (get.convertedCharacter(lib.characterPack.mode_boss[i]).isHiddenBoss) continue;
lib.mode.boss.config[i + "_boss_config"] = { lib.mode.boss.config[i + "_boss_config"] = {
name: get.translation(i), name: get.translation(i),
init: true, init: true,
@ -1643,10 +1637,10 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var list = []; var list = [];
event.list = list; event.list = list;
for (i in lib.character) { for (i in lib.character) {
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isMinskin) continue;
if (lib.character[i][4].includes("boss")) continue; if (lib.character[i].isBoss) continue;
if (lib.character[i][4].includes("hiddenboss")) continue; if (lib.character[i].isHiddenBoss) continue;
if (lib.character[i][4] && lib.character[i][4].includes("forbidai")) continue; if (lib.character[i].isAiForbidden) continue;
if (lib.config.forbidboss.includes(i)) continue; if (lib.config.forbidboss.includes(i)) continue;
if (lib.filter.characterDisabled(i)) continue; if (lib.filter.characterDisabled(i)) continue;
list.push(i); list.push(i);
@ -7027,8 +7021,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} }
for (var i in lib.character) { for (var i in lib.character) {
if (lib.character[i][1] != "wei") continue; if (lib.character[i][1] != "wei") continue;
if (lib.character[i][4].includes("boss")) continue; if (lib.character[i].isBoss) continue;
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isMinskin) continue;
if (player.storage.xiongcai.includes(i)) continue; if (player.storage.xiongcai.includes(i)) continue;
if (list2.includes(i)) continue; if (list2.includes(i)) continue;
list.push(i); list.push(i);

8
mode/brawl.js
View File

@ -533,9 +533,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (lib.filter.characterDisabled(name)) continue; if (lib.filter.characterDisabled(name)) continue;
if (name.indexOf("old_") == 0) continue; if (name.indexOf("old_") == 0) continue;
var skillsx = lib.character[name][3].slice(0); var skillsx = lib.character[name][3].slice(0);
lib.character[name][2] = 4; lib.character[name].hp = 4;
lib.character[name][3] = []; lib.character[name].maxHp = 4;
if (lib.character[name][4]) lib.character[name][4].remove("hiddenSkill"); lib.character[name].hujia = 0;
lib.character[name].skills = [];
lib.character[name].hasHiddenSkill = false;
characters.push(name); characters.push(name);
var list = skillsx.slice(0); var list = skillsx.slice(0);
for (var j = 0; j < skillsx.length; j++) { for (var j = 0; j < skillsx.length; j++) {

11
mode/chess.js
View File

@ -45,9 +45,6 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} }
if (!playback && i.indexOf("leader_") == 0 && _status.mode != "leader") continue; if (!playback && i.indexOf("leader_") == 0 && _status.mode != "leader") continue;
lib.character[i] = lib.characterPack.mode_chess[i]; lib.character[i] = lib.characterPack.mode_chess[i];
if (!lib.character[i][4]) {
lib.character[i][4] = [];
}
} }
} }
if (get.config("chess_card")) { if (get.config("chess_card")) {
@ -106,7 +103,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} else { } else {
game.chooseCharacterDouble( game.chooseCharacterDouble(
function (i) { function (i) {
if (lib.character[i][4].includes("chessboss")) { if (lib.character[i].isChessBoss) {
return false; return false;
} }
return !lib.filter.characterDisabled(i); return !lib.filter.characterDisabled(i);
@ -3957,15 +3954,15 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var jiangelist = []; var jiangelist = [];
event.list = list; event.list = list;
for (i in lib.character) { for (i in lib.character) {
if (lib.character[i][4].includes("chessboss")) { if (lib.character[i].isChessBoss) {
bosslist.push(i); bosslist.push(i);
continue; continue;
} else if (lib.character[i][4].includes("jiangeboss")) { } else if (lib.character[i].isJiangeBoss) {
// if(get.config('chess_jiange')) jiangelist.push(i); // if(get.config('chess_jiange')) jiangelist.push(i);
continue; continue;
} }
if (i.indexOf("treasure_") == 0) continue; if (i.indexOf("treasure_") == 0) continue;
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isMinskin) continue;
if (lib.config.forbidchess.includes(i)) continue; if (lib.config.forbidchess.includes(i)) continue;
if (lib.filter.characterDisabled(i)) continue; if (lib.filter.characterDisabled(i)) continue;
list.push(i); list.push(i);

55
mode/guozhan.js
View File

@ -9,25 +9,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
if (lib.character[i.slice(3)]) continue; if (lib.character[i.slice(3)]) continue;
} }
lib.character[i] = lib.characterPack.mode_guozhan[i]; lib.character[i] = lib.characterPack.mode_guozhan[i];
if (!lib.character[i][4]) {
lib.character[i][4] = [];
}
if (!lib.translate[i]) { if (!lib.translate[i]) {
lib.translate[i] = lib.translate[i.slice(3)]; lib.translate[i] = lib.translate[i.slice(3)];
} }
} }
for (var i in lib.character) { for (var i in lib.character) {
if (lib.character[i][1] == "shen") { if (lib.character[i].group == "shen") {
if (lib.character[i][4]) { lib.character[i].group = (lib.character[i].groupInGuozhan || "qun");
var group = lib.character[i][4].find(
(group) =>
lib.group.includes(group) || group == "key" || group.startsWith("gzgroup:")
);
if (group) {
if (group.startsWith("gzgroup:")) lib.character[i][1] = group.slice(8);
else lib.character[i][1] = group;
} else lib.character[i][1] = "qun";
} else lib.character[i][1] = "qun";
} }
} }
}, },
@ -35,25 +23,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
var pack = lib.characterPack.mode_guozhan; var pack = lib.characterPack.mode_guozhan;
for (var i in pack) { for (var i in pack) {
lib.character[i] = pack[i]; lib.character[i] = pack[i];
if (!lib.character[i][4]) {
lib.character[i][4] = [];
}
if (!lib.translate[i]) { if (!lib.translate[i]) {
lib.translate[i] = lib.translate[i.slice(3)]; lib.translate[i] = lib.translate[i.slice(3)];
} }
} }
for (var i in lib.character) { for (var i in lib.character) {
if (lib.character[i][1] == "shen") { if (lib.character[i].group == "shen") {
if (lib.character[i][4]) { lib.character[i].group = (lib.character[i].groupInGuozhan || "qun");
var group = lib.character[i][4].find(
(group) =>
lib.group.includes(group) || group == "key" || group.startsWith("gzgroup:")
);
if (group) {
if (group.startsWith("gzgroup:")) lib.character[i][1] = group.slice(8);
else lib.character[i][1] = group;
} else lib.character[i][1] = "qun";
} else lib.character[i][1] = "qun";
} }
} }
}, },
@ -154,28 +130,13 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} }
for (var i in pack) { for (var i in pack) {
lib.character[i] = pack[i]; lib.character[i] = pack[i];
if (!lib.character[i][4]) {
lib.character[i][4] = [];
}
if (!lib.translate[i]) { if (!lib.translate[i]) {
lib.translate[i] = lib.translate[i.slice(3)]; lib.translate[i] = lib.translate[i.slice(3)];
} }
} }
for (var i in lib.character) { for (var i in lib.character) {
if (lib.character[i][1] == "shen") { if (lib.character[i][1] == "shen") {
if (lib.character[i][4]) { lib.character[i].group = (lib.character[i].groupInGuozhan || "qun");
var group = lib.character[i][4].find(
(group) =>
lib.group.includes(group) ||
group == "key" ||
group.startsWith("gzgroup:")
);
if (group) {
if (group.startsWith("gzgroup:"))
lib.character[i][1] = group.slice(8);
else lib.character[i][1] = group;
} else lib.character[i][1] = "qun";
} else lib.character[i][1] = "qun";
} }
} }
//lib.characterReplace={}; //lib.characterReplace={};
@ -22319,9 +22280,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
continue; continue;
if (get.is.jun(i)) continue; if (get.is.jun(i)) continue;
} }
if (lib.character[i][4].includes("hiddenSkill")) continue; if (lib.character[i].hasHiddenSkill) continue;
if (lib.character[i][2] == 3 || lib.character[i][2] == 4 || lib.character[i][2] == 5) const hp = lib.character[i].hp, maxHp = lib.character[i].maxHp;
event.list.push(i); if (hp === maxHp && hp >= 3 && hp <= 5) event.list.push(i);
} }
_status.characterlist = event.list.slice(0); _status.characterlist = event.list.slice(0);
_status.yeidentity = []; _status.yeidentity = [];

4
mode/tafang.js
View File

@ -245,9 +245,9 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
for (i in lib.character) { for (i in lib.character) {
if (i.indexOf("treasure_") == 0) continue; if (i.indexOf("treasure_") == 0) continue;
if (i.indexOf("tafang_mech_") == 0) continue; if (i.indexOf("tafang_mech_") == 0) continue;
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isMinskin) continue;
if (lib.config.forbidchess.includes(i)) continue; if (lib.config.forbidchess.includes(i)) continue;
if (lib.character[i][4].includes("boss")) continue; if (lib.character[i].isBoss) continue;
if (lib.filter.characterDisabled(i)) continue; if (lib.filter.characterDisabled(i)) continue;
list.push(i); list.push(i);
} }

12
mode/versus.js
View File

@ -755,8 +755,8 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
for (var i in lib.characterPack.boss) { for (var i in lib.characterPack.boss) {
if (!lib.character[i] && lib.characterPack.boss[i][4]) { if (!lib.character[i] && lib.characterPack.boss[i][4]) {
if ( if (
lib.characterPack.boss[i][4].includes("jiangeboss") || get.convertedCharacter(lib.characterPack.boss[i]).isJiangeBoss ||
lib.characterPack.boss[i][4].includes("jiangemech") get.convertedCharacter(lib.characterPack.boss[i]).isJiangeMech
) { ) {
lib.character[i] = lib.characterPack.boss[i]; lib.character[i] = lib.characterPack.boss[i];
} }
@ -765,11 +765,11 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
} }
for (var i in lib.character) { for (var i in lib.character) {
if (lib.character[i][4]) { if (lib.character[i][4]) {
if (lib.character[i][4].includes("jiangeboss")) { if (lib.character[i].isJiangeBoss) {
list[lib.character[i][1] + "boss"].push(i); list[lib.character[i].group + "boss"].push(i);
continue; continue;
} else if (lib.character[i][4].includes("jiangemech")) { } else if (lib.character[i].isJiangeMech) {
list[lib.character[i][1] + "mech"].push(i); list[lib.character[i].group + "mech"].push(i);
continue; continue;
} }
} }

1
noname/game/index.js
View File

@ -4731,6 +4731,7 @@ export class Game {
let extname = _status.extension || "扩展"; let extname = _status.extension || "扩展";
let gzFlag = false; let gzFlag = false;
packagename = packagename || extname; packagename = packagename || extname;
//TODO: 把这里一大坨改成新写法
for (let i in pack) { for (let i in pack) {
if (i == "mode") { if (i == "mode") {
if (pack[i] == "guozhan") gzFlag = true; if (pack[i] == "guozhan") gzFlag = true;

30
noname/get/index.js
View File

@ -1360,11 +1360,11 @@ export class Get {
if (rank.bm.includes(name)) return num ? Math.round((2 * (num - 1)) / 8 + 1) : "bm"; if (rank.bm.includes(name)) return num ? Math.round((2 * (num - 1)) / 8 + 1) : "bm";
if (rank.c.includes(name)) return num ? Math.round((1 * (num - 1)) / 8 + 1) : "c"; if (rank.c.includes(name)) return num ? Math.round((1 * (num - 1)) / 8 + 1) : "c";
if (rank.d.includes(name)) return num ? Math.round((0 * (num - 1)) / 8 + 1) : "d"; if (rank.d.includes(name)) return num ? Math.round((0 * (num - 1)) / 8 + 1) : "d";
if (lib.character[name] && lib.character[name][4]) { if (lib.character[name]) {
if ( if (
lib.character[name][4].includes("boss") || lib.character[name].isBoss ||
lib.character[name][4].includes("bossallowed") || lib.character[name].isBossAllowed ||
lib.character[name][4].includes("hiddenboss") lib.character[name].isHiddenBoss
) { ) {
return num ? Math.round((9 * (num - 1)) / 8 + 1) : "sp"; return num ? Math.round((9 * (num - 1)) / 8 + 1) : "sp";
} }
@ -2594,14 +2594,11 @@ export class Get {
for (var i in lib.character) { for (var i in lib.character) {
if (lib.filter.characterDisabled(i)) continue; if (lib.filter.characterDisabled(i)) continue;
if (lib.filter.characterDisabled2(i)) continue; if (lib.filter.characterDisabled2(i)) continue;
if (lib.character[i][4]) { if (lib.character[i].isBoss) continue;
if (lib.character[i][4].includes("boss")) continue; if (lib.character[i].isHiddenBoss) continue;
if (lib.character[i][4].includes("hiddenboss")) continue; if (lib.character[i].isMinskin) continue;
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isUnseen) continue;
if (lib.character[i][4].includes("unseen")) continue; for (var skill of lib.character[i].skills) {
}
for (var j = 0; j < lib.character[i][3].length; j++) {
var skill = lib.character[i][3][j];
var info = lib.skill[skill]; var info = lib.skill[skill];
if (lib.filter.skillDisabled(skill)) continue; if (lib.filter.skillDisabled(skill)) continue;
if (func && !func(info, skill, i)) continue; if (func && !func(info, skill, i)) continue;
@ -2616,13 +2613,12 @@ export class Get {
var list = []; var list = [];
if (name && lib.character[name]) { if (name && lib.character[name]) {
if (lib.character[name][4]) { if (lib.character[name][4]) {
if (lib.character[name][4].includes("boss")) return list; if (lib.character[name].isBoss) return list;
if (lib.character[name][4].includes("hiddenboss")) return list; if (lib.character[name].isHiddenBoss) return list;
if (lib.character[name][4].includes("minskin")) return list; if (lib.character[name].isMinskin) return list;
if (lib.character[name].isUnseen) return list; if (lib.character[name].isUnseen) return list;
} }
for (var j = 0; j < lib.character[name][3].length; j++) { for (var skill of lib.character[name].skills) {
var skill = lib.character[name][3][j];
var info = lib.skill[skill]; var info = lib.skill[skill];
if (lib.filter.skillDisabled(skill)) continue; if (lib.filter.skillDisabled(skill)) continue;
if (func && !func(info, skill, name)) continue; if (func && !func(info, skill, name)) continue;

37
noname/library/element/character.js
View File

@ -105,6 +105,21 @@ export class Character {
* @type { boolean } * @type { boolean }
**/ **/
isBossAllowed = false; isBossAllowed = false;
/**
* 武将牌是否为战旗模式下的BOSS
* @type { boolean }
**/
isChessBoss = false;
/**
* 武将牌是否为剑阁模式下的BOSS
* @type { boolean }
**/
isJiangeBoss = false;
/**
* 武将牌是否为剑阁模式下的机械
* @type { boolean }
**/
isJiangeMech = false;
/** /**
* 武将牌对应的全部宗族 * 武将牌对应的全部宗族
* @type { string[] } * @type { string[] }
@ -136,8 +151,10 @@ export class Character {
clans = []; clans = [];
for (let i = 0; i < trash.length; i++) { for (let i = 0; i < trash.length; i++) {
let item = trash[i]; let item = trash[i];
if (i === 0 && lib.group.includes(item)) { if (i === 0 && (lib.group.includes(item) || item === 'key')) {
character.groupInGuozhan = item; character.groupInGuozhan = item;
} else if(item.startsWith("gzgroup:")){
character.groupInGuozhan = item.slice(8);
} else if (item === "zhu") { } else if (item === "zhu") {
character.isZhugong = true; character.isZhugong = true;
} else if (item === "unseen") { } else if (item === "unseen") {
@ -146,6 +163,12 @@ export class Character {
character.isMinskin = true; character.isMinskin = true;
} else if (item === "boss") { } else if (item === "boss") {
character.isBoss = true; character.isBoss = true;
} else if (item === "chessboss") {
character.isChessBoss = true;
} else if (item === "jiangeboss") {
character.isJiangeBoss = true;
} else if (item === "jiangemech") {
character.isJiangeMech = true;
} else if (item === "bossallowed") { } else if (item === "bossallowed") {
character.isBossAllowed = true; character.isBossAllowed = true;
} else if (item === "hiddenboss") { } else if (item === "hiddenboss") {
@ -216,13 +239,14 @@ export class Character {
} }
/** /**
* 把新格式下的数据转换回传统的屎山
* @deprecated * @deprecated
*/ */
get 4() { get 4() {
const trashes = [], const trashes = [],
character = this; character = this;
if (lib.group.includes(character.groupInGuozhan)) { if (lib.group.includes(character.groupInGuozhan)) {
trashes.push(character.groupInGuozhan); trashes.push(`gzgroup:${character.groupInGuozhan}`);
} }
if (character.isZhugong) { if (character.isZhugong) {
trashes.push("zhu"); trashes.push("zhu");
@ -236,6 +260,15 @@ export class Character {
if (character.isBoss) { if (character.isBoss) {
trashes.push("boss"); trashes.push("boss");
} }
if (character.isChessBoss) {
trashes.push("chessboss");
}
if (character.isJiangeBoss) {
trashes.push("jiangeboss");
}
if (character.isJiangeMech) {
trashes.push("jiangemech");
}
if (character.isBossAllowed) { if (character.isBossAllowed) {
trashes.push("bossallowed"); trashes.push("bossallowed");
} }

1
noname/library/element/content.js
View File

@ -2399,6 +2399,7 @@ export const Content = {
} }
for (j in character[i]) { for (j in character[i]) {
if (j == "mode" || j == "forbid" || j == "characterSort") continue; if (j == "mode" || j == "forbid" || j == "characterSort") continue;
//TODO: 改掉这第二坨
for (k in character[i][j]) { for (k in character[i][j]) {
if (j == "character") { if (j == "character") {
if (!character[i][j][k][4]) { if (!character[i][j][k][4]) {

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

@ -2491,12 +2491,12 @@ export class Player extends HTMLDivElement {
info = get.convertedCharacter(["", "", 1, [], []]); info = get.convertedCharacter(["", "", 1, [], []]);
} }
if (!game.minskin && get.is.newLayout() && !info[4].includes("minskin")) { if (!game.minskin && get.is.newLayout() && !info.isMinskin) {
this.classList.remove("minskin"); this.classList.remove("minskin");
this.node.avatar.setBackground(character, "character"); this.node.avatar.setBackground(character, "character");
} else { } else {
this.node.avatar.setBackground(character, "character"); this.node.avatar.setBackground(character, "character");
if (info[4].includes("minskin")) { if (info.isMinskin) {
this.classList.add("minskin"); this.classList.add("minskin");
} else if (game.minskin) { } else if (game.minskin) {
this.classList.add("minskin"); this.classList.add("minskin");

25
noname/library/index.js
View File

@ -10531,7 +10531,7 @@ export class Library {
return true; return true;
}, },
characterDisabled: function (i, libCharacter) { characterDisabled: function (i, libCharacter) {
if (!lib.character[i] || (lib.character[i][4] && lib.character[i][4].includes("forbidai"))) if (!lib.character[i] || lib.character[i].isAiForbidden)
return true; return true;
if (lib.character[i].isUnseen) return true; if (lib.character[i].isUnseen) return true;
if (lib.config.forbidai.includes(i)) return true; if (lib.config.forbidai.includes(i)) return true;
@ -10602,11 +10602,11 @@ export class Library {
var info = lib.character[i]; var info = lib.character[i];
if (!info) return true; if (!info) return true;
if (info[4]) { if (info[4]) {
if (info[4].includes("boss")) return true; if (info.isBoss) return true;
if (info[4].includes("hiddenboss")) return true; if (info.isHiddenBoss) return true;
if (info[4].includes("minskin")) return true; if (info.isMinskin) return true;
if (info.isUnseen) return true; if (info.isUnseen) return true;
if (info[4].includes("forbidai") && (!_status.event.isMine || !_status.event.isMine())) if (info.isAiForbidden && (!_status.event.isMine || !_status.event.isMine()))
return true; return true;
if (lib.characterFilter[i] && !lib.characterFilter[i](get.mode())) return true; if (lib.characterFilter[i] && !lib.characterFilter[i](get.mode())) return true;
} }
@ -12213,22 +12213,19 @@ export class Library {
trigger: { global: "gameStart", player: "enterGame" }, trigger: { global: "gameStart", player: "enterGame" },
silent: true, silent: true,
content: function () { content: function () {
var list = [player.name, player.name1, player.name2]; var list = [player.name1, player.name2];
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
if (list[i] && lib.character[list[i]]) { if (list[i] && lib.character[list[i]]) {
var info = lib.character[list[i]]; var info = lib.character[list[i]];
if (info[3].includes("dualside") && info[4]) { if (info.skills.includes("dualside") && info.dualSideCharacter) {
player.storage.dualside = [list[i], player.hp, player.maxHp]; player.storage.dualside = [list[i], player.hp, player.maxHp];
for (var j = 0; j < info[4].length; j++) { var name2 = info.dualSideCharacter;
if (info[4][j].startsWith("dualside:")) {
var name2 = info[4][j].slice(9);
var info2 = lib.character[name2]; var info2 = lib.character[name2];
player.storage.dualside.push(name2); player.storage.dualside.push(name2);
player.storage.dualside.push(get.infoHp(info2[2])); player.storage.dualside.push(info2.hp);
player.storage.dualside.push(get.infoMaxHp(info2[2])); player.storage.dualside.push(info2.maxHp);
}
}
} }
break;
} }
} }
var cfg = player.storage.dualside; var cfg = player.storage.dualside;

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

@ -1127,16 +1127,16 @@ export class Create {
characterDialog2(filter) { characterDialog2(filter) {
var list = []; var list = [];
for (var i in lib.character) { for (var i in lib.character) {
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isMinskin) continue;
if ( if (
lib.character[i][4].includes("boss") || lib.character[i].isBoss ||
lib.character[i][4].includes("hiddenboss") lib.character[i].isHiddenBoss
) { ) {
if (lib.config.mode == "boss") continue; if (lib.config.mode == "boss") continue;
if (!lib.character[i][4].includes("bossallowed")) continue; if (!lib.character[i].isBossAllowed) continue;
} }
if (lib.character[i][4].includes("stonehidden")) continue; if (lib.character[i].isHiddenInStoneMode) continue;
if (lib.config.banned.includes(i)) continue; if (lib.config.banned.includes(i)) continue;
if (filter && filter(i)) continue; if (filter && filter(i)) continue;
list.push(i); list.push(i);
@ -1306,16 +1306,16 @@ export class Create {
} else { } else {
for (var i in lib.character) { for (var i in lib.character) {
if(lib.character[i][4]) { if(lib.character[i][4]) {
if (lib.character[i][4].includes("minskin")) continue; if (lib.character[i].isMinskin) continue;
if ( if (
lib.character[i][4].includes("boss") || lib.character[i].isBoss ||
lib.character[i][4].includes("hiddenboss") lib.character[i].isHiddenBoss
) { ) {
if (lib.config.mode == "boss") continue; if (lib.config.mode == "boss") continue;
if (!lib.character[i][4].includes("bossallowed")) continue; if (!lib.character[i].isBossAllowed) continue;
} }
if (lib.character[i][4].includes("stonehidden")) continue; if (lib.character[i].isHiddenInStoneMode) continue;
if (lib.character[i].isUnseen) continue; if (lib.character[i].isUnseen) continue;
} }
if (lib.config.banned.includes(i)) continue; if (lib.config.banned.includes(i)) continue;