add env706-neerex-20260105

.gitlab-ci.yml

@@ -99,6 +99,13 @@ env706:
     FILE_SYMBOL: 'env706'
     OVERRIDE_TEXT_DB_PATH: ./extras/2012.cdb
 
+env706-neerex-20260105:
+  extends: env706
+  variables:
+    OUTPUT_SYMBOL: env706-neerex-20260105
+    INCLUDES_DB: ./extras/env706-neerex-20260105/706_extra.cdb
+    EXTRA_LFLIST_PATH: ./extras/env706-neerex-20260105/lflist.conf
+
 upload_to_minio:
   stage: deploy
   dependencies:
@@ -109,6 +116,7 @@ upload_to_minio:
     - env408
     - env408-neerex-20251026
     - env706
+    - env706-neerex-20260105
   tags: 
     - linux
   script:
@@ -163,6 +171,14 @@ deploy_server_env706:
     OUTPUT_ENV: env706-zh-CN
     SERVER_IDENTIFIER: '706'
 
+deploy_server_env706-neerex-20260105:
+  extends: .deploy_server
+  dependencies:
+    - env706-neerex-20260105
+  variables:
+    OUTPUT_ENV: env706-neerex-20260105-zh-CN
+    SERVER_IDENTIFIER: 706-neerex-20260105
+
 .deploy_mycard:
   stage: deploy
   dependencies:

extras/env706-neerex-20260105/lflist.conf

+#[2011.3.1 魔改]
+!2011.3.1 魔改
+#forbidden
+72989439 0
+82301904 0
+40737112 0
+44910027 0
+21593977 0
+33184167 0
+34853266 0
+78010363 0
+14878871 0
+34124316 0
+78706415 0
+69015963 0
+3078576 0
+31560081 0
+34206604 0
+56570271 0
+8131171 0
+20663556 0
+4031928 0
+12580477 0
+17375316 0
+18144506 0
+19613556 0
+23557835 0
+42829885 0
+44763025 0
+46411259 0
+55144522 0
+60682203 0
+74191942 0
+79571449 0
+85602018 0
+87910978 0
+29762407 0
+34906152 0
+41482598 0
+57953380 0
+45986603 0
+69243953 0
+70828912 0
+3280747 0
+17484499 0
+28566710 0
+35316708 0
+57728570 0
+83555666 0
+61740673 0
+63519819 0
+32646477 0
+7391448 0
+#limit
+7902349 1
+8124921 1
+44519536 1
+70903634 1
+98777036 1
+65192027 1
+44330098 1
+40044918 1
+92826944 1
+41470137 1
+28297833 1
+37742478 1
+423585 1
+85215458 1
+2009101 1
+33396948 1
+95503687 1
+26202165 1
+80344569 1
+4906301 1
+31305911 1
+15341821 1
+16226786 1
+33508719 1
+33420078 1
+96782886 1
+1475311 1
+2295440 1
+32807846 1
+37520316 1
+42703248 1
+43040603 1
+45809008 1
+53129443 1
+58577036 1
+72302403 1
+72892473 1
+81439173 1
+83764718 1
+94886282 1
+46052429 1
+14087893 1
+23171610 1
+48976825 1
+67723438 1
+73915051 1
+3136426 1
+27970830 1
+66957584 1
+77565204 1
+91351370 1
+52687916 1
+50321796 1
+15800838 1
+27174286 1
+32723153 1
+36468556 1
+44095762 1
+46652477 1
+53582587 1
+64697231 1
+17078030 1
+85742772 1
+93016201 1
+97077563 1
+41420027 1
+77406972 1 -- 魔导骑士 基尔提亚-灵魂之枪 额外规制
+48049769 1 -- 雷海马 额外规制
+55423549 1 -- 黑色魔族-狮子男巫 额外规制
+#semi limit
+57774843 2
+59509952 2
+9411399 2
+14943837 2
+48686504 2
+85087012 2
+23205979 2
+3659803 2
+72405967 2
+98494543 2
+5318639 2
+91623717 2
+22046459 2
+29401950 2
+29843091 2
+53567095 2
+62279055 2
+84749824 2
\ No newline at end of file

subenv.ts

@@ -25,12 +25,24 @@ async function getBanlist() {
 	})).filter(l => l.date.isBefore(DATE));
 	const lflist = _.maxBy(lflists, l => l.date.unix());
 	const extraLflistPath = `./extras/${fileSymbol}/lflist.conf`;
-	let extraLflist: Banlist;
-	try {
-		const extraLflistContent = await fs.promises.readFile(extraLflistPath, 'utf-8');
-		extraLflist = (await readLFList(extraLflistContent))[0];
-	} catch (e) { }
-	return (lflist && extraLflist) ? mergeBanlists([lflist, extraLflist]) : lflist || extraLflist;
+	const extraLflistPath2 = process.env.EXTRA_LFLIST_PATH;
+	const readExtraLflist = async (path?: string): Promise<Banlist | undefined> => {
+		if (!path) return undefined;
+		try {
+			const content = await fs.promises.readFile(path, 'utf-8');
+			return (await readLFList(content))[0];
+		} catch (e) {
+			return undefined;
+		}
+	};
+	const mergeAvailable = (lists: Array<Banlist | undefined>): Banlist | undefined => {
+		const valid = lists.filter(Boolean) as Banlist[];
+		return valid.length ? mergeBanlists(valid) : undefined;
+	};
+	const [extraLflist, extraLflist2] = await Promise.all(
+		[extraLflistPath, extraLflistPath2].map(readExtraLflist)
+	);
+	return mergeAvailable([lflist, extraLflist, extraLflist2]);
 }
 
 async function main() {