Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add detailed commitment for sexual orientation #51

Merged
merged 3 commits into from Jan 17, 2018

Conversation

cvuchener
Copy link
Contributor

  • Use gender icons with background for commitment level
  • Add Likes/Will marry text in gender/orientation description
  • Add same_sex_commitment/other_sex_commitment accessors for scripts
  • Keep simple orientation for animals (no background, no extra description)

@feelotraveller
Copy link

The icons look fine to me.

I couldn't find a sort by gender option. Thought you posted an image of it on Bay12. Have I just missed it? I certainly remember demand for sorting by sex in the past - some players wishing to keep females out of their military (babies).

There will be a demand for showing simplified (sex only) icons. Particularly since some players wish not to 'cheat'. Grid options, show simplified gender icons/show advanced gender icons.

@cvuchener
Copy link
Contributor Author

I think I will replace the "Show Gender Icons" check box with a drop down menu: None/Sex only/Orientation.

@cvuchener
Copy link
Contributor Author

The group option is called "Gender & Orientation". For very specific needs of filtering, there are scripts.

@feelotraveller
Copy link

Drop down menu 👍 Found the group option.

A semi-bug report, not sure how important. When the orientation flags are changed by DFHack to be a non-standard set (e.g. likes males, will marry males) DT will crash on read.

ERROR	core	Invalid interest in suffix [/hdd/down/temp/Dwarf-Therapist-sex-icons/src/dwarf.cpp:456] (sex_interest_icon_suffix)
Segmentation fault

@cvuchener
Copy link
Contributor Author

The error message is expected, not the crash.

 - Use gender icons with background for commitment level
 - Add Likes/Will marry text in gender/orientation description
 - Add same_sex_commitment/other_sex_commitment accessors for scripts
 - Keep simple orientation for animals (no background, no extra description)
They replace "Gender & Orientation" group.
@cvuchener
Copy link
Contributor Author

I fixed the crash and changed the groups.

The "Sex" option groups by sex only (Female/Male/Unknown). The "Sex Orientation" option group by general sexual orientation (sex + simple orientation (asexual/hetero/homo/bi)). "Sexual Orientation" sorts but does not group by Likes/Marry.

I still have to add the "show nothing/sex only/detailed orientation" option. The current checkbox only changes the display of the icon in the grid view. The Dwarf Detail window always shows the icon. What should I do with the dwarf details when "show nothing" is selected? Or should I use two different settings: "show icon in grid view" and "show detailed sexual orientation"?

@feelotraveller
Copy link

The possibility to show nothing on the grid view while showing either sex or detailed icons on the dwarf details would make the two setting approach superior, I think.

Add combo box for choosing to display sexual orientation and commitment.
@cvuchener
Copy link
Contributor Author

done

@cvuchener cvuchener merged commit 62d15e2 into Dwarf-Therapist:master Jan 17, 2018
@cvuchener cvuchener deleted the sex-icons branch January 19, 2018 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants