Skip to content

Commit 2968060

Browse files
AwbuglAwbugl
committed
Update 2.5.4
1 parent 8dad67e commit 2968060

File tree

11 files changed

+149
-66
lines changed

11 files changed

+149
-66
lines changed

‎CHANGELOG.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
- v2.5.4
2+
+ 调整部分文案
3+
+ 调整`矿物处理厂`的制造需求
4+
+ 调整`矿物处理厂`、`人造恒星`、`裂变能源发电站`的制造时间
5+
+ 调整`氦闪约束器`、`尖端机械组件`的图标
6+
+ 添加`行星协调中心`科技
7+
8+
+ Adjust some text
9+
+ Adjust the requirements of `Mineral Processing Plant`
10+
+ Adjust the manufacturing time of `Mineral processor`, `Artificial Star`, `Fusion Power Station`
11+
+ Adjust the icon of `Helium Flash Confiner`, `Advanced Mechanical Component`
12+
+ Add `Coordination Center` technology
13+
14+
<details>
15+
<summary>点击展开日志 | Click to view all </summary>
16+
117
- v2.5.3
218
+ 调整部分文案
319
+ 修复部分流体在储液罐中渲染不正确的问题
@@ -8,8 +24,6 @@
824
+ Add bonus items for some technologies (High Precision Processing Technology, Interstellar Logistics
925
Technology, Artificial Star, Dyson Sphere Project series, Mega Building series, Ultimate Goal series)
1026

11-
<details>
12-
<summary>点击展开日志 | Click to view all </summary>
1327

1428
- v2.5.2
1529
+ 调整 `LDBTool` mod 缓存文件的生成逻辑，大幅提高mod加载速度（约减少50% MOD加载时间）

‎dependencies/items.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6926,7 +6926,7 @@
69266926
"ID": 6263,
69276927
"Name": "氦闪约束器",
69286928
"Description": "I氦闪约束器",
6929-
"IconPath": "Assets/texpack/氦闪抑制器",
6929+
"IconPath": "Assets/texpack/金属氢单元",
69306930
"GridIndex": 1504,
69316931
"StackSize": 100,
69326932
"Type": 2,
@@ -7534,7 +7534,7 @@
75347534
"ID": 6503,
75357535
"Name": "尖端机械组件",
75367536
"Description": "I尖端机械组件",
7537-
"IconPath": "Assets/texpack/尖端机械组件",
7537+
"IconPath": "Assets/texpack/cmingsoon/机械组件mk4",
75387538
"GridIndex": 1403,
75397539
"StackSize": 100,
75407540
"Type": 2,

