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 preference column for grid views #74
Merged
cvuchener
merged 15 commits into
Dwarf-Therapist:master
from
cvuchener:preference-column
May 10, 2018
Merged
Add preference column for grid views #74
cvuchener
merged 15 commits into
Dwarf-Therapist:master
from
cvuchener:preference-column
May 10, 2018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
f276955
to
73b0976
Compare
|
Preference columns can now be added through the grid view editor. Some preferences need fixing: weapons (Melee/Ranged), papers, maybe others. |
717dc5d
to
9eba936
Compare
9eba936
to
bd70004
Compare
|
updated PR:
TODO:
|
42756c0
to
cd25757
Compare
|
RoleAspect aggregate initialization need fixing (msvc2015 complains). Edit: invalid C++11, but actually valid C++14, but msvc2015 does not support it (NSDMIs for aggregate) |
cd25757
to
5074100
Compare
|
Enables multicaste features when the player race has 3 or more caste.
Move role preferences enumeration from roleDialog to a separate model so it can be reused. Raws materials, creatures, plants, and items are read when showing the role editor dialog and cached in the model.
Set the corrent ITEM_TYPE for WEAPON and TOOL instead defaulting to NONE.
Flag-based paper preferences were inexact. And some mods may have PLANT_THREAD material without PAPER_SLURRY reaction class resulting in extra invalid materials added in the "Papers" category.
Each node in the tree is a role preference. Exact role preference are sorted as children of more generic role preferences.
- Use own flag enum instead of reusing values from multiple other enums. - Add more item flags - Remove empty ItemGenericSubtype (use ItemSubtype directly instead). - Remove read_data and move its content in the constructors. - Fix tool adjectives (e.g. "Pots" -> "Large Pots") - remove unused flags in exact role preferences
simpler implementation of sibling than the default
- Pots -> Large Pots - ITEM_MELEE_WEAPON, ITEM_RANGED_WEAPON flags
5074100
to
0c18653
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.


fix #63
Preference columns cannot be added from the grid view dialog yet.