From ab97f3674eaa7e4e146fe9db5abce9ba54894bc9 Mon Sep 17 00:00:00 2001
From: Vincent Le Goff <vincent.legoff.srs@gmail.com>
Date: Sun, 12 Feb 2017 15:33:36 -0800
Subject: [PATCH] Add optional settings to change game time measurement and
 units

---
 evennia/contrib/convert_gametime.py | 34 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/evennia/contrib/convert_gametime.py b/evennia/contrib/convert_gametime.py
index d241699c86..313a0513a1 100644
--- a/evennia/contrib/convert_gametime.py
+++ b/evennia/contrib/convert_gametime.py
@@ -28,23 +28,23 @@ TIMEFACTOR = settings.TIME_FACTOR
 # when defining in-game events. The words month, week and year can  be
 # used to mean whatever units of time are used in your game.
 SEC = 1
-MIN = 60          # seconds per minute
-HOUR = MIN * 60   # minutes per hour
-DAY = HOUR * 24   # hours per day
-WEEK = DAY * 7    # days per week
-MONTH = WEEK * 4  # weeks per month
-YEAR = MONTH * 12 # months per year
-UNITS = {
-    "sec": SEC,
-    "min": MIN,
-    "hr": HOUR,
-    "hour": HOUR,
-    "day": DAY,
-    "week": WEEK,
-    "month": MONTH,
-    "year": YEAR,
-    "yr": YEAR,
-}
+MIN = getattr(settings, "SECS_PER_MIN", 60)
+HOUR = getattr(settings, "MINS_PER_HOUR", 60) * MIN
+DAY = getattr(settings, "HOURS_PER_DAY", 24) * HOUR
+WEEK = getattr(settings, "DAYS_PER_WEEK", 7) * DAY
+MONTH = getattr(settings, "WEEKS_PER_MONTH", 4) * WEEK
+YEAR = getattr(settings, "MONTHS_PER_YEAR", 12) * MONTH
+UNITS = getattr(settings, "TIME_UNITS", {
+        "sec": SEC,
+        "min": MIN,
+        "hr": HOUR,
+        "hour": HOUR,
+        "day": DAY,
+        "week": WEEK,
+        "month": MONTH,
+        "year": YEAR,
+        "yr": YEAR,
+})
 
 
 def time_to_tuple(seconds, *divisors):