‎dependencies/recipes.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@
11221122
"IconPath": "",
11231123
"Type": 10,
11241124
"GridIndex": 2111,
1125-
"Time": 18000,
1125+
"Time": 1800,
11261126
"Input": [
11271127
6503,
11281128
7707,
@@ -2986,7 +2986,7 @@
29862986
"IconPath": "",
29872987
"Type": 10,
29882988
"GridIndex": 2109,
2989-
"Time": 1800,
2989+
"Time": 600,
29902990
"Input": [
29912991
6502,
29922992
1107,
@@ -3043,7 +3043,7 @@
30433043
"ID": 115,
30443044
"Name": "氦闪约束器",
30453045
"Description": "",
3046-
"IconPath": "Assets/texpack/氦闪抑制器",
3046+
"IconPath": "Assets/texpack/金属氢单元",
30473047
"Type": 10,
30483048
"GridIndex": 1604,
30493049
"Time": 900,
@@ -4785,7 +4785,7 @@
47854785
"ID": 643,
47864786
"Name": "尖端机械组件",
47874787
"Description": "",
4788-
"IconPath": "Assets/texpack/尖端机械组件",
4788+
"IconPath": "Assets/texpack/cmingsoon/机械组件mk4",
47894789
"Type": 10,
47904790
"GridIndex": 1403,
47914791
"Time": 360,
@@ -5750,13 +5750,13 @@
57505750
"IconPath": "Assets/texpack/矿物处理厂",
57515751
"Type": 4,
57525752
"GridIndex": 2407,
5753-
"Time": 600,
5753+
"Time": 180,
57545754
"Input": [
5755-
6502,
5756-
1107
5755+
6501,
5756+
1103
57575757
],
57585758
"InCounts": [
5759-
4,
5759+
3,
57605760
6
57615761
],
57625762
"Output": [

‎dependencies/strings.json‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,14 @@
2525
"ENUS": "OK"
2626
},
2727
{
28-
"Name": "跳转",
28+
"Name": "跳转交流群",
2929
"ZHCN": "加入交流群",
30-
"ENUS": "Join Discord Server"
30+
"ENUS": "Join Discord"
31+
},
32+
{
33+
"Name": "跳转日志",
34+
"ZHCN": "更新日志",
35+
"ENUS": "Update Log"
3136
},
3237
{
3338
"Name": "创世之书链接",
@@ -437,7 +442,7 @@
437442
{
438443
"Name": "I剧毒有机液体",
439444
"ZHCN": "在火山灰星球表面的由多种化合物组成的剧毒液体.\n<color=\"#7AF0FFC8\">——来自创世之书.</color>",
440-
"ENUS": "Highly toxic liquid consisting of many compounds.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
445+
"ENUS": "Toxic liquid consisting of many compounds.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
441446
},
442447
{
443448
"Name": "聚乙烯",
@@ -1043,7 +1048,7 @@
10431048
"Name": "I湮灭约束球",
10441049
"ZHCN": "将湮灭反应约束在球内，从而获得稳定可控的能量输出，是反物质能量炉的关键部件。",
10451050
"ENUS": "It is a crucial component of antimatter energy reactor to confine the annihilation reaction within the sphere to obtain stable and controllable energy output."
1046-
},
1051+
},
10471052
{
10481053
"Name": "基础机械组件",
10491054
"ZHCN": "基础机械组件",
@@ -1917,7 +1922,7 @@
19171922
{
19181923
"Name": "R有机液体离心",
19191924
"ZHCN": "将采集到的剧毒液体进行离心、分离和精炼, 可以得到数种有用的化合物.\n<color=\"#7AF0FFC8\">——来自创世之书.</color>",
1920-
"ENUS": "Centrifugation of highly toxic organic liquids can yield several useful compounds.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
1925+
"ENUS": "Centrifugation of toxic liquid can yield several useful compounds.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
19211926
},
19221927
{
19231928
"Name": "硅晶圆（高效）",
@@ -2018,7 +2023,7 @@
20182023
"Name": "R氨氧化",
20192024
"ZHCN": "氨气与氧气进行反应, 经过一系列反应合成硝酸.\n<color=\"#7AF0FFC8\">——来自创世之书.</color>",
20202025
"ENUS": "Ammonia reacts with oxygen to produce nitric acid.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
2021-
},
2026+
},
20222027
{
20232028
"Name": "R硫酸",
20242029
"ZHCN": "使用离子交换膜电解硫酸钠溶液, 产生硫酸.\n<color=\"#7AF0FFC8\">——来自创世之书.</color>",
@@ -2659,6 +2664,21 @@
26592664
"ZHCN": "掌控质能.",
26602665
"ENUS": "You unlocked Antimatter Energy Reactor. Mass-energy is in your control now."
26612666
},
2667+
{
2668+
"Name": "T行星协调中心",
2669+
"ZHCN": "行星协调中心",
2670+
"ENUS": "Coordination Center"
2671+
},
2672+
{
2673+
"Name": "T行星协调中心描述",
2674+
"ZHCN": "随着星球生产线的不断扩大和算力的发展，部署一个协调中心可以更精确地控制星球工厂.",
2675+
"ENUS": "As the production lines on the planet are constantly expanding and the computing power is developing, deploying a coordination center can more accurately control the planet's factories."
2676+
},
2677+
{
2678+
"Name": "行星协调中心文字描述",
2679+
"ZHCN": "打开行星视图可以对本星球的协调中心进行调整",
2680+
"ENUS": "Can open the planet view to adjust the coordination center"
2681+
},
26622682
{
26632683
"Name": "T物品仓储描述",
26642684
"ZHCN": "小型储物仓可以搭建在四向分流器上，而大型储物仓具有更大的储量。",
@@ -2797,7 +2817,7 @@
27972817
{
27982818
"Name": "I硫酸",
27992819
"ZHCN": "初级化工产品，在生产中应用广泛。也可以通过分解火山灰星球的剧毒液体来获得。",
2800-
"ENUS": "Primary chemical product with a wide range of applications in production. It can also be obtained by decomposing the highly toxic liquid of the volcanic ash planet.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
2820+
"ENUS": "Primary chemical product with a wide range of applications in production. It can also be obtained by decomposing the toxic liquid of the volcanic ash planet.\n<color=\"#7AF0FFC8\">——Add by GenesisBook.</color>"
28012821
},
28022822
{
28032823
"Name": "I有机晶体",
@@ -2819,10 +2839,15 @@
28192839
"ZHCN": "用于直接抽取液体资源的设施，可以从宇宙中的各种海洋中采集化工原料。解锁海洋排污科技后，可以用于排放工业废弃物。",
28202840
"ENUS": "Facility used to collect liquid resources from an ocean. After unlocking the ocean outfall technology, it can be used to discharge industrial waste."
28212841
},
2842+
{
2843+
"Name": "原油精炼厂",
2844+
"ZHCN": "精炼厂",
2845+
"ENUS": "Refinery"
2846+
},
28222847
{
28232848
"Name": "I原油精炼厂",
2824-
"ZHCN": "将萃取到的原油进行精炼，可以获得多种化工原料。",
2825-
"ENUS": "The extracted crude oil is further refined to obtain a wide range of chemical materials."
2849+
"ZHCN": "将原油或剧毒液体进行精炼，可以获得多种化工原料。",
2850+
"ENUS": "Refine crude oil or toxic liquid to obtain a variety of chemical raw materials."
28262851
},
28272852
{
28282853
"Name": "I钨矿",
@@ -3016,18 +3041,18 @@
30163041
},
30173042
{
30183043
"Name": "T大气排放描述",
3019-
"ZHCN": "重构部分配方的生产流程，将不需要的产物加热或粉碎，排放到大气中。可以肯定这将会在未来对环境造成负面影响.\n<color=\"#FD965ECC\">受影响配方：焦油分馏、原油裂化、剧毒液体离心、金属盐分解</color>",
3020-
"ENUS": "Reconstruct production equipment to heat or crush unnecessary products and discharge them into the atmosphere. It can be said that this will have a negative impact on the environment in the future.\n<color=\"#FD965ECC\">Affected recipes: Tar fractionation, Oil Cracking, Toxic liquid centrifugation, Decomposition of metal salts</color>"
3044+
"ZHCN": "重构部分配方的生产流程，将堆积产物加热或粉碎，排放到大气中。可以肯定这将会在未来对环境造成负面影响.\n<color=\"#FD965ECC\">受影响配方：焦油分馏、原油裂化、剧毒液体离心、金属盐分解</color>",
3045+
"ENUS": "Reconstruct production equipment to heat or crush accumulated products and discharge them into the atmosphere. It can be said that this will have a negative impact on the environment in the future.\n<color=\"#FD965ECC\">Affected recipes: Tar fractionation, Oil Cracking, Toxic liquid centrifugation, Decomposition of metal salts</color>"
30213046
},
30223047
{
30233048
"Name": "T大气排放结果",
3024-
"ZHCN": "重构生产设备，将部分产物排放到大气中。",
3025-
"ENUS": "Reconstruct production equipment to discharge part of the products into the atmosphere."
3049+
"ZHCN": "重构部分配方的生产流程，将堆积产物排放到大气中。受影响配方：焦油分馏、原油裂化、剧毒液体离心、金属盐分解",
3050+
"ENUS": "Reconstruct production equipment to discharge accumulated products into the atmosphere."
30263051
},
30273052
{
30283053
"Name": "大气排污文字描述",
3029-
"ZHCN": "允许设备将堆积产物直接排放到大气中（低资源倍率模式请谨慎解锁此科技）",
3030-
"ENUS": "Reconstruct production equipment to discharge part of the products into the atmosphere."
3054+
"ZHCN": "允许部分配方将堆积产物直接排放到大气中（低资源倍率模式请谨慎解锁此科技）",
3055+
"ENUS": "Allow some recipes to discharge accumulated products directly into the atmosphere (low resource multiplier mode, please unlock this technology carefully)"
30313056
},
30323057
{
30333058
"Name": "开发者日志01",

‎dependencies/techs.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2924,6 +2924,7 @@
29242924
29.0
29252925
],
29262926
"PreTechs": [
2927+
1836,
29272928
1801
29282929
],
29292930
"PreTechsImplicit": [],
@@ -10085,5 +10086,43 @@
1008510086
"AddItemCounts": [],
1008610087
"PropertyOverrideItems": [],
1008710088
"PropertyItemCounts": []
10089+
},
10090+
{
10091+
"ID": 1836,
10092+
"Name": "T行星协调中心",
10093+
"IconPath": "Icons/Tech/2902",
10094+
"Desc": "T行星协调中心描述",
10095+
"Conclusion": "T行星协调中心描述",
10096+
"Position": [
10097+
13.0,
10098+
29.0
10099+
],
10100+
"PreTechs": [
10101+
1415
10102+
],
10103+
"PreTechsImplicit": [],
10104+
"Items": [
10105+
6001,
10106+
6002
10107+
],
10108+
"ItemPoints": [
10109+
20,
10110+
10
10111+
],
10112+
"HashNeeded": 72000,
10113+
"UnlockRecipes": [],
10114+
"UnlockFunctions": [],
10115+
"UnlockValues": [],
10116+
"Published": true,
10117+
"Level": 0,
10118+
"MaxLevel": 0,
10119+
"LevelCoef1": 0,
10120+
"LevelCoef2": 0,
10121+
"IsLabTech": true,
10122+
"PreTechsMax": false,
10123+
"AddItems": [],
10124+
"AddItemCounts": [],
10125+
"PropertyOverrideItems": [],
10126+
"PropertyItemCounts": []
1008810127
}
1008910128
]

‎src/Compatibility/IncompatibleCheckPlugin.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@ public static void OnMainMenuOpen()
5353

5454
sb.AppendLine("GenesisBookLoadMessage".TranslateFromJson());
5555

56-
UIMessageBox.Show("GenesisBookLoadTitle".TranslateFromJson(), sb.ToString(), "跳转".TranslateFromJson(), "确定".TranslateFromJson(),
57-
UIMessageBox.INFO, OpenBrowser, null);
56+
UIMessageBox.Show("GenesisBookLoadTitle".TranslateFromJson(), sb.ToString(), "确定".TranslateFromJson(), "跳转交流群".TranslateFromJson(),
57+
"跳转日志".TranslateFromJson(), UIMessageBox.INFO, null, OpenBrowser, OpenLog);
5858

5959
_shown = true;
6060
}
6161

