Clean up paired expressions and Krea ages

This commit is contained in:
2026-06-24 12:16:23 +02:00
parent ab30bdafa8
commit 543e2feab7
2 changed files with 18 additions and 2 deletions
+11 -1
View File
@@ -523,6 +523,14 @@ def _choose_text(rng: random.Random, items: list[Any]) -> str:
return _item_text(item)
def _choose_distinct_text(rng: random.Random, items: list[Any], first_text: str) -> str:
first_text = _item_text(first_text).lower()
distinct = [item for item in items if _item_text(item).lower() != first_text]
if not distinct:
return ""
return _choose_text(rng, distinct)
def _choose_pair(rng: random.Random, items: list[Any]) -> tuple[str, str]:
return _pair_from(_weighted_choice(rng, items))
@@ -1803,7 +1811,9 @@ def _build_custom_row(
)
expression = _choose_text(expression_rng, expression_entries)
if subject_type in ("couple", "group") and ";" not in expression:
expression = f"{expression}; {_choose_text(expression_rng, expression_entries)}"
secondary_expression = _choose_distinct_text(expression_rng, expression_entries, expression)
if secondary_expression:
expression = f"{expression}; {secondary_expression}"
composition = _choose_text(
composition_rng,
_compatible_entries(_composition_pool(category, subcategory, item, subject_type), women_count, men_count),