diff --git a/calander.lua b/calander.lua deleted file mode 100644 index e69de29..0000000 diff --git a/functions.lua b/functions.lua index 2f8221b..9c37e68 100644 --- a/functions.lua +++ b/functions.lua @@ -44,23 +44,15 @@ local f, err = io.open(minetest.get_worldpath().."/mymonths_data", "r") if f == nil then - mymonths.day_speed = 72 - mymonths.night_speed = 72 mymonths.day_counter = 1 mymonths.month_counter = 6 mymonths.month = "June" mymonths.weather = "clear" - --mymonths.weather2 = "clear" - mymonths.days_per_month = 14 --Should be 7,14,21 or 28. One week is 7 days. Weeks start on Monday mymonths.day_name = "Monday" else - mymonths.day_speed = mymonths.read_mymonths().day_speed - mymonths.night_speed = mymonths.read_mymonths().night_speed mymonths.day_counter = mymonths.read_mymonths().day_counter mymonths.month_counter = mymonths.read_mymonths().month_counter mymonths.month = mymonths.read_mymonths().month mymonths.weather = mymonths.read_mymonths().weather - --mymonths.weather2 = mymonths.read_mymonths().weather2 - mymonths.days_per_month = mymonths.read_mymonths().days_per_month mymonths.day_name = mymonths.read_mymonths().day_name end diff --git a/months.lua b/months.lua index dc6a59f..2c76d46 100644 --- a/months.lua +++ b/months.lua @@ -1,10 +1,3 @@ -local daychange = 1 -local tseconds = 3 -local t1 = 52 -- 14 min set to 52 -local t2 = 60 -- 12 min set to 60 -local t3 = 72 -- 10 min set to 72 -local t4 = 90 -- 8 min set to 90 -local t5 = 120 -- 6 min set to 120 local timechange = 0 local gm = 0 local gn = 0 @@ -52,10 +45,6 @@ local timer = 0 minetest.register_globalstep(function(dtime) - local month = mymonths.month - local monthn = mymonths.month_counter - local day = mymonths.day_counter - -- Checks every X seconds timer = timer + dtime @@ -66,7 +55,7 @@ minetest.register_globalstep(function(dtime) timer = 0 ---Day Night Speeds +--Day Night Speeds (Thanks to sofar for this) local x = tonumber(mymonths.day_counter) local ratio = ((math.cos((x / 168) * 2 * math.pi) * 0.4) / 2.0) + 0.5 local nightratio = 72/(ratio*2) @@ -107,8 +96,8 @@ minetest.register_globalstep(function(dtime) and time_in_seconds <= 12000 and gm == 1 then minetest.setting_set("time_speed", dayratio) - minetest.chat_send_all("Good Morning! It is "..mymonths.day_name.." "..month.." "..day) - --minetest.chat_send_all("Time speed is "..mymonths.day_speed.." and "..mymonths.night_speed) + minetest.chat_send_all("Good Morning! It is "..mymonths.day_name.." "..mymonths.month.." "..mymonths.day_counter) + minetest.chat_send_all("Time speed is "..dayratio.." and "..nightratio) ---Holidays for i in ipairs(hol) do @@ -117,8 +106,8 @@ minetest.register_globalstep(function(dtime) local h2 = hol[i][2] local h3 = hol[i][3] - if monthn == h1 - and day == h2 then + if mymonths.month_counter == h1 + and mymonths.day_counter == h2 then minetest.chat_send_all(h3) end end