Merge pull request #65 from ChrisAdderley/dev

Release 2.1.7
post-kerbin-mining-corporation · Aug 1, 2020 · 74a677d · 74a677d
2 parents 23fe13c + 485228c
commit 74a677d
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 5 deletions.
diff --git a/GameData/DynamicBatteryStorage/Localization/de-de b/GameData/DynamicBatteryStorage/Localization/de-de
@@ -0,0 +1,86 @@
+// Übersetzung von Sqeep
+Localization
+{
+  de-de
+  {
+    // Main Panel
+	  #LOC_DynamicBatteryStorage_UI_WindowName = Near Future Systems Manager
+    #LOC_DynamicBatteryStorage_UI_ThermalModeName = THERMAL
+    #LOC_DynamicBatteryStorage_UI_ElectricalModeName = ELEKTRISCH
+
+    #LOC_DynamicBatteryStorage_UI_ElectricalFlowUnits = Ec/s
+    #LOC_DynamicBatteryStorage_UI_ElectricalUnits = Ec
+    #LOC_DynamicBatteryStorage_UI_ThermalFlowUnits = kW
+    #LOC_DynamicBatteryStorage_UI_TimeUnits = s
+    #LOC_DynamicBatteryStorage_UI_DistanceUnits = m
+
+
+    // Electrical View
+    // Solar Panel Manager
+    #LOC_DynamicBatteryStorage_UI_SolarManagerTitle = Solar-Simulator
+    #LOC_DynamicBatteryStorage_UI_EclipseTimeTitle = Zeit in der Finsternis
+    #LOC_DynamicBatteryStorage_UI_BodySelectionTitle = Referenzkörper
+    #LOC_DynamicBatteryStorage_UI_SolarAltitudeTitle = Mittlere Sonnenhöhe
+    #LOC_DynamicBatteryStorage_UI_OrbitAltitudeTitle = Körperorbitalgröße
+    #LOC_DynamicBatteryStorage_UI_SolarEfficiencyTitle = Geschätzte Solarpanel-Effizienz
+
+    // Battery Panel
+    #LOC_DynamicBatteryStorage_UI_BatteryManagerTitle = Batterie Status
+    #LOC_DynamicBatteryStorage_UI_BatteryTimeDepletion = Erschöpfung in
+    #LOC_DynamicBatteryStorage_UI_BatteryTimeCharging = Wiederaufgeladen in
+    #LOC_DynamicBatteryStorage_UI_BatteryTimeStable = stabil
+    #LOC_DynamicBatteryStorage_UI_BatteryTimeFullCharge = Vollgeladen in
+
+    // Dynamic Battery Panel
+    #LOC_DynamicBatteryStorage_UI_DBSManagerTitle = Dynamische Batterieeinstellung
+    #LOC_DynamicBatteryStorage_UI_DBSManagerBufferSize = Erforderlicher Puffer
+    #LOC_DynamicBatteryStorage_UI_DBSManagerBufferPart = Betroffener Teil
+    #LOC_DynamicBatteryStorage_UI_DBSDebugTitle = interne Datan
+    #LOC_DynamicBatteryStorage_UI_DBSVesselCachedTitle = Fahrzeug zwischengespeicherter Strom
+    #LOC_DynamicBatteryStorage_UI_DBSPartCachedTitle = Im Teil zwischengespeicherter Strom
+
+    #LOC_DynamicBatteryStorage_UI_DBSErrorController = Controller konnte nicht erkannt werden 
+    #LOC_DynamicBatteryStorage_UI_DBSErrorTimewarp = System offline unter <<1>>x
+    #LOC_DynamicBatteryStorage_UI_DBSNoError =  Kompensationssystem aktiviert
+
+    // Flows panel
+    #LOC_DynamicBatteryStorage_UI_FlowPanelTitle = Stromfluss
+    #LOC_DynamicBatteryStorage_UI_TotalPowerGenerationTitle = Gesamte Stromerzeugung
+    #LOC_DynamicBatteryStorage_UI_TotalPowerConsumptionTitle = Gesamtstromverbrauch
+
+
+    // Intermittent panel
+    #LOC_DynamicBatteryStorage_UI_SimulationPanelTitle = Überwachungsschaltung
+    #LOC_DynamicBatteryStorage_UI_ConstantPanelTitle = Alle
+    #LOC_DynamicBatteryStorage_UI_IntermittentPanelTitle = Auf Nachfrage
+    #LOC_DynamicBatteryStorage_UI_IntermittentToggle = UMSCHALTEN
+    #LOC_DynamicBatteryStorage_UI_IntermittentOff = AUS
+    #LOC_DynamicBatteryStorage_UI_IntermittentOn = AN
+
+    // Thermal View
+    // Flows panel
+    #LOC_DynamicBatteryStorage_UI_HeatFlowPanelTitle = Wärmefluss
+    #LOC_DynamicBatteryStorage_UI_HeatFlowPanelNotOk = <color=#fd6868> Die Wärmeableitung des Fahrzeuges ist unzureichend, Teil können überhitzen</color>
+    #LOC_DynamicBatteryStorage_UI_HeatFlowPanelOk = Die Wärmeableitung des Fahrzeuges ist ausreichend.
+    #LOC_DynamicBatteryStorage_UI_TotalHeatConsumptionTitle = Gesamtwärmeabgabe
+    #LOC_DynamicBatteryStorage_UI_TotalHeatGenerationTitle  = Gesamtwärmeproduktion
+
+    // UI Categories
+    #LOC_DynamicBatteryStorage_UI_Category_SolarPanels = Sonnenkollektorn
+    #LOC_DynamicBatteryStorage_UI_Category_Radiators = Radiatoren
+    #LOC_DynamicBatteryStorage_UI_Category_Converters = Konverter
+    #LOC_DynamicBatteryStorage_UI_Category_Harvesters = Maschinen
+    #LOC_DynamicBatteryStorage_UI_Category_Generators = Generatoren
+    #LOC_DynamicBatteryStorage_UI_Category_Reactors = Reaktoren
+    #LOC_DynamicBatteryStorage_UI_Category_FissionReactors = Spaltreaktoren
+    #LOC_DynamicBatteryStorage_UI_Category_FusionReactors = Fusionsreaktoren
+    #LOC_DynamicBatteryStorage_UI_Category_Batteries = Energiespeicher
+    #LOC_DynamicBatteryStorage_UI_Category_FuelTanks = Treibstofftanks
+    #LOC_DynamicBatteryStorage_UI_Category_Lights = Lichter
+    #LOC_DynamicBatteryStorage_UI_Category_Command = Kommandomodul
+    #LOC_DynamicBatteryStorage_UI_Category_Communication = Transmitter
+    #LOC_DynamicBatteryStorage_UI_Category_Habitation = Hab Module
+    #LOC_DynamicBatteryStorage_UI_Category_Engines = Triebwerke
+    #LOC_DynamicBatteryStorage_UI_Category_Science = Wissenschaft
+  }
+}
diff --git a/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.dll b/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.dll
diff --git a/GameData/DynamicBatteryStorage/Versioning/DynamicBatteryStorage.version b/GameData/DynamicBatteryStorage/Versioning/DynamicBatteryStorage.version
@@ -6,13 +6,13 @@
     {
         "MAJOR":2,
         "MINOR":1,
-        "PATCH":6,
+        "PATCH":7,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":9,
+        "MINOR":10,
         "PATCH":1
     },
     "KSP_VERSION_MIN":{
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":9,
+        "MINOR":10,
         "PATCH":99
     }
 }
