Skip to content

Commit

Permalink
@kingsoen 修复凶神吉神判断问题 #40
Browse files Browse the repository at this point in the history
源自早期数据集只有god,没有分angel和demon
  • Loading branch information
cuba3 committed Dec 2, 2024
1 parent 2fff7b2 commit 376fe5b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

@JeremyYoungCai (https://github.com/JeremyYoungCai) issues/37

@kingsoen (https://github.com/kingsoen) issues/40

其他与本项目关联项目:

@m11v 的 Dart/Flutter版本 https://github.com/m11v/chinese_lunar_calendar
Expand Down
7 changes: 5 additions & 2 deletions cnlunar/lunar.py
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,8 @@ def nothingGood(dic):
# pass # 仍注忌 ----> 不对badThing进行操作

# 凡天狗寅日忌祭祀,不注宜求福、祈嗣。
if '天狗' in self.goodGodName or '寅' in d:
# @kingsoen https://github.com/OPN48/cnlunar/issues/40
if '天狗' in self.badGodName or '寅' in d:
self.badThing = rfAdd(self.badThing, addList=['祭祀'])
self.goodThing = rfRemove(self.goodThing, removeList=['祭祀'])

Expand Down Expand Up @@ -1208,7 +1209,9 @@ def nothingGood(dic):
if '四忌' in self.badGodName or '四穷' in self.badGodName:
self.badThing = rfAdd(self.badThing, addList=['安葬'])
self.goodThing = rfRemove(self.goodThing, removeList=['破土', '启攒'])
if '鸣吠' in self.badGodName or '鸣吠对' in self.badGodName:
# @kingsoen https://github.com/OPN48/cnlunar/issues/40
# 关联修改
if '鸣吠' in self.goodGodName or '鸣吠对' in self.goodGodName:
self.goodThing = rfRemove(self.goodThing, removeList=['破土', '启攒'])
# 凡天吏、大时不以死败论者,遇四废、岁薄、逐阵仍以死败论。
# 凡岁薄、逐阵日所宜事,照月厌所忌删,所忌仍从本日。、
Expand Down

0 comments on commit 376fe5b

Please sign in to comment.