Skip to content

Commit 8ca890b

Browse files
committed
Updated For Science!
* Fixed issue where node attach was not reliably working in the VAB for the parts in this pack.Parts should now reliably stack with top and bottom attach nodes ass appropriate. There are no surface attach nodes at this time, but those may be added at a later date to support having attached radiators. * Fixed issue where drag was not being applied to parts in this pack. Drag should not be correctly applied to all parts. * Added all parts to the Nuclear Power tech tree node * Added dependency on Patch Manager mod (needed to add parts to the tech tree)
1 parent 5e95a4e commit 8ca890b

89 files changed

Lines changed: 1889 additions & 3657 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

TNO/addressables/catalog.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

TNO/addressables/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"m_buildTarget":"StandaloneWindows64","m_SettingsHash":"e54cce38a51d937df419b2b80b0472ac","m_CatalogLocations":[{"m_Keys":["AddressablesMainContentCatalog"],"m_InternalId":"{UnityEngine.AddressableAssets.Addressables.RuntimePath}/catalog.json","m_Provider":"UnityEngine.AddressableAssets.ResourceProviders.ContentCatalogProvider","m_Dependencies":[],"m_ResourceType":{"m_AssemblyName":"Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.AddressableAssets.ResourceLocators.ContentCatalogData"},"SerializedData":[]}],"m_ProfileEvents":false,"m_LogResourceManagerExceptions":true,"m_ExtraInitializationData":[],"m_DisableCatalogUpdateOnStart":false,"m_IsLocalCatalogInBundle":false,"m_CertificateHandlerType":{"m_AssemblyName":"","m_ClassName":""},"m_AddressablesVersion":"1.21.12","m_maxConcurrentWebRequests":500,"m_CatalogRequestsTimeout":0}
1+
{"m_buildTarget":"StandaloneWindows64","m_SettingsHash":"d2df3da12f1f17de1a0a0f2b8d0cb38d","m_CatalogLocations":[{"m_Keys":["AddressablesMainContentCatalog"],"m_InternalId":"{UnityEngine.AddressableAssets.Addressables.RuntimePath}/catalog.json","m_Provider":"UnityEngine.AddressableAssets.ResourceProviders.ContentCatalogProvider","m_Dependencies":[],"m_ResourceType":{"m_AssemblyName":"Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null","m_ClassName":"UnityEngine.AddressableAssets.ResourceLocators.ContentCatalogData"},"SerializedData":[7,76,85,110,105,116,121,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,114,44,32,86,101,114,115,105,111,110,61,48,46,48,46,48,46,48,44,32,67,117,108,116,117,114,101,61,110,101,117,116,114,97,108,44,32,80,117,98,108,105,99,75,101,121,84,111,107,101,110,61,110,117,108,108,75,85,110,105,116,121,69,110,103,105,110,101,46,82,101,115,111,117,114,99,101,77,97,110,97,103,101,109,101,110,116,46,82,101,115,111,117,114,99,101,80,114,111,118,105,100,101,114,115,46,80,114,111,118,105,100,101,114,76,111,97,100,82,101,113,117,101,115,116,79,112,116,105,111,110,115,50,0,0,0,123,0,34,0,109,0,95,0,73,0,103,0,110,0,111,0,114,0,101,0,70,0,97,0,105,0,108,0,117,0,114,0,101,0,115,0,34,0,58,0,116,0,114,0,117,0,101,0,125,0]}],"m_ProfileEvents":false,"m_LogResourceManagerExceptions":true,"m_ExtraInitializationData":[],"m_DisableCatalogUpdateOnStart":false,"m_IsLocalCatalogInBundle":false,"m_CertificateHandlerType":{"m_AssemblyName":"","m_ClassName":""},"m_AddressablesVersion":"1.21.18","m_maxConcurrentWebRequests":3,"m_CatalogRequestsTimeout":0}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
:science #tNode_3v_electronics_02 {
2+
UnlockedPartsIDs +: [ "tno_fps60","tno_fps60_open","tno_fps400","tno_fps400_open","tno_fps1000","tno_fps2000","tno_fps2000_open" ];
3+
UnlockedPartsIDs -: [ "" ];
4+
}

