Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,758 changes: 838 additions & 1,920 deletions data/FractionateEverything2.1.4.json → data/FractionateEverything2.2.0.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

13,090 changes: 13,090 additions & 0 deletions data/MoreMegaStructure1.8.4_OrbitalRing0.8.8.json

Large diffs are not rendered by default.

35,973 changes: 35,973 additions & 0 deletions data/MoreMegaStructure1.8.4_OrbitalRing0.8.8_FractionateEverything2.2.0.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

11,325 changes: 11,325 additions & 0 deletions data/OrbitalRing0.8.8.json

Large diffs are not rendered by default.

32,728 changes: 32,728 additions & 0 deletions data/OrbitalRing0.8.8_FractionateEverything2.2.0.json

Large diffs are not rendered by default.

380 changes: 220 additions & 160 deletions data/Vanilla.json

Large diffs are not rendered by default.

1,170 changes: 1,170 additions & 0 deletions icon/OrbitalRing.json

Large diffs are not rendered by default.

Binary file added icon/OrbitalRing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/三元弹药箱.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/三元精金_新.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/三氯化铁.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/丙烯_新.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/丙烯循环.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/中继信号干扰.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/二氧化硫还原.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/二氧化碳.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/人造恒星MK2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/偏二甲肼燃料棒.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/先进机械组件.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/先进机械组件_新.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/光学主机.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/光学信息传输纤维.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/光学基板.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/光学芯片.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/创世之书.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/剧毒有机液体.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/加农炮MK2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/反物质发电机_新.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/反物质导弹组.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/反物质湮灭单元.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/反物质炮弹.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/反物质约束单元_新.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icon/OrbitalRing/反物质能量炉.png
Binary file added icon/OrbitalRing/回收塔.png
Binary file added icon/OrbitalRing/基础机械组件.png
Binary file added icon/OrbitalRing/塑料基板.png
Binary file added icon/OrbitalRing/大型强子对撞机.png
Binary file added icon/OrbitalRing/尖端机械组件.png
Binary file added icon/OrbitalRing/尖端机械组件_新.png
Binary file added icon/OrbitalRing/微型核弹组.png
Binary file added icon/OrbitalRing/恶意代码攻击.png
Binary file added icon/OrbitalRing/放射晶体矿_新.png
Binary file added icon/OrbitalRing/日志01.png
Binary file added icon/OrbitalRing/日志02.png
Binary file added icon/OrbitalRing/日志03.png
Binary file added icon/OrbitalRing/日志04.png
Binary file added icon/OrbitalRing/日志05.png
Binary file added icon/OrbitalRing/日志06.png
Binary file added icon/OrbitalRing/日志07.png
Binary file added icon/OrbitalRing/日志08.png
Binary file added icon/OrbitalRing/日志09.png
Binary file added icon/OrbitalRing/日志10.png
Binary file added icon/OrbitalRing/日志11.png
Binary file added icon/OrbitalRing/星球飞升-光伏发电.png
Binary file added icon/OrbitalRing/星球飞升-吞食帝国.png
Binary file added icon/OrbitalRing/星球飞升-天穹巨构.png
Binary file added icon/OrbitalRing/星球飞升-火力发电.png
Binary file added icon/OrbitalRing/星球飞升-科学枢纽.png
Binary file added icon/OrbitalRing/星球飞升-聚变驱动.png
Binary file added icon/OrbitalRing/星球飞升-风力发电.png
Binary file added icon/OrbitalRing/有机晶体重组.png
Binary file added icon/OrbitalRing/机枪塔MK2.png
Binary file added icon/OrbitalRing/机枪塔MK3.png
Binary file added icon/OrbitalRing/机械组件MK5.png
Binary file added icon/OrbitalRing/核子爆破单元.png
Binary file added icon/OrbitalRing/氚.png
Binary file added icon/OrbitalRing/氢氧化钠.png
Binary file added icon/OrbitalRing/氢氯酸_新新.png
Binary file added icon/OrbitalRing/氦_新.png
Binary file added icon/OrbitalRing/氦三_新.png
Binary file added icon/OrbitalRing/氦三燃料棒.png
Binary file added icon/OrbitalRing/氧气.png
Binary file added icon/OrbitalRing/氨.png
Binary file added icon/OrbitalRing/氮气_新.png
Binary file added icon/OrbitalRing/氯化钠_新.png
Binary file added icon/OrbitalRing/氯苯.png
Binary file added icon/OrbitalRing/氯苯循环.png
Binary file added icon/OrbitalRing/沙土回收_新.png
Binary file added icon/OrbitalRing/洲际导弹组.png
Binary file added icon/OrbitalRing/混凝土.png
Binary file added icon/OrbitalRing/湮灭弹药箱.png
Binary file added icon/OrbitalRing/火箭燃料棒.png
Binary file added icon/OrbitalRing/焦油循环.png
Binary file added icon/OrbitalRing/煤焦油.png
Binary file added icon/OrbitalRing/煤矿粉.png
Binary file added icon/OrbitalRing/物流运输机升级.png
Binary file added icon/OrbitalRing/特征向量模拟.png
Binary file added icon/OrbitalRing/环氧树脂_新.png
Binary file added icon/OrbitalRing/生宇宙矩阵.png
Binary file added icon/OrbitalRing/生宇宙矩阵_新.png
Binary file added icon/OrbitalRing/电解水_新.png
Binary file added icon/OrbitalRing/盐水.png
Binary file added icon/OrbitalRing/相位元件.png
Binary file added icon/OrbitalRing/石粉.png
Binary file added icon/OrbitalRing/矿物处理厂.png
Binary file added icon/OrbitalRing/硅矿粉.png
Binary file added icon/OrbitalRing/硝基柴油.png
Binary file added icon/OrbitalRing/硝基柴油燃料棒.png
Binary file added icon/OrbitalRing/硝酸.png
Binary file added icon/OrbitalRing/硫化氢.png
Binary file added icon/OrbitalRing/硫矿.png
Binary file added icon/OrbitalRing/硫矿粉.png
Binary file added icon/OrbitalRing/硫酸.png
Binary file added icon/OrbitalRing/神经元重编程.png
Binary file added icon/OrbitalRing/离心角标.png
Binary file added icon/OrbitalRing/稳定矩阵.png
Binary file added icon/OrbitalRing/空燃料棒.png
Binary file added icon/OrbitalRing/等离子脉冲炮.png
Binary file added icon/OrbitalRing/紫激光.png
Binary file added icon/OrbitalRing/聚合离子晶体.png
Binary file added icon/OrbitalRing/聚苯并咪唑.png
Binary file added icon/OrbitalRing/能量碎片制作.png
Binary file added icon/OrbitalRing/虚空之书.png
Binary file added icon/OrbitalRing/虚空矩阵.png
Binary file added icon/OrbitalRing/行星化工厂.png
Binary file added icon/OrbitalRing/行星熔炉.png
Binary file added icon/OrbitalRing/行星精密组装厂.png
Binary file added icon/OrbitalRing/行星组装站.png
Binary file added icon/OrbitalRing/行星采集器.png
Binary file added icon/OrbitalRing/裂变发电升级.png
Binary file added icon/OrbitalRing/起源之书.png
Binary file added icon/OrbitalRing/起源矩阵.png
Binary file added icon/OrbitalRing/超级机械组件.png
Binary file added icon/OrbitalRing/超级纳米电脑.png
Binary file added icon/OrbitalRing/量子储液罐.png
Binary file added icon/OrbitalRing/量子箱.png
Binary file added icon/OrbitalRing/金属氢单元.png
Binary file added icon/OrbitalRing/钚燃料棒.png
Binary file added icon/OrbitalRing/钚矿.png
Binary file added icon/OrbitalRing/钛矿粉.png
Binary file added icon/OrbitalRing/钢芯弹药箱.png
Binary file added icon/OrbitalRing/钨块.png
Binary file added icon/OrbitalRing/钨复合金属_修复.png
Binary file added icon/OrbitalRing/钨强化玻璃.png
Binary file added icon/OrbitalRing/钨矿.png
Binary file added icon/OrbitalRing/钨矿粉.png
Binary file added icon/OrbitalRing/钨芯弹药箱.png
Binary file added icon/OrbitalRing/铀235燃料棒.png
Binary file added icon/OrbitalRing/铀矿.png
Binary file added icon/OrbitalRing/铁矿粉.png
Binary file added icon/OrbitalRing/铜矿粉.png
Binary file added icon/OrbitalRing/铝合金.png
Binary file added icon/OrbitalRing/铝板.png
Binary file added icon/OrbitalRing/铝矿石.png
Binary file added icon/OrbitalRing/铝矿粉.png
Binary file added icon/OrbitalRing/高效反物质.png
Binary file added icon/OrbitalRing/高效处理器.png
Binary file added icon/OrbitalRing/高效钛晶石.png
Binary file added icon/OrbitalRing/高效黑塑料.png
Binary file added icon/OrbitalRing/高纯钚块.png
Binary file added icon/OrbitalRing/高纯铀块.png
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dsp_calculator",
"private": true,
"version": "0.5.4",
"version": "0.5.5",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
Binary file added public/icon/OrbitalRing.png
Binary file added public/icon/OrbitalRing.webp
97 changes: 38 additions & 59 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,67 +30,46 @@ function GameVersion({needs_list, set_needs_list}) {
set_needs_list({});
//判断modList是否合理
//巨构是深空的前置依赖
let MMSGUID = game_data_info_list[1].name_en + game_data_info_list[1].version;
let TCFVGUID = game_data_info_list[2].name_en + game_data_info_list[2].version;
let mms_old = mods.includes(MMSGUID);
let tcfv_old = mods.includes(TCFVGUID);
let mms_new = modList.includes(MMSGUID);
let tcfv_new = modList.includes(TCFVGUID);
if (!mms_old && !tcfv_old && !mms_new && tcfv_new) {
modList.push(MMSGUID);
let MSGUID = game_data_info_list[1].name_en + game_data_info_list[1].version;
let VDGUID = game_data_info_list[2].name_en + game_data_info_list[2].version;
let ms_old = mods.includes(MSGUID);
let vd_old = mods.includes(VDGUID);
let ms_new = modList.includes(MSGUID);
let vd_new = modList.includes(VDGUID);
if (!ms_old && !vd_old && !ms_new && vd_new) {
modList.push(MSGUID);
}
if (mms_old && tcfv_old && !mms_new && tcfv_new) {
modList = modList.filter((mod) => mod !== TCFVGUID);
if (ms_old && vd_old && !ms_new && vd_new) {
modList = modList.filter((mod) => mod !== VDGUID);
}
//创世和星环只能选择之一
let GBGUID = game_data_info_list[3].name_en + game_data_info_list[3].version;
let gb_old = mods.includes(GBGUID);
let gb_new = modList.includes(GBGUID);
let ORGUID = game_data_info_list[4].name_en + game_data_info_list[4].version;
let or_old = mods.includes(ORGUID);
let or_new = modList.includes(ORGUID);
if (!gb_old && gb_new) {
if (or_old) {
modList = modList.filter((mod) => mod !== ORGUID);
}
}
if (!or_old && or_new) {
if (gb_old) {
modList = modList.filter((mod) => mod !== GBGUID);
}
}
//深空和星环只能选择之一(星环目前不兼容深空)
if (!vd_old && vd_new) {
if (or_old) {
modList = modList.filter((mod) => mod !== ORGUID);
}
}
if (!or_old && or_new) {
if (vd_old) {
modList = modList.filter((mod) => mod !== VDGUID);
}
}
// //创世和分馏只能各自选择一个,并且只能同时选择旧版或者同时选择新版
// let GBGUID1 = game_data_info_list[3].name_en + game_data_info_list[3].version;
// let GBGUID2 = game_data_info_list[4].name_en + game_data_info_list[4].version;
// let gb1_old = mods.includes(GBGUID1);
// let gb2_old = mods.includes(GBGUID2);
// let gb1_new = modList.includes(GBGUID1);
// let gb2_new = modList.includes(GBGUID2);
// let FEGUID1 = game_data_info_list[5].name_en + game_data_info_list[5].version;
// let FEGUID2 = game_data_info_list[6].name_en + game_data_info_list[6].version;
// let fe1_old = mods.includes(FEGUID1);
// let fe2_old = mods.includes(FEGUID2);
// let fe1_new = modList.includes(FEGUID1);
// let fe2_new = modList.includes(FEGUID2);
// if (!gb1_old && gb1_new) {
// if (gb2_old) {
// modList = modList.filter((mod) => mod !== GBGUID2);
// }
// if (fe2_old) {
// modList = modList.filter((mod) => mod !== FEGUID2);
// modList.push(FEGUID1);
// }
// }
// if (!gb2_old && gb2_new) {
// if (gb1_old) {
// modList = modList.filter((mod) => mod !== GBGUID1);
// }
// if (fe1_old) {
// modList = modList.filter((mod) => mod !== FEGUID1);
// modList.push(FEGUID2);
// }
// }
// if (!fe1_old && fe1_new) {
// if (fe2_old) {
// modList = modList.filter((mod) => mod !== FEGUID2);
// }
// if (gb2_old) {
// modList = modList.filter((mod) => mod !== GBGUID2);
// modList.push(GBGUID1);
// }
// }
// if (!fe2_old && fe2_new) {
// if (fe1_old) {
// modList = modList.filter((mod) => mod !== FEGUID1);
// }
// if (gb1_old) {
// modList = modList.filter((mod) => mod !== GBGUID1);
// modList.push(GBGUID2);
// }
// }

//按照规定的顺序排序mods
let modList2 = [];
Expand Down
15 changes: 13 additions & 2 deletions src/GameData.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ export const game_data_info_list = [
"name_cn": "创世之书",
"version": "3.1.0",
},
{
"name_en": "OrbitalRing",
"name_cn": "星环",
"version": "0.8.8",
},
{
"name_en": "FractionateEverything",
"name_cn": "万物分馏",
Expand Down Expand Up @@ -102,6 +107,7 @@ export function get_game_data(mod_guid_list) {
data.MoreMegaStructureEnable = false;
data.TheyComeFromVoidEnable = false;
data.GenesisBookEnable = false;
data.OrbitalRingEnable = false;
data.FractionateEverythingEnable = false;
//mod_name_list存储mod英文名,用于在指定文件夹寻找图标
let mod_name_list = []
Expand All @@ -121,8 +127,13 @@ export function get_game_data(mod_guid_list) {
data.GenesisBookEnable = true;
mod_name_list.push("GenesisBook");
}
if (mod_guid_list.includes("FractionateEverything" + game_data_info_list[4].version)) {
json_file_name += "_" + "FractionateEverything" + game_data_info_list[4].version;
if (mod_guid_list.includes("OrbitalRing" + game_data_info_list[4].version)) {
json_file_name += "_" + "OrbitalRing" + game_data_info_list[4].version;
data.OrbitalRingEnable = true;
mod_name_list.push("OrbitalRing");
}
if (mod_guid_list.includes("FractionateEverything" + game_data_info_list[5].version)) {
json_file_name += "_" + "FractionateEverything" + game_data_info_list[5].version;
data.FractionateEverythingEnable = true;
mod_name_list.push("FractionateEverything");
}
Expand Down