diff --git a/Source/DynamicBatteryStorage/UI/UISolarPanelManager.cs b/Source/DynamicBatteryStorage/UI/UISolarPanelManager.cs
@@ -250,7 +250,7 @@ protected double CalculateOcclusionTime()
     /// </summary>
     protected float CalculatePanelScalar()
     {
-      return (float)((1d / sunRefOrbitHeight) *(refSunOrbitAlt) ) ;
+      return (float)((1d / (sunRefOrbitHeight*sunRefOrbitHeight)) *(refSunOrbitAlt) ) ;
     }
 
   }

diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csproj.FileListAbsolute.txt b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csproj.FileListAbsolute.txt
@@ -15,3 +15,4 @@ C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\
 C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CopyComplete
 C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.dll
 C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.pdb
+C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csprojAssemblyReference.cache
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+v2.1.7
+------
+- KSP 1.10 compatibility
+- Added German localization (Sqeep)
+- Fixed solar panel manager calculating scaling incorrectly
+
 v2.1.6
 ------
 - Corrected an issue with SignalDelay compatibility

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 ==============================
-Dynamic Battery Storage v2.1.6
+Dynamic Battery Storage v2.1.7
 ==============================
 
 A small utility mod for Kerbal Space Program, intended to support my other projects. Effectively required by Near Future Electrical, CryoEngines, KerballAtomics and CryoTanks.