Skip to content

Commit 3d0a7b1

Browse files
committed
Added Part of Eros and translations for all new objects.
1 parent 28b4586 commit 3d0a7b1

15 files changed

Lines changed: 103 additions & 22 deletions

File tree

docs/5-settings.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ Calculated points:
236236
* `chart.SYZYGY`
237237
* `chart.PART_OF_FORTUNE`
238238
* `chart.PART_OF_SPIRIT`
239+
* `chart.PART_OF_EROS`
239240

240241
Pre & post-natal eclipses:
241242

@@ -374,6 +375,7 @@ Default:
374375
chart.SYZYGY: self.point_aspect_rule,
375376
chart.PART_OF_FORTUNE: self.point_aspect_rule,
376377
chart.PART_OF_SPIRIT: self.point_aspect_rule,
378+
chart.PART_OF_EROS: self.point_aspect_rule,
377379
chart.VERTEX: self.point_aspect_rule,
378380
chart.LILITH: self.point_aspect_rule,
379381
chart.TRUE_LILITH: self.point_aspect_rule,
@@ -475,6 +477,7 @@ Default:
475477
chart.SYZYGY: self.point_orbs,
476478
chart.PART_OF_FORTUNE: self.point_orbs,
477479
chart.PART_OF_SPIRIT: self.point_orbs,
480+
chart.PART_OF_EROS: self.point_orbs,
478481
chart.VERTEX: self.point_orbs,
479482
chart.LILITH: self.point_orbs,
480483
chart.TRUE_LILITH: self.point_orbs,
@@ -500,7 +503,7 @@ Default `calc.NAIBOD`.
500503

501504
### `part_formula`
502505

503-
Which formula to use when calculating the Part of Fortune or Spirit.
506+
Which formula to use when calculating the Part of Fortune / Spirit / Eros.
504507

505508
| Option | Description |
506509
| --- | --- |

immanuel/const/calc.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,11 @@
8484
SOLAR_ARC = 1
8585
DAILY_HOUSES = 2
8686

87-
""" Part of Fortune formulae. """
87+
""" Part of Fortune / Spirit / Eros formulae. """
8888
DAY_FORMULA = 0
8989
NIGHT_FORMULA = 1
9090
DAY_NIGHT_FORMULA = 2
9191

92-
""" Composite Part of Fortune calculations. """
93-
MIDPOINT = 0
94-
COMPOSITE = 1
95-
9692
""" Orb calculation when two chart objects have different orbs. """
9793
MEAN = 0
9894
MAX = 1

immanuel/const/chart.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
SYZYGY = POINT + 9
125125
PART_OF_FORTUNE = POINT + 10
126126
PART_OF_SPIRIT = POINT + 11
127+
PART_OF_EROS = POINT + 12
127128

128129
""" Fixed stars. """
129130
FIXED_STAR = 7 * TYPE_MULTIPLIER

immanuel/const/names.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
chart.SYZYGY: 'Syzygy',
136136
chart.PART_OF_FORTUNE: 'Part of Fortune',
137137
chart.PART_OF_SPIRIT: 'Part of Spirit',
138+
chart.PART_OF_EROS: 'Part of Eros',
138139
}
139140

140141
ECLIPSES = {
165 Bytes
Binary file not shown.

immanuel/locales/es_ES/LC_MESSAGES/immanuel.po

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,21 @@ msgstr "Lilith"
305305
msgid "True Lilith"
306306
msgstr "Lilith Verdadera"
307307

308+
msgid "Interpolated Lilith"
309+
msgstr "Lilith interpolada"
310+
308311
msgid "Syzygy"
309312
msgstr "Sizigia"
310313

311314
msgid "Part of Fortune"
312315
msgstr "Parte de la Fortuna"
313316

317+
msgid "Part of Spirit"
318+
msgstr "Parte del Espíritu"
319+
320+
msgid "Part of Eros"
321+
msgstr "Parte de Eros"
322+
314323

315324
# Eclipses
316325

immanuel/locales/es_ES/mappings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@
4242
chart.VERTEX: genders.MASCULINE,
4343
chart.LILITH: genders.FEMININE,
4444
chart.TRUE_LILITH: genders.FEMININE,
45+
chart.INTERPOLATED_LILITH: genders.FEMININE,
4546
chart.SYZYGY: genders.FEMININE,
4647
chart.PART_OF_FORTUNE: genders.FEMININE,
48+
chart.PART_OF_SPIRIT: genders.FEMININE,
49+
chart.PART_OF_EROS: genders.FEMININE,
4750

4851
chart.PRE_NATAL_SOLAR_ECLIPSE: genders.MASCULINE,
4952
chart.PRE_NATAL_LUNAR_ECLIPSE: genders.MASCULINE,

immanuel/locales/immanuel.pot

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,21 @@ msgstr ""
305305
msgid "True Lilith"
306306
msgstr ""
307307

308+
msgid "Interpolated Lilith"
309+
msgstr ""
310+
308311
msgid "Syzygy"
309312
msgstr ""
310313

311314
msgid "Part of Fortune"
312315
msgstr ""
313316

317+
msgid "Part of Spirit"
318+
msgstr ""
319+
320+
msgid "Part of Eros"
321+
msgstr ""
322+
314323

315324
# Eclipses
316325

56 Bytes
Binary file not shown.

immanuel/locales/pt_BR/LC_MESSAGES/immanuel.po

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,21 @@ msgstr "Lilith"
305305
msgid "True Lilith"
306306
msgstr "Lilith Verdadeira"
307307

308+
msgid "Interpolated Lilith"
309+
msgstr "Lilith interpolada"
310+
308311
msgid "Syzygy"
309312
msgstr "Sizígia"
310313

311314
msgid "Part of Fortune"
312315
msgstr "Roda da Fortuna"
313316

317+
msgid "Part of Spirit"
318+
msgstr "Parte do Espírito"
319+
320+
msgid "Part of Eros"
321+
msgstr "Parte de Eros"
322+
314323

315324
# Eclipses
316325

0 commit comments

Comments
 (0)