four-pillars 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f0b8c051671af718c90ac4cc6e63f328b45ab58b1dc66de1bcd5cccec592b51
-  data.tar.gz: b9980ff4b7836ce0f41f625f6d8b7408fb2fdd67eb2e68401c82335f6a0141b3
+  metadata.gz: 5fa421d59c6eebe39c91e346319e4a53b026247f619032fdc54b2055bdff7e62
+  data.tar.gz: 9b9ace6b9c0e25546027f14740f3a60467b41f4ca726d65758b2b2f1b3be8c3b
 SHA512:
-  metadata.gz: f50990650a105160b856d434a1e775147821005e19ca2e3e49e59145078965363223b1d36c57b0955003799545859142f656a8b0ae9af143567b99d5ebb1a4ec
-  data.tar.gz: 706961821addf96f7fb0aab4142379891e2dbc0d3596174f16a009bfd7735bc93afb9f51b7bce05a4de4e05b7bb394b11b184726c3e6f61aeda72b818c962a02
+  metadata.gz: b43a695cb24b025c39cfc38af7d18d68c500357e0560077a05960feef8abde23d4b019201beb73166879ef82c304c43a0d8c0d531b78c0ad6f2ae02117a46090
+  data.tar.gz: 932fd3efd6e8d0ac69ed4d3aac0de9a340eed2c8a1a0bc3d8e8cc0961f20a72807fb4e043d718dbcfc11d97f5c2414cc96398098f40ac7743e489cf323a024bd

data/lib/four-pillars.rb

@@ -318,9 +318,10 @@ class FourPillarsLogic
     # 日柱の十干と月柱の十二支
     x = JIKKAN.index(kanshi[0][0])
     y = JYUNISHI.index(kanshi[1][1])
-    SHUGOSHIN[y][x]
+    SHUGOSHIN[y][x].split("")
   end
 
+  # 宿命中殺
   def shukumei
     s = []
     t = kuubou # 天中殺 0:上段, 1:下段
@@ -340,6 +341,67 @@ class FourPillarsLogic
     s += ["日座中殺"] if f
     return s
   end
+
+  def equivalent_kanshi(only_jikkan=false)
+    if only_jikkan
+      k = kanshi.map {|v| v[0] } # 日,月,年柱の十干
+    else
+      k = kanshi
+    end
+    if k[0] == k[1] && k[1] == k[2]
+      return [[0,1],[0,2],[1,2]]
+    elsif k[0] == k[1]
+      return [[0,1]]
+    elsif k[0] == k[2]
+      return [[0,2]]
+    elsif k[1] == k[2]
+      return [[1,2]]
+    else
+      return []
+    end
+  end
+
+  def on_distance?(j1,j2,d=6)
+    i = JYUNISHI.index(j1)
+    return j2 == JYUNISHI[(i+d) % 12]
+  end
+
+  # 律音
+  def ricchin
+    # 干支(十干・十二支)が同じ
+    equivalent_kanshi(false)
+  end
+
+  # 納音
+  def nacchin
+    # 十干が同じで十二支が 沖 の関係にある
+    v = []
+    eq = equivalent_kanshi(true)
+    eq.each do |e|
+      k0 = kanshi[e[0]][1]
+      k1 = kanshi[e[1]][1]
+      v += [e] if on_distance?(k0,k1,6)
+    end
+    return v
+  end
+
+  # 宿命大半会
+  def shukumei_daihankai
+    # 十干が同じで十二支が三合会局の関係にある
+    v = []
+    eq = equivalent_kanshi(true)
+    eq.each do |e|
+      k0 = kanshi[e[0]][1]
+      k1 = kanshi[e[1]][1]
+      v += [e] if on_distance?(k0,k1,4)
+    end
+    eq.each do |e|
+      k0 = kanshi[e[0]][1]
+      k1 = kanshi[e[1]][1]
+      v += [e] if on_distance?(k0,k1,8)
+    end
+    return v
+  end
 end
 
 if __FILE__ == $0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: four-pillars
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Yosei Ito
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies: []
 description: A class which tells fortune by Four Pillar astrology(四柱推命).
 email: y-itou@lumber-mill.co.jp