akupunktuhr

commit f43ff067165a7eca4381b11cfc696a8df3fdd317
parent 86b3931d7e841805ec9dd5ba2becdb8ccfee105d
Author: Christoph Lohmann <20h@r-36.net>
Date:   Sun, 10 Dec 2023 21:33:15 +0100

Add extraordinary meridian naming.

Diffstat:
M
akupunktuhr
 | 
30
++++++++++++++++++++++++------

1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/akupunktuhr b/akupunktuhr
@@ -195,14 +195,32 @@ extraordinary_connectors = {
 	"SI-3": "BL-62"
 }
 
+extraordinary_name = {
+	"TB-5": "Yang Wei Mai",
+	"GB-41": "Dai Mai",
+	"SP-4": "Chong Mai",
+	"PC-6": "Yin Wei Mai",
+	"KI-6": "Yin Qiao Mai",
+	"LU-7": "Control Vessel",
+	"SI-3": "Governor Vessel",
+	"BL-62": "Yang Qiao Mai"
+}
+
 def print_fei_teng_ba(hourstem, hourbranch):
-	print("Fei Teng Ba Fa simple: %s -> %s" % (
-		fei_teng_ba_fa_simple[hourstem-1],
-		extraordinary_connectors[fei_teng_ba_fa_simple[hourstem-1]]
+	ex0 = fei_teng_ba_fa_simple[hourstem-1]
+	ex0name = extraordinary_name[ex0]
+	ex1 = extraordinary_connectors[ex0]
+	ex1name = extraordinary_name[ex1]
+	print("Fei Teng Ba Fa simple: %s (%s) -> %s (%s)" % (
+		ex0, ex0name, ex1, ex1name
 	))
-	print("Fei Teng Ba Fa complex: %s -> %s" % (
-		fei_teng_ba_fa_complex[hourbranch-1][hourstem-1],
-		extraordinary_connectors[fei_teng_ba_fa_complex[hourbranch-1][hourstem-1]]
+
+	ex0 = fei_teng_ba_fa_complex[hourbranch-1][hourstem-1]
+	ex0name = extraordinary_name[ex0]
+	ex1 = extraordinary_connectors[ex0]
+	ex1name = extraordinary_name[ex1]
+	print("Fei Teng Ba Fa complex: %s (%s) -> %s (%s)" % (
+		ex0, ex0name, ex1, ex1name
 	))
 
 def solar_datetime(latitude, longitude):