6262
public static void OpenBrowser() => Application.OpenURL("创世之书链接".TranslateFromJson());
63+
64+
public static void OpenLog() => Application.OpenURL(System.IO.Path.Combine(ProjectGenesis.ModPath, "CHANGELOG.md"));
6365
}
6466
}

‎src/Patches/UI/DisplayTextPatches/DisplayTextPatches.cs‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,9 @@ public static void ItemProto_fuelTypeString(ref ItemProto __instance, ref string
6464
break;
6565
}
6666
}
67-
68-
[HarmonyPostfix]
69-
[HarmonyPatch(typeof(ItemProto), "GetPropValue")]
70-
public static void ItemProto_GetPropValue(
71-
ref ItemProto __instance,
72-
ref string __result,
73-
int index)
74-
{
75-
if (GameMain.history.TechUnlocked(ProtoIDUsedByPatches.T化工技术革新) && __instance.Type == EItemType.Production)
76-
{
77-
var instanceRecipeType = __instance.prefabDesc.assemblerRecipeType;
78-
if ((instanceRecipeType == (ERecipeType)Utils.ERecipeType.Chemical ||
79-
instanceRecipeType == (ERecipeType)Utils.ERecipeType.Refine ||
80-
instanceRecipeType == (ERecipeType)Utils.ERecipeType.高分子化工) &&
81-
index == 22)
82-
__result = "4x";
83-
}
84-
}
8567

