akupunktuhr

commit 86b3931d7e841805ec9dd5ba2becdb8ccfee105d
parent 29e10234178ee307213440bee30b0ac1b53309d5
Author: Christoph Lohmann <20h@r-36.net>
Date:   Sun, 10 Dec 2023 21:27:11 +0100

Fix Na Jia Fa for hours.

Diffstat:
M
akupunktuhr
 | 
20
++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/akupunktuhr b/akupunktuhr
@@ -126,31 +126,31 @@ na_jia_fa = [
  "ST-36", "LI-3", "TB-1"],
 ["LR-2", "HT-3", "SP-3, LR-3", "PC-3", "KI-7", "LR-2", "HT-3", "SP-3",
  "PC-3", "KI-7"],
-["SI-8", "ST-43, GB-40", "TB-10", "UB-60, UB-67", "", "SI-8", "ST-43",
- "TB-10", "UB-67, UB-60", ""],
+["SI-8", "ST-43, GB-40", "TB-10", "BL-60, BL-67", "", "SI-8", "ST-43",
+ "TB-10", "BL-67, BL-60", ""],
 ["HT-7, PC-7, KI-3", "PC-5", "LU-8, LU-11", "", "LR-8", "HT-7", "PC-5",
  "LU-11, LU-8", "", "LR-8"],
 ["TB-6", "LI-5, LI-1", "", "GB-34, GB-43", "", "TB-6", "LI-1, LI-5", "",
  "GB-43, GB-34", ""],
 ["SP-5, SP-1", "", "KI-10, KI-2", "", "PC-7", "SP-1, SP-5", "",
  "KI-2, KI-10", "", "PC-7"],
-["", "UB-40, UB-66", "", "TB-3, SI-4", "ST-45", "", "UB-66, UB-60", "",
- "SI-3, TB-4, UB-64, TB-3", "ST-45"],
+["", "BL-40, BL-66", "", "TB-3, SI-4", "ST-45", "", "BL-66, BL-60", "",
+ "SI-3, TB-4, BL-64, TB-3", "ST-45"],
 ["LU-5, LU-10", "", "PC-8, LR-3", "HT-9", "", "LU-10, LU-5", "",
  "LR-3, LU-9, PC-8", "HT-9", ""],
 ["", "TB-2, GB-41", "SI-1", "ST-41", "LI-2", "", "GB-41, LI-4, TB-2",
  "SI-1", "ST-41", "LI-2"],
 ["PC-9, KI-3", "LR-1", "HT-4", "SP-2", "", "KI-3, SP-3, PC-9",
  "LR-1", "HT-4", "SP-2", ""],
-["GB-44", "SI-5", "ST-44", "LI-11", "UB-65, ST-42", "GB-44",
- "SI-5", "ST-44", "LI-11", "UB-65"],
+["GB-44", "SI-5", "ST-44", "LI-11", "BL-65, ST-42", "GB-44",
+ "SI-5", "ST-44", "LI-11", "BL-65"],
 ["LR-4", "HT-8", "SP-9", "LU-9, HT-7", "KI-1", "LR-4", "HT-8",
  "SP-9", "LU-9", "KI-1"]
 ]
 
-def print_na_jia_fa(daystem, daybranch):
-	print("Na Jia Fa day points: %s" % (
-		na_jia_fa[daybranch-1][daystem-1]
+def print_na_jia_fa(daystem, hourbranch):
+	print("Na Jia Fa: %s" % (
+		na_jia_fa[hourbranch-1][daystem-1]
 	))
 
 fei_teng_ba_fa_complex = [
@@ -292,7 +292,6 @@ def main(args):
 	daybranch = lunaryearday % 12
 	if daybranch == 0:
 		daybranch = 12
-	print_na_jia_fa(daystem, daybranch)
 
 	if daystem == 1 or daystem == 6:
 		hourstem1 = 1
@@ -312,6 +311,7 @@ def main(args):
 	if hourbranch > 12:
 		hourbranch = hourbranch - 12
 	print_fei_teng_ba(hourstem, hourbranch)
+	print_na_jia_fa(daystem, hourbranch)
 
 	return 0