some more status condition follow-up

- Don't display 'Held' when swallowed.
- Don't display 'Held' when the hero is doing the holding; add a condition display
  entry "UHold" for that (the opt_in option is "holding")
- Allow resorting of the 'O' menu for status condition fields. Default is alphabetical, but you
  can sort by condition field ranking now.
This commit is contained in:
nhmall
2020-02-20 01:22:27 -05:00
parent cfd425d5db
commit d50c3577e9
5 changed files with 98 additions and 38 deletions

View File

@@ -78,6 +78,7 @@ enum blconditions {
bl_trapped,
bl_unconsc,
bl_woundedl,
bl_holding,
CONDITION_COUNT
};
@@ -114,7 +115,8 @@ enum blconditions {
#define BL_MASK_TRAPPED 0x04000000L
#define BL_MASK_UNCONSC 0x08000000L
#define BL_MASK_WOUNDEDL 0x10000000L
#define BL_MASK_BITS 29 /* number of mask bits that can be set */
#define BL_MASK_HOLDING 0x20000000L
#define BL_MASK_BITS 30 /* number of mask bits that can be set */
/* clang-format on */
struct conditions_t {