TNO/swinfo.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
11
{
2-
"spec": "1.3",
2+
"spec": "2.0",
33
"mod_id": "com.github.schlosrat.TNO",
4-
"author": "schlosrat",
54
"name": "The Nuclear Option (TNO)",
5+
"author": "schlosrat",
66
"description": "When solar power, batteris, and fuel cells just can't cut it, you need TNO!",
77
"source": "https://github.com/schlosrat/TNO",
8-
"version": "0.3.0",
8+
"version": "0.3.1",
99
"version_check": "https://raw.githubusercontent.com/schlosrat/TNO/main/TNO/swinfo.json",
1010
"ksp2_version": {
11-
"min": "0.1.5",
11+
"min": "0.2.0",
1212
"max": "*"
1313
},
1414
"dependencies": [
1515
{
1616
"id": "com.github.x606.spacewarp",
1717
"version": {
18-
"min": "1.5.2",
18+
"min": "1.8.0",
19+
"max": "*"
20+
}
21+
},
22+
{
23+
"id": "PatchManager",
24+
"version": {
25+
"min": "0.9.1",
1926
"max": "*"
2027
}
2128
}
22-
]
29+
],
30+
"conflicts": []
2331
}

src/TNO/Assets/AddressableAssetsData.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/TNO/Assets/AddressableAssetsData/AddressableAssetSettings.asset

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,44 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
12+
m_Script: {fileID: 0}
1313
m_Name: AddressableAssetSettings
14-
m_EditorClassIdentifier:
15-
m_DefaultGroup: 4d25fb371f16b1344b10af00a260cd2a
14+
m_EditorClassIdentifier: Unity.Addressables.Editor:UnityEditor.AddressableAssets.Settings:AddressableAssetSettings
15+
m_DefaultGroup: 128822e4107c7224b91eab7758a6051a
16+
m_currentHash:
17+
serializedVersion: 2
18+
Hash: d2df3da12f1f17de1a0a0f2b8d0cb38d
1619
m_OptimizeCatalogSize: 0
1720
m_BuildRemoteCatalog: 0
1821
m_BundleLocalCatalog: 0
1922
m_CatalogRequestsTimeout: 0
2023
m_DisableCatalogUpdateOnStart: 0
2124
m_IgnoreUnsupportedFilesInBuild: 0
2225
m_UniqueBundleIds: 0
23-
m_NonRecursiveBuilding: 0
24-
m_maxConcurrentWebRequests: 500
25-
m_ContiguousBundles: 0
26+
m_NonRecursiveBuilding: 1
27+
m_CCDEnabled: 0
28+
m_maxConcurrentWebRequests: 3
29+
m_ContiguousBundles: 1
2630
m_StripUnityVersionFromBundleBuild: 0
2731
m_DisableVisibleSubAssetRepresentations: 0
2832
m_ShaderBundleNaming: 0
2933
m_ShaderBundleCustomNaming:
3034
m_MonoScriptBundleNaming: 0
35+
m_CheckForContentUpdateRestrictionsOption: 0
3136
m_MonoScriptBundleCustomNaming:
3237
m_RemoteCatalogBuildPath:
3338
m_Id:
3439
m_RemoteCatalogLoadPath:
3540
m_Id:
41+
m_ContentStateBuildPathProfileVariableName:
42+
m_CustomContentStateBuildPath:
3643
m_ContentStateBuildPath:
37-
m_overridePlayerVersion:
44+
m_BuildAddressablesWithPlayerBuild: 0
45+
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
3846
m_GroupAssets:
39-
- {fileID: 11400000, guid: 4366f947645f36d40b50f0a410f36379, type: 2}
40-
- {fileID: 11400000, guid: 1f280c0cc7146974998e061bc9d5bf61, type: 2}
47+
- {fileID: 11400000, guid: 1844cfe9c25c7c645bd0ac19d974fba8, type: 2}
48+
- {fileID: 11400000, guid: e04f4135625ba1b498806729e3e479f1, type: 2}
49+
- {fileID: 11400000, guid: adfd199fa2200de44bf0105adf86473e, type: 2}
4150
m_BuildSettings:
4251
m_CompileScriptsInVirtualMode: 0
4352
m_CleanupStreamingAssetsAfterBuilds: 1
@@ -46,34 +55,34 @@ MonoBehaviour:
4655
m_ProfileSettings:
4756
m_Profiles:
4857
- m_InheritedParent:
49-
m_Id: a754a4f3bba944b4797c0317daed2f55
58+
m_Id: 75718edf5d83b0b43965f3a980fe02c5
5059
m_ProfileName: Default
5160
m_Values:
52-
- m_Id: 28578a44b882b9b4e8a786f0c71ff16d
61+
- m_Id: cf3ff147939809b4c94c372bf2efa8e9
5362
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
54-
- m_Id: 8b21750bcffa1b046b9a94d22eba39db
63+
- m_Id: a1ef9d76a8f9cfa49b39f351c9fe820b
5564
m_Value: Library/com.unity.addressables/aa/Windows/StandaloneWindows64
56-
- m_Id: f01b3b1a09134bb46903dd939c075b63
65+
- m_Id: 92379e34a05cb76488f274d7ca4894d8
5766
m_Value: '{SpaceWarpPaths.com_github_schlosrat_TNO}/addressables/StandaloneWindows64'
58-
- m_Id: 45091f9c39a7f4b4db419e5334d47640
67+
- m_Id: ac5fe0a847973d848addb44cf4cb3b24
5968
m_Value: ServerData/[BuildTarget]
60-
- m_Id: 0be91d4eec40ae345886f9d8680b1948
61-
m_Value: http://localhost/[BuildTarget]
69+
- m_Id: 8d88bf07359ccbb40b2ff640de87459f
70+
m_Value: http://[PrivateIpAddress]:[HostingServicePort]
6271
m_ProfileEntryNames:
63-
- m_Id: 28578a44b882b9b4e8a786f0c71ff16d
72+
- m_Id: cf3ff147939809b4c94c372bf2efa8e9
6473
m_Name: BuildTarget
6574
m_InlineUsage: 0
66-
- m_Id: 8b21750bcffa1b046b9a94d22eba39db
67-
m_Name: LocalBuildPath
75+
- m_Id: a1ef9d76a8f9cfa49b39f351c9fe820b
76+
m_Name: Local.BuildPath
6877
m_InlineUsage: 0
69-
- m_Id: f01b3b1a09134bb46903dd939c075b63
70-
m_Name: LocalLoadPath
78+
- m_Id: 92379e34a05cb76488f274d7ca4894d8
79+
m_Name: Local.LoadPath
7180
m_InlineUsage: 0
72-
- m_Id: 45091f9c39a7f4b4db419e5334d47640
73-
m_Name: RemoteBuildPath
81+
- m_Id: ac5fe0a847973d848addb44cf4cb3b24
82+
m_Name: Remote.BuildPath
7483
m_InlineUsage: 0
75-
- m_Id: 0be91d4eec40ae345886f9d8680b1948
76-
m_Name: RemoteLoadPath
84+
- m_Id: 8d88bf07359ccbb40b2ff640de87459f
85+
m_Name: Remote.LoadPath
7786
m_InlineUsage: 0
7887
m_ProfileVersion: 1
7988
m_LabelTable:
@@ -82,20 +91,21 @@ MonoBehaviour:
8291
- parts_data
8392
m_SchemaTemplates: []
8493
m_GroupTemplateObjects:
85-
- {fileID: 11400000, guid: 4dc11f20ffcc22a428879ff92c5d68e4, type: 2}
94+
- {fileID: 11400000, guid: 5bb4f2bacd7d38e45b80a83f2b41d1ae, type: 2}
8695
m_InitializationObjects: []
8796
m_CertificateHandlerType:
8897
m_AssemblyName:
8998
m_ClassName:
9099
m_ActivePlayerDataBuilderIndex: 3
91100
m_DataBuilders:
92-
- {fileID: 11400000, guid: 64f282d52d0d88941943d481e5eacd91, type: 2}
93-
- {fileID: 11400000, guid: 37cc82cf821c9344d87190bcd7fadd02, type: 2}
94-
- {fileID: 11400000, guid: 215b454318d92ac4ca68abd7a7467e10, type: 2}
95-
- {fileID: 11400000, guid: 6721813011d51c7409a7d05490704a19, type: 2}
96-
m_ActiveProfileId: a754a4f3bba944b4797c0317daed2f55
101+
- {fileID: 11400000, guid: e1c3d45919cbb1d4983fecc04d928b42, type: 2}
102+
- {fileID: 11400000, guid: 5be72b7633d4e6f4a8f1b127c4a0d7fe, type: 2}
103+
- {fileID: 11400000, guid: 9f6a3a600bc342b4ba2ebd3611b7bb0b, type: 2}
104+
- {fileID: 11400000, guid: d6b78854a9f46f245b280c2b960c870e, type: 2}
105+
m_ActiveProfileId: 75718edf5d83b0b43965f3a980fe02c5
97106
m_HostingServicesManager:
98107
m_HostingServiceInfos: []
99108
m_Settings: {fileID: 11400000}
100109
m_NextInstanceId: 0
101110
m_RegisteredServiceTypeRefs: []
111+
m_PingTimeoutInMilliseconds: 5000

