dc00df935b
Add threshold relationships <= and >= so that the change to make < and > perform their expected comparison can be resolved. "Point release shouldn't force players to update their config files" does not carry sufficient weight given that they already had to do that to turn on status highlighting when going from 3.6.0 to 3.6.1. The 3.6.2 release notes can warn them about the need to update their status highlight options if they're currently using '<' and/or '>'. Entering new hilite rules via the 'O' command accepted '=' prefix for numbers, but rules from config files did not. Now they do. The '=' prefix is optional in both situations. With 'O', percent rules and absolute rules had separate menu entries so picking one was already choosing the rule type, but entering a numeric value without percent sign (for percent) or with one (for absolute) would change the type on the fly. If someone has already picked percentage they shouldn't be required to append '%' to the digits, so that is now optional. If explicitly included with the number after having picked absolute, the value is rejected. It is trivial to back up in those menus and choose the alternate type if someone changes his/her mind part way through. If a status field has both persistent (percent, absolute, always) and temporary highlights (up, down, changed), give the temporary one precedence when the value has changed. To do that with 3.6.1, the rules for temporary had to follow the ones for persistent highlights since whichever matched last was the one used. Now their order relative to each other doesn't matter. If a value increases and there is both an 'up' rule and a 'changed' rule, the more specific 'up' takes precedence, regardless of their relative order; likewise for decreases and 'down' vs 'changed'. There were a couple more tweaks needed to support negative values; I overlooked the 'O' menu handling before. >-1% and <101% now work for both the config file and interactive adding via 'O' methods of defining highlight rules, although new >=0% and <=100% will be clearer to anyone examining a rule set. 'enum relationship' was forcing LT_VALUE to be -1 but that fact was never utilized anywhere, and the code was using magic number -2 to mean "no relationship yet". This adds NO_LTEQGT to replace the latter and gives it value -1. EQ_VALUE is still 0 so effectively the default if a highlight hasn't been fully set up yet. LT_VALUE is now just another positive value along with GT_VALUE, LE_VALUE, &c. The Guidebook hasn't caught up with the code yet. The rule choosing code used when deciding how to highlight something only supports 'int' fields and relies on 'long' having the same bits. It needs to be extended to support 'long' properly. Fixing should be straightforward (except maybe for the initialization of min/max best fit handling) but this doesn't address that. Also, data type for encumbrance/carrying-capacity should be changed from unsigned to plain int so that no extra handling for just one field will be needed.
102 lines
3.7 KiB
C
102 lines
3.7 KiB
C
/* NetHack 3.6 botl.h $NHDT-Date: 1526907469 2018/05/21 12:57:49 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.19 $ */
|
|
/* Copyright (c) Michael Allison, 2003 */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#ifndef BOTL_H
|
|
#define BOTL_H
|
|
|
|
/* MAXCO must hold longest uncompressed status line, and must be larger
|
|
* than COLNO
|
|
*
|
|
* longest practical second status line at the moment is
|
|
Astral Plane \GXXXXNNNN:123456 HP:1234(1234) Pw:1234(1234) AC:-127
|
|
Xp:30/123456789 T:123456 Stone Slime Strngl FoodPois TermIll
|
|
Satiated Overloaded Blind Deaf Stun Conf Hallu Lev Ride
|
|
* -- or about 185 characters. '$' gets encoded even when it
|
|
* could be used as-is. The first five status conditions are fatal
|
|
* so it's rare to have more than one at a time.
|
|
*
|
|
* When the full line is wider than the map, the basic status line
|
|
* formatting will move less important fields to the end, so if/when
|
|
* truncation is necessary, it will chop off the least significant
|
|
* information.
|
|
*/
|
|
#if COLNO <= 160
|
|
#define MAXCO 200
|
|
#else
|
|
#define MAXCO (COLNO + 40)
|
|
#endif
|
|
|
|
enum statusfields {
|
|
BL_CHARACTERISTICS = -2, /* alias for BL_STR..BL_CH */
|
|
BL_FLUSH = -1, BL_TITLE = 0,
|
|
BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, /* 1..6 */
|
|
BL_ALIGN, BL_SCORE, BL_CAP, BL_GOLD, BL_ENE, BL_ENEMAX, /* 7..12 */
|
|
BL_XP, BL_AC, BL_HD, BL_TIME, BL_HUNGER, BL_HP, /* 13..18 */
|
|
BL_HPMAX, BL_LEVELDESC, BL_EXP, BL_CONDITION /* 19..22 */
|
|
};
|
|
|
|
enum relationships { NO_LTEQGT = -1,
|
|
EQ_VALUE, LT_VALUE, LE_VALUE,
|
|
GE_VALUE, GT_VALUE, TXT_VALUE };
|
|
|
|
#define MAXBLSTATS (BL_CONDITION + 1)
|
|
|
|
#define BEFORE 0
|
|
#define NOW 1
|
|
|
|
/* Boolean condition bits for the condition mask */
|
|
|
|
/* clang-format off */
|
|
#define BL_MASK_STONE 0x00000001L
|
|
#define BL_MASK_SLIME 0x00000002L
|
|
#define BL_MASK_STRNGL 0x00000004L
|
|
#define BL_MASK_FOODPOIS 0x00000008L
|
|
#define BL_MASK_TERMILL 0x00000010L
|
|
#define BL_MASK_BLIND 0x00000020L
|
|
#define BL_MASK_DEAF 0x00000040L
|
|
#define BL_MASK_STUN 0x00000080L
|
|
#define BL_MASK_CONF 0x00000100L
|
|
#define BL_MASK_HALLU 0x00000200L
|
|
#define BL_MASK_LEV 0x00000400L
|
|
#define BL_MASK_FLY 0x00000800L
|
|
#define BL_MASK_RIDE 0x00001000L
|
|
/* clang-format on */
|
|
|
|
#define REASSESS_ONLY TRUE
|
|
|
|
/* #ifdef STATUS_HILITES */
|
|
/* hilite status field behavior - coloridx values */
|
|
#define BL_HILITE_NONE -1 /* no hilite of this field */
|
|
#define BL_HILITE_INVERSE -2 /* inverse hilite */
|
|
#define BL_HILITE_BOLD -3 /* bold hilite */
|
|
/* or any CLR_ index (0 - 15) */
|
|
#define BL_TH_NONE 0
|
|
#define BL_TH_VAL_PERCENTAGE 100 /* threshold is percentage */
|
|
#define BL_TH_VAL_ABSOLUTE 101 /* threshold is particular value */
|
|
#define BL_TH_UPDOWN 102 /* threshold is up or down change */
|
|
#define BL_TH_CONDITION 103 /* threshold is bitmask of conditions */
|
|
#define BL_TH_TEXTMATCH 104 /* threshold text value to match against */
|
|
#define BL_TH_ALWAYS_HILITE 105 /* highlight regardless of value */
|
|
|
|
|
|
#define HL_ATTCLR_DIM CLR_MAX + 0
|
|
#define HL_ATTCLR_BLINK CLR_MAX + 1
|
|
#define HL_ATTCLR_ULINE CLR_MAX + 2
|
|
#define HL_ATTCLR_INVERSE CLR_MAX + 3
|
|
#define HL_ATTCLR_BOLD CLR_MAX + 4
|
|
#define BL_ATTCLR_MAX CLR_MAX + 5
|
|
|
|
enum hlattribs { HL_UNDEF = 0x00,
|
|
HL_NONE = 0x01,
|
|
HL_BOLD = 0x02,
|
|
HL_INVERSE = 0x04,
|
|
HL_ULINE = 0x08,
|
|
HL_BLINK = 0x10,
|
|
HL_DIM = 0x20 };
|
|
/* #endif STATUS_HILITES */
|
|
|
|
extern const char *status_fieldnames[]; /* in botl.c */
|
|
|
|
#endif /* BOTL_H */
|