From f73d3564c59aeeebdcb15ff421fd9144e4b72f02 Mon Sep 17 00:00:00 2001 From: jmrd98 Date: Sat, 12 Jan 2019 17:48:24 -0600 Subject: [PATCH 1/6] Change time lengths from hardcoded to KSPUtil.dateTimeFormatter references. --- Snacks/GUI/SnackAppView.cs | 18 ++++++++++-------- Snacks/LifeSupport/SnackController.cs | 9 +++++---- Snacks/Settings/SnacksProperties.cs | 9 +++++---- Snacks/Utilities/WindowUtils.cs | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Snacks/GUI/SnackAppView.cs b/Snacks/GUI/SnackAppView.cs index 832c540..7828a58 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 / 3600); } } 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..d728e31 100644 --- a/Snacks/Utilities/WindowUtils.cs +++ b/Snacks/Utilities/WindowUtils.cs @@ -38,7 +38,7 @@ 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; + static double HOURS_PER_DAY = KSPUtil.dateTimeFormatter.Day / 3600; // (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 ToDegrees(double radians) From 96cd4e2b4767339bf374a4df6d47aaabd80347c7 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Thu, 24 Jan 2019 23:25:03 -0600 Subject: [PATCH 2/6] Update Snacks/Utilities/WindowUtils.cs Co-Authored-By: jmrd98 --- Snacks/Utilities/WindowUtils.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Snacks/Utilities/WindowUtils.cs b/Snacks/Utilities/WindowUtils.cs index d728e31..881e013 100644 --- a/Snacks/Utilities/WindowUtils.cs +++ b/Snacks/Utilities/WindowUtils.cs @@ -36,7 +36,13 @@ namespace Snacks { public static class WindowUtils { - const double SECONDS_PER_MINUTE = 60.0; + double SECONDS_PER_MINUTE + { + get + { + return KSPUtil.dateTimeFormatter.Minute; + } + } const double MINUTES_PER_HOUR = 60.0; static double HOURS_PER_DAY = KSPUtil.dateTimeFormatter.Day / 3600; // (GameSettings.KERBIN_TIME) ? 6.0 : 24.0; public static double SECONDS_PER_DAY = SECONDS_PER_MINUTE*MINUTES_PER_HOUR*HOURS_PER_DAY; From 3b6d8a41044a0e261daa51c4d0f399a4dc468331 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Thu, 24 Jan 2019 23:25:14 -0600 Subject: [PATCH 3/6] Update Snacks/Utilities/WindowUtils.cs Co-Authored-By: jmrd98 --- Snacks/Utilities/WindowUtils.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Snacks/Utilities/WindowUtils.cs b/Snacks/Utilities/WindowUtils.cs index 881e013..f500dd4 100644 --- a/Snacks/Utilities/WindowUtils.cs +++ b/Snacks/Utilities/WindowUtils.cs @@ -43,7 +43,13 @@ double SECONDS_PER_MINUTE return KSPUtil.dateTimeFormatter.Minute; } } - const double MINUTES_PER_HOUR = 60.0; + double MINUTES_PER_HOUR + { + get + { + return KSPUtil.dateTimeFormatter.Hour / KSPUtil.dateTimeFormatter.Minute; + } + } static double HOURS_PER_DAY = KSPUtil.dateTimeFormatter.Day / 3600; // (GameSettings.KERBIN_TIME) ? 6.0 : 24.0; public static double SECONDS_PER_DAY = SECONDS_PER_MINUTE*MINUTES_PER_HOUR*HOURS_PER_DAY; From f5b06d74081403bdef9b707a194c213909db1f6e Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Thu, 24 Jan 2019 23:25:31 -0600 Subject: [PATCH 4/6] Update Snacks/Utilities/WindowUtils.cs Co-Authored-By: jmrd98 --- Snacks/Utilities/WindowUtils.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Snacks/Utilities/WindowUtils.cs b/Snacks/Utilities/WindowUtils.cs index f500dd4..f76f4e8 100644 --- a/Snacks/Utilities/WindowUtils.cs +++ b/Snacks/Utilities/WindowUtils.cs @@ -50,7 +50,13 @@ double MINUTES_PER_HOUR return KSPUtil.dateTimeFormatter.Hour / KSPUtil.dateTimeFormatter.Minute; } } - static double HOURS_PER_DAY = KSPUtil.dateTimeFormatter.Day / 3600; // (GameSettings.KERBIN_TIME) ? 6.0 : 24.0; + static double HOURS_PER_DAY + { + get + { + return KSPUtil.dateTimeFormatter.Day / KSPUtil.dateTimeFormatter.Hour; // (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 ToDegrees(double radians) From b511c5eaed465f3038590651ef21d09ff3b90ce4 Mon Sep 17 00:00:00 2001 From: TriggerAu Date: Thu, 24 Jan 2019 23:25:44 -0600 Subject: [PATCH 5/6] Update Snacks/GUI/SnackAppView.cs Co-Authored-By: jmrd98 --- Snacks/GUI/SnackAppView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Snacks/GUI/SnackAppView.cs b/Snacks/GUI/SnackAppView.cs index 7828a58..568922c 100644 --- a/Snacks/GUI/SnackAppView.cs +++ b/Snacks/GUI/SnackAppView.cs @@ -67,7 +67,7 @@ double HoursPerDay // return 6f; //else // return 24f; - return (KSPUtil.dateTimeFormatter.Day / 3600); + return (KSPUtil.dateTimeFormatter.Day / KSPUtil.dateTimeFormatter.Hour); } } From a43b85dec3d4a0db175240fca342c5f9744378bb Mon Sep 17 00:00:00 2001 From: jmrd98 Date: Fri, 1 Feb 2019 22:28:43 -0600 Subject: [PATCH 6/6] Refactored time variables to compile. --- Snacks/Utilities/WindowUtils.cs | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/Snacks/Utilities/WindowUtils.cs b/Snacks/Utilities/WindowUtils.cs index f76f4e8..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,28 +36,13 @@ namespace Snacks { public static class WindowUtils { - double SECONDS_PER_MINUTE - { - get - { - return KSPUtil.dateTimeFormatter.Minute; - } - } - double MINUTES_PER_HOUR - { - get - { - return KSPUtil.dateTimeFormatter.Hour / KSPUtil.dateTimeFormatter.Minute; - } - } - static double HOURS_PER_DAY - { - get - { - return KSPUtil.dateTimeFormatter.Day / KSPUtil.dateTimeFormatter.Hour; // (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) {