take into account cost of a kerbal's inventory

yalov · yalov · commit d86cbed46a31 · 2021-08-04T02:02:09.000+03:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,8 +1,14 @@
 ## ChangeLog:
 
+### Version 2.0.11 (Beta)
+ * take into account cost of a kerbal's inventory
+ * ksp 1.12.2
+
 ### Version 2.0.10 (Beta)
  * ksp 1.12
  * using stock Alarm Clock App by default
+ * [known bug]
+   Adding new alarm when Alarm Clock App GUI is opened, makes�the alarm be showed in the GUI as 0:00:00 until scene change.
 
 ### Version 2.0.2
  * fix doubling time of the appeding alarm
diff --git a/GameData/KVASS/ChangeLog.md b/GameData/KVASS/ChangeLog.md
@@ -1,8 +1,14 @@
 ## ChangeLog:
 
+### Version 2.0.11 (Beta)
+ * take into account cost of a kerbal's inventory
+ * ksp 1.12.2
+
 ### Version 2.0.10 (Beta)
  * ksp 1.12
  * using stock Alarm Clock App by default
+ * [known bug]
+   Adding new alarm when Alarm Clock App GUI is opened, makes�the alarm be showed in the GUI as 0:00:00 until scene change.
 
 ### Version 2.0.2
  * fix doubling time of the appeding alarm
diff --git a/GameData/KVASS/KVASS.version b/GameData/KVASS/KVASS.version
@@ -9,18 +9,18 @@
   "VERSION": {
     "MAJOR": 2,
     "MINOR": 0,
-    "PATCH": 10,
+    "PATCH": 11,
     "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
     "MINOR": 12,
-    "PATCH": 0
+    "PATCH": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
     "MINOR": 12,
-    "PATCH": 0
+    "PATCH": 2
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
diff --git a/GameData/KVASS/Plugins/KVASS.dll b/GameData/KVASS/Plugins/KVASS.dll
diff --git a/KVASS.version b/KVASS.version
@@ -9,18 +9,18 @@
   "VERSION": {
     "MAJOR": 2,
     "MINOR": 0,
-    "PATCH": 10,
+    "PATCH": 11,
     "BUILD": 0
   },
   "KSP_VERSION": {
     "MAJOR": 1,
     "MINOR": 12,
-    "PATCH": 0
+    "PATCH": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,
     "MINOR": 12,
-    "PATCH": 0
+    "PATCH": 2
   },
   "KSP_VERSION_MAX": {
     "MAJOR": 1,
diff --git a/KVASS/Alarm.cs b/KVASS/Alarm.cs
@@ -269,7 +269,7 @@ public void AlarmAppendedToQueue(ref Alarm alarm)
                     }
                 case AlarmType.AlarmClockApp:
                     {
-                        IEnumerable<AlarmTypeBase> alarms = ACAUtils.GetSortedPlanningActiveAlarms();
+                        var alarms = ACAUtils.GetSortedPlanningActiveAlarms();
 
                         if (alarms.Any())
                         {
diff --git a/KVASS/KVASS.cs b/KVASS/KVASS.cs
@@ -223,7 +223,7 @@ static void AnyButtonClick(NewAlarmQueueType queueButton)
         {
             string alarmTitle = Utils.AlarmTitle(Utils.GetVesselName());
 
-            float cost = EditorLogic.fetch.ship.GetShipCosts(out _, out _);
+            float cost = EditorLogic.fetch.ship.GetShipCosts(out _, out _, ShipConstruction.ShipManifest);
             float mass = EditorLogic.fetch.ship.GetTotalMass() * 1000;
             double time = CalcAlarmTime(cost, mass);
             double alarm_ut = Utils.UT() + time;
diff --git a/KVASS/Properties/AssemblyVersion.cs b/KVASS/Properties/AssemblyVersion.cs
@@ -17,4 +17,4 @@
  
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.0.10.0")]
+[assembly: AssemblyVersion("2.0.11.0")]
diff --git a/buildDeploy.bat b/buildDeploy.bat
@@ -6,7 +6,7 @@ rem v2
 rem instruction in the BUILDRELEASE.BAT
 
 rem Set variables here
-set GAMEPATH=c:\Users\User\Games\Kerbal Space Program 1.12.0
+set GAMEPATH=c:\Users\User\Games\Kerbal Space Program 1.12.2
 
 set MODNAME=KVASS
 

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ public void AlarmAppendedToQueue(ref Alarm alarm)`
`269`	`269`	`}`
`270`	`270`	`case AlarmType.AlarmClockApp:`
`271`	`271`	`{`
`272`		`- IEnumerable<AlarmTypeBase> alarms = ACAUtils.GetSortedPlanningActiveAlarms();`
	`272`	`+ var alarms = ACAUtils.GetSortedPlanningActiveAlarms();`
`273`	`273`
`274`	`274`	`if (alarms.Any())`
`275`	`275`	`{`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ static void AnyButtonClick(NewAlarmQueueType queueButton)`
`223`	`223`	`{`
`224`	`224`	`string alarmTitle = Utils.AlarmTitle(Utils.GetVesselName());`
`225`	`225`
`226`		`- float cost = EditorLogic.fetch.ship.GetShipCosts(out _, out _);`
	`226`	`+ float cost = EditorLogic.fetch.ship.GetShipCosts(out _, out _, ShipConstruction.ShipManifest);`
`227`	`227`	`float mass = EditorLogic.fetch.ship.GetTotalMass() * 1000;`
`228`	`228`	`double time = CalcAlarmTime(cost, mass);`
`229`	`229`	`double alarm_ut = Utils.UT() + time;`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@`
`17`	`17`
`18`	`18`	`using System.Reflection;`
`19`	`19`
`20`		`-[assembly: AssemblyVersion("2.0.10.0")]`
	`20`	`+[assembly: AssemblyVersion("2.0.11.0")]`