diff --git a/Snacks/GUI/SnackAppView.cs b/Snacks/GUI/SnackAppView.cs index 832c540..568922c 100644 --- a/Snacks/GUI/SnackAppView.cs +++ b/Snacks/GUI/SnackAppView.cs @@ -40,10 +40,11 @@ protected double DaysPerYear { get { - if (GameSettings.KERBIN_TIME) - return 426.08f; - else - return 365f; + //if (GameSettings.KERBIN_TIME) + // return 426.08f; + //else + // return 365f; + return (KSPUtil.dateTimeFormatter.Year / KSPUtil.dateTimeFormatter.Day); } } @@ -62,10 +63,11 @@ double HoursPerDay { get { - if (GameSettings.KERBIN_TIME) - return 6f; - else - return 24f; + //if (GameSettings.KERBIN_TIME) + // return 6f; + //else + // return 24f; + return (KSPUtil.dateTimeFormatter.Day / KSPUtil.dateTimeFormatter.Hour); } } diff --git a/Snacks/LifeSupport/SnackController.cs b/Snacks/LifeSupport/SnackController.cs index 03a6bbe..a2466fb 100644 --- a/Snacks/LifeSupport/SnackController.cs +++ b/Snacks/LifeSupport/SnackController.cs @@ -417,10 +417,11 @@ public void GameSettingsApplied() { // snackFrequency = 5; //Seconds per day = 6 * 60 * 60 = 21600 - if (GameSettings.KERBIN_TIME) - snackFrequency = (6 * 3600) / SnacksProperties.MealsPerDay; - else - snackFrequency = (24 * 3600) / SnacksProperties.MealsPerDay; + //if (GameSettings.KERBIN_TIME) + // snackFrequency = (6 * 3600) / SnacksProperties.MealsPerDay; + //else + // snackFrequency = (24 * 3600) / SnacksProperties.MealsPerDay; + snackFrequency = ((KSPUtil.dateTimeFormatter.Day) / SnacksProperties.MealsPerDay); //Make sure that the penalties know about the update foreach (ISnacksPenalty handler in penaltyHandlers) diff --git a/Snacks/Settings/SnacksProperties.cs b/Snacks/Settings/SnacksProperties.cs index 0c39d8a..da500a1 100644 --- a/Snacks/Settings/SnacksProperties.cs +++ b/Snacks/Settings/SnacksProperties.cs @@ -239,10 +239,11 @@ public static int NapTime return 120; case FaintTime.OneDay: - if (GameSettings.KERBIN_TIME) - return 360; - else - return 1440; + //if (GameSettings.KERBIN_TIME) + // return 360; + //else + // return 1440; + return KSPUtil.dateTimeFormatter.Day; } } } diff --git a/Snacks/Utilities/WindowUtils.cs b/Snacks/Utilities/WindowUtils.cs index 2f467ff..3512b68 100644 --- a/Snacks/Utilities/WindowUtils.cs +++ b/Snacks/Utilities/WindowUtils.cs @@ -1,4 +1,4 @@ -/** +/** * WindowUtils.cs * * Thunder Aerospace Corporation's library for the Kerbal Space Program, by Taranis Elsu @@ -36,10 +36,13 @@ namespace Snacks { public static class WindowUtils { - const double SECONDS_PER_MINUTE = 60.0; - const double MINUTES_PER_HOUR = 60.0; - static double HOURS_PER_DAY = (GameSettings.KERBIN_TIME) ? 6.0 : 24.0; - public static double SECONDS_PER_DAY = SECONDS_PER_MINUTE*MINUTES_PER_HOUR*HOURS_PER_DAY; + public static double SECONDS_PER_MINUTE => KSPUtil.dateTimeFormatter.Minute; + + public static double MINUTES_PER_HOUR => KSPUtil.dateTimeFormatter.Hour / KSPUtil.dateTimeFormatter.Minute; + + public static double HOURS_PER_DAY => KSPUtil.dateTimeFormatter.Day / KSPUtil.dateTimeFormatter.Hour; // (GameSettings.KERBIN_TIME) ? 6.0 : 24.0; + + public static double SECONDS_PER_DAY = KSPUtil.dateTimeFormatter.Day; // SECONDS_PER_MINUTE*MINUTES_PER_HOUR*HOURS_PER_DAY; public static double ToDegrees(double radians) {