86-
87-
//发电类型
88-
[HarmonyPostfix]
8968
[HarmonyPatch(typeof(ItemProto), "GetPropValue")]
69+
[HarmonyPostfix]
9070
public static void GetPropValuePatch(ref ItemProto __instance, int index, ref string __result)
9171
{
9272
if ((ulong)index >= (ulong)__instance.DescFields.Length)
@@ -122,6 +102,19 @@ public static void GetPropValuePatch(ref ItemProto __instance, int index, ref st
122102
if (__instance.prefabDesc.isCollectStation && __instance.ID == ProtoIDUsedByPatches.I大气采集器) __result = "行星大气".TranslateFromJson();
123103

124104
return;
105+
106+
case 22:
107+
if (GameMain.history.TechUnlocked(ProtoIDUsedByPatches.T化工技术革新) && __instance.prefabDesc.isAssembler)
108+
switch (__instance.prefabDesc.modelIndex)
109+
{
110+
case ProtoIDUsedByPatches.M化工厂:
111+
case ProtoIDUsedByPatches.M精炼厂:
112+
case ProtoIDUsedByPatches.M先进化工厂:
113+
__result = "4x";
114+
return;
115+
}
116+
117+
return;
125118
}
126119
}
127120

@@ -131,14 +124,14 @@ public static void TechProto_UnlockFunctionText(ref TechProto __instance, ref st
131124
{
132125
switch (__instance.ID)
133126
{
134-
case ProtoIDUsedByPatches.T海洋排污1:
135-
__result = "海洋排污文字描述".TranslateFromJson();
136-
break;
137-
138127
case ProtoIDUsedByPatches.T化工技术革新:
139128
__result = "化工技术革新文字描述".TranslateFromJson();
140129
break;
141130

131+
case ProtoIDUsedByPatches.T海洋排污1:
132+
__result = "海洋排污文字描述".TranslateFromJson();
133+
break;
134+
142135
case ProtoIDUsedByPatches.T海洋排污2:
143136
__result = "海洋排污2文字描述".TranslateFromJson();
144137
break;
@@ -150,6 +143,10 @@ public static void TechProto_UnlockFunctionText(ref TechProto __instance, ref st
150143
case ProtoIDUsedByPatches.T巨型建筑工程学:
151144
__result = "巨型建筑工程学文字描述".TranslateFromJson();
152145
break;
146+
147+
case ProtoIDUsedByPatches.T行星协调中心:
148+
__result = "行星协调中心文字描述".TranslateFromJson();
149+
break;
153150
}
154151
}
155152
}

‎src/Patches/UI/UIPlanetFocus/UIPlanetDetailExpand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void OnPlanetDataSet_Postfix(UIPlanetDetail __instance)
3030
return;
3131
}
3232

33-
var notgas = __instance.planet.type != EPlanetType.Gas;
33+
var notgas = __instance.planet.type != EPlanetType.Gas && GameMain.history.TechUnlocked(ProtoIDUsedByPatches.T行星协调中心);
3434

3535
_planetFocusBtn.gameObject.SetActive(notgas);
3636

0 commit comments

Comments
 (0)