From 6dc82664ef4d2a455aadce40ecaf87e57c112f73 Mon Sep 17 00:00:00 2001
From: MarinaGryphon <ryfoxx93@gmail.com>
Date: Wed, 2 Dec 2020 01:30:51 -0600
Subject: [PATCH] Fixes the Adhomian watch's time/date calculation. (#10660)

---
 code/game/objects/items/tajara.dm | 47 ++++++++-----------------------
 html/changelogs/MDP-watchfix.yml  | 41 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 html/changelogs/MDP-watchfix.yml

diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm
index eb5421b6292..74c4a800681 100644
--- a/code/game/objects/items/tajara.dm
+++ b/code/game/objects/items/tajara.dm
@@ -135,6 +135,7 @@
 	icon_state = "adhomai_clock"
 	item_state = "adhomai_clock"
 	contained_sprite = TRUE
+	var/static/months = list("Menshe-aysaif", "Sil'nryy-aysaif", "Menshe-rhazzimy", "Sil'nryy-rhazzimy")
 
 /obj/item/pocketwatch/adhomai/checktime(mob/user)
 	set category = "Object"
@@ -146,47 +147,23 @@
 	else
 
 		var/adhomian_year = game_year + 1158
-
-		var/current_month = time2text(world.realtime, "Month")
+		var/current_month = text2num(time2text(world.realtime, "MM"))
 		var/current_day = text2num(time2text(world.realtime, "DD"))
 		var/adhomian_day
-		var/adhomian_month
+		var/adhomian_month = src.months[Ceiling(current_month/3)]
 		switch(current_month)
-			if("January", "February", "March")
-				adhomian_month = "Menshe-aysaif"
-				if (current_month == "February")
-					adhomian_day = current_day + 15
-				if (current_month == "March")
-					adhomian_day = current_day + 30
-
-			if("April", "May", "June")
-				adhomian_month = "Sil'nryy-aysaif"
-				if (current_month == "May")
-					adhomian_day = current_day + 15
-				if (current_month == "June")
-					adhomian_day = current_day + 30
-
-			if("July", "August", "September")
-				adhomian_month = "Menshe-rhazzimy"
-				if (current_month == "August")
-					adhomian_day = current_day + 15
-				if (current_month == "September")
-					adhomian_day = current_day + 30
-
-			if("October", "November", "December")
-				adhomian_month = "Sil'nryy-rhazzimy"
-				if (current_month == "November")
-					adhomian_day = current_day + 15
-				if (current_month == "December")
-					adhomian_day = current_day + 30
-
+			if(2, 5, 8, 11)
+				current_day += 31
+			if(6, 9, 12)
+				current_day += 61
+			if(3)
+				current_day += 59 + isLeap(text2num(time2text(world.realtime, "YYYY"))) // we can conveniently use the result of `isLeap` to add 1 when we are in a leap year
 		var/real_time = text2num(time2text(world.time + (roundstart_hour HOURS), "hh"))
 		var/adhomian_time = real_time
-		if(IsOdd(current_day))
+		if(IsEven(current_day))
 			adhomian_time = real_time + 24
-			adhomian_day -= 1
-
-		to_chat(usr, "You check your \the [src], glancing over at the watch face, reading the time to be '[adhomian_time]'. Today's date is '[adhomian_day]th day of [adhomian_month] [adhomian_year]'.")
+		adhomian_day = Floor(current_day / 2)
+		to_chat(usr, "You check your [src.name], glancing over at the watch face, reading the time to be '[adhomian_time]'. Today's date is the '[adhomian_day]th day of [adhomian_month], [adhomian_year]'.")
 
 
 /obj/item/flame/lighter/adhomai
diff --git a/html/changelogs/MDP-watchfix.yml b/html/changelogs/MDP-watchfix.yml
new file mode 100644
index 00000000000..ecb49504e05
--- /dev/null
+++ b/html/changelogs/MDP-watchfix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MoondancerPony
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixes the date calculation for the Adhomian watch."