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 preference column for grid views #74

Merged
merged 15 commits into from May 10, 2018

Conversation

cvuchener
Copy link
Contributor

fix #63

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

@cvuchener cvuchener added the WIP label Mar 30, 2018
@cvuchener
Copy link
Contributor Author

with text mode
prefcoltext

with box mode
prefcolbox

@cvuchener cvuchener force-pushed the preference-column branch 3 times, most recently from f276955 to 73b0976 Compare April 16, 2018 09:45
@cvuchener
Copy link
Contributor Author

Preference columns can now be added through the grid view editor.

Some preferences need fixing: weapons (Melee/Ranged), papers, maybe others.

@cvuchener cvuchener force-pushed the preference-column branch 2 times, most recently from 717dc5d to 9eba936 Compare April 20, 2018 11:36
@cvuchener
Copy link
Contributor Author

updated PR:

  • replaced red "0" with blank cells
  • added header title "preference" in the role preference model
  • new preference tree where node are generic preferences and leaves are exact preferences
  • new item flags and tool adjective fix

TODO:

  • review current categories and preference filter (for adding only possible exact preferences)
  • update preferences in current inis

@cvuchener cvuchener force-pushed the preference-column branch 2 times, most recently from 42756c0 to cd25757 Compare May 1, 2018 14:42
@cvuchener
Copy link
Contributor Author

cvuchener commented May 2, 2018

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)

@cvuchener
Copy link
Contributor Author

  • Added warning when preference column needs updating
  • Add role preference updating for new paper preference and weapon melee/ranged flags
  • update game_data.ini preferences (large pots and weapon flags)
  • Fixed msvc215 compilation

@cvuchener cvuchener removed the WIP label May 6, 2018
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
@cvuchener cvuchener merged commit 9e35344 into Dwarf-Therapist:master May 10, 2018
@cvuchener cvuchener deleted the preference-column branch May 12, 2018 08:24
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.

Add grid view columns for preferences
1 participant