src/TNO/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/TNO/Assets/AddressableAssetsData/AssetGroupTemplates.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/TNO/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-8672966623172796006
3+
--- !u!114 &-5385756337443809853
44
MonoBehaviour:
55
m_ObjectHideFlags: 1
66
m_CorrespondingSourceObject: {fileID: 0}
@@ -14,7 +14,7 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
m_Group: {fileID: 0}
1616
m_StaticContent: 0
17-
--- !u!114 &-4411568333562255082
17+
--- !u!114 &-4471928380801838977
1818
MonoBehaviour:
1919
m_ObjectHideFlags: 1
2020
m_CorrespondingSourceObject: {fileID: 0}
@@ -23,9 +23,9 @@ MonoBehaviour:
2323
m_GameObject: {fileID: 0}
2424
m_Enabled: 1
2525
m_EditorHideFlags: 0
26-
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
26+
m_Script: {fileID: 0}
2727
m_Name: BundledAssetGroupSchema
28-
m_EditorClassIdentifier:
28+
m_EditorClassIdentifier: Unity.Addressables.Editor:UnityEditor.AddressableAssets.Settings.GroupSchemas:BundledAssetGroupSchema
2929
m_Group: {fileID: 0}
3030
m_InternalBundleIdMode: 1
3131
m_Compression: 1
@@ -70,7 +70,7 @@ MonoBehaviour:
7070
m_Name: Packed Assets
7171
m_EditorClassIdentifier:
7272
m_SchemaObjects:
73-
- {fileID: -4411568333562255082}
74-
- {fileID: -8672966623172796006}
73+
- {fileID: -4471928380801838977}
74+
- {fileID: -5385756337443809853}
7575
m_Description: Pack assets into asset bundles.
76-
m_Settings: {fileID: 0}
76+
m_Settings: {fileID: 11400000, guid: e6f3fa4bc1bdaf64782cd9f7bba5c7d3, type: 2}

src/TNO/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)