🛠️ fix incorrect original palace data #161

SylarLong · Jan 2, 2024 · d3f196c · d3f196c
1 parent e1e0af4
commit d3f196c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,16 @@
 
 ## v2.2.2
 
+- 🛠️ 修复（fix）
+
+  🇨🇳
+
+  - 来因宫错误 #161
+
+  🇺🇸
+
+  - fix incorrect original palace data #161
+
 - ✨ 改进（enhancement）
 
   🇨🇳

diff --git a/src/__tests__/astro/analyzer.test.ts b/src/__tests__/astro/analyzer.test.ts
@@ -24,7 +24,7 @@ describe('astro/analyzer', () => {
       expect(result.palace(item)).toHaveProperty('name', item);
     });
 
-    expect(result.palace('来因')).toHaveProperty('name', '财帛');
+    expect(result.palace('来因')).toHaveProperty('name', '官禄');
     expect(result.palace('身宫')).toHaveProperty('name', '命宫');
 
     try {

diff --git a/src/astro/astro.ts b/src/astro/astro.ts
@@ -52,6 +52,7 @@ export const bySolar = (
   const palaces: IFunctionalPalace[] = [];
   const { yearly } = getHeavenlyStemAndEarthlyBranchBySolarDate(solarDateStr, timeIndex);
   const earthlyBranchOfYear = kot<EarthlyBranchKey>(yearly[1], 'Earthly');
+  const heavenlyStemOfYear = kot<HeavenlyStemKey>(yearly[0], 'Heavenly');
   const { bodyIndex, soulIndex, heavenlyStemOfSoul, earthlyBranchOfSoul } = getSoulAndBody(
     solarDateStr,
     timeIndex,
@@ -79,8 +80,7 @@ export const bySolar = (
         name: palaceNames[i],
         isBodyPalace: bodyIndex === i,
         isOriginalPalace:
-          !['ziEarthly', 'chouEarthly'].includes(earthlyBranchOfPalace) &&
-          earthlyBranchOfPalace === earthlyBranchOfYear,
+          !['ziEarthly', 'chouEarthly'].includes(earthlyBranchOfPalace) && heavenlyStemOfPalace === heavenlyStemOfYear,
         heavenlyStem: t(heavenlyStemOfPalace),
         earthlyBranch: t(earthlyBranchOfPalace),
         majorStars: majorStars[i].concat(minorStars[i].filter((star) => ['lucun', 'tianma'].includes(star.type))),