diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel.csproj.dtbcache.json b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel.csproj.dtbcache.json new file mode 100644 index 0000000..0344a0f --- /dev/null +++ b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel.csproj.dtbcache.json @@ -0,0 +1 @@ +{"RootPath":"C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel","ProjectFileName":"WeatherDrivenSolarPanel.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"WeatherDrivenSolarPanel.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Games\\KSP\\1.12.5 English\\KSP_x64_Data\\Managed\\Assembly-CSharp-firstpass.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Games\\KSP\\1.12.5 English\\KSP_x64_Data\\Managed\\Assembly-CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Games\\KSP\\1.12.5 English\\GameData\\EnvironmentalVisualEnhancements\\Plugins\\Atmosphere.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Games\\KSP\\1.12.5 English\\GameData\\EnvironmentalVisualEnhancements\\Plugins\\EVEManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Games\\KSP\\1.12.5 English\\KSP_x64_Data\\Managed\\UnityEngine.CoreModule.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Games\\KSP\\1.12.5 English\\KSP_x64_Data\\Managed\\UnityEngine.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\Output\\Debug\\WeatherDrivenSolarPanel.dll","OutputItemRelativePath":"WeatherDrivenSolarPanel.dll"},{"OutputItemFullPath":"C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\Output\\Debug\\WeatherDrivenSolarPanel.pdb","OutputItemRelativePath":"WeatherDrivenSolarPanel.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/14955a99-5044-4221-b4de-f1029c737452.vsidx b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/14955a99-5044-4221-b4de-f1029c737452.vsidx new file mode 100644 index 0000000..d62c8f5 Binary files /dev/null and b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/14955a99-5044-4221-b4de-f1029c737452.vsidx differ diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/703e647b-11d2-4d60-b72e-cc722a81daae.vsidx b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/703e647b-11d2-4d60-b72e-cc722a81daae.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/703e647b-11d2-4d60-b72e-cc722a81daae.vsidx differ diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/8c614c43-e66c-476a-81c1-c1c385ecf488.vsidx b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/8c614c43-e66c-476a-81c1-c1c385ecf488.vsidx new file mode 100644 index 0000000..acef74c Binary files /dev/null and b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/8c614c43-e66c-476a-81c1-c1c385ecf488.vsidx differ diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/a98d607f-d865-47a7-b659-3ea720619db1.vsidx b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/a98d607f-d865-47a7-b659-3ea720619db1.vsidx new file mode 100644 index 0000000..7c66af6 Binary files /dev/null and b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/a98d607f-d865-47a7-b659-3ea720619db1.vsidx differ diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/b418b23b-fee4-454e-bf10-df9abed563b1.vsidx b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/b418b23b-fee4-454e-bf10-df9abed563b1.vsidx new file mode 100644 index 0000000..2145cbd Binary files /dev/null and b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/FileContentIndex/b418b23b-fee4-454e-bf10-df9abed563b1.vsidx differ diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/v17/.suo b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/v17/.suo new file mode 100644 index 0000000..0ca79b9 Binary files /dev/null and b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/v17/.suo differ diff --git a/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/v17/DocumentLayout.json b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/v17/DocumentLayout.json new file mode 100644 index 0000000..6d5e2d8 --- /dev/null +++ b/GameData/WeatherDrivenSolarPanel/.vs/WeatherDrivenSolarPanel/v17/DocumentLayout.json @@ -0,0 +1,74 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{8D27838D-25CE-4414-92D4-EA2ADA791063}|WeatherDrivenSolarPanel.csproj|c:\\aebestachfiles\\code\\c#\\weatherdrivensolarpanel\\weatherdrivensolarpanelstock.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{8D27838D-25CE-4414-92D4-EA2ADA791063}|WeatherDrivenSolarPanel.csproj|solutionrelative:weatherdrivensolarpanelstock.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{8D27838D-25CE-4414-92D4-EA2ADA791063}|WeatherDrivenSolarPanel.csproj|c:\\aebestachfiles\\code\\c#\\weatherdrivensolarpanel\\genericfunctionmodule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{8D27838D-25CE-4414-92D4-EA2ADA791063}|WeatherDrivenSolarPanel.csproj|solutionrelative:genericfunctionmodule.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 5, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}" + }, + { + "$type": "Bookmark", + "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "WeatherDrivenSolarPanelStock.cs", + "DocumentMoniker": "C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\WeatherDrivenSolarPanelStock.cs", + "RelativeDocumentMoniker": "WeatherDrivenSolarPanelStock.cs", + "ToolTip": "C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\WeatherDrivenSolarPanelStock.cs", + "RelativeToolTip": "WeatherDrivenSolarPanelStock.cs", + "ViewState": "AQIAADcAAAAAAAAAAAA8wEcAAAA6AAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-02-16T12:24:08.285Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "GenericFunctionModule.cs", + "DocumentMoniker": "C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\GenericFunctionModule.cs", + "RelativeDocumentMoniker": "GenericFunctionModule.cs", + "ToolTip": "C:\\AebestachFiles\\Code\\C#\\WeatherDrivenSolarPanel\\GenericFunctionModule.cs", + "RelativeToolTip": "GenericFunctionModule.cs", + "ViewState": "AQIAAIgAAAAAAAAAAAA8wHIAAAAOAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-02-16T10:53:36.573Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GameData/WeatherDrivenSolarPanel/Config/weatherDrivenSolarPanel.cfg b/GameData/WeatherDrivenSolarPanel/Config/weatherDrivenSolarPanel.cfg index b32a664..4ca0c0c 100644 --- a/GameData/WeatherDrivenSolarPanel/Config/weatherDrivenSolarPanel.cfg +++ b/GameData/WeatherDrivenSolarPanel/Config/weatherDrivenSolarPanel.cfg @@ -1,45 +1,38 @@ // Stock----Since Kopernicus solar panels output energy in the same way as this mod, drop the Kopernicus calculations when in the presence of volumetric clouds -@PART[*]:NEEDS[Kopernicus,!RealismOverhaul]:FINAL +@PART[*]:HAS[!MODULE[ModuleCurvedSolarPanel]]:NEEDS[Kopernicus,!RealismOverhaul]:FINAL { !MODULE[SolarPanelFixer] {} - - +MODULE[ModuleDeployableSolarPanel],* - { - @name = KopernicusSolarPanel - } + !MODULE[SolarPanelFixer] {} - +MODULE[KopernicusSolarPanel],* + @MODULE[*SolarPanel*],* { @name = weatherDrivenSolarPanelStock } + } // RO---- Kopernicus solar panels output energy in the same way as this mod, drop the Kopernicus calculations when in the presence of volumetric clouds -@PART[*]:NEEDS[Kopernicus,RealismOverhaul]:FINAL +@PART[*]:HAS[!MODULE[ModuleCurvedSolarPanel]]:NEEDS[Kopernicus,RealismOverhaul]:FINAL { !MODULE[SolarPanelFixer] {} + !MODULE[SolarPanelFixer] {} - +MODULE[ModuleDeployableSolarPanel],* + @MODULE[*SolarPanel*],* { - @name = KopernicusSolarPanel - } - - +MODULE[KopernicusSolarPanel],* - { - @name = weatherDrivenSolarPanelRO + @name = weatherDrivenSolarPanelStock } } // Stock----B9PartSwitch support, changes the identifier to a generic identifier -@PART[*]:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[!RealismOverhaul]:FINAL +@PART[*]:HAS[@MODULE[ModuleB9PartSwitch],!MODULE[ModuleCurvedSolarPanel]]:NEEDS[!RealismOverhaul]:FINAL { @MODULE[ModuleB9PartSwitch],* { @SUBTYPE,* { - @MODULE:HAS[@IDENTIFIER[ModuleDeployableSolarPanel]] + @MODULE:HAS[@IDENTIFIER[*SolarPanel*]] { - @IDENTIFIER[ModuleDeployableSolarPanel] + @IDENTIFIER[*SolarPanel*] { @name = weatherDrivenSolarPanelStock } @@ -49,15 +42,15 @@ } // RO----B9PartSwitch support, changes the identifier to a generic identifier -@PART[*]:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[RealismOverhaul]:FINAL +@PART[*]:HAS[@MODULE[ModuleB9PartSwitch],!MODULE[ModuleCurvedSolarPanel]]:NEEDS[RealismOverhaul]:FINAL { @MODULE[ModuleB9PartSwitch],* { @SUBTYPE,* { - @MODULE:HAS[@IDENTIFIER[ModuleDeployableSolarPanel]] + @MODULE:HAS[@IDENTIFIER[*SolarPanel*]] { - @IDENTIFIER[ModuleDeployableSolarPanel] + @IDENTIFIER[*SolarPanel*] { @name = weatherDrivenSolarPanelRO } diff --git a/Source/GenericFunctionModule.cs b/Source/GenericFunctionModule.cs index ea10184..3238121 100644 --- a/Source/GenericFunctionModule.cs +++ b/Source/GenericFunctionModule.cs @@ -111,8 +111,8 @@ public class GenericFunctionModule public static float VolumetricCloudTransmittance(CelestialBody sun, out string layerName) { layerName = null; - int stepCount = 500; - //int stepCount = 100; + //int stepCount = 500; + int stepCount = 100; float totalDensity = 0f; bool RSSflag;