expand the pool of status condition fields
Most of the additional ones are "opt-in" meaning that unless you add them to your config file to enable them, they won't show up. Two that aren't "opt-in", but can be "opted-out" (as can they all) are cond_grab (for an eel grabbing you and drowing being imminent) and cond_lava which leads to a fatality. All the ones that already existed are "opt-out" options, meaning that they will still show if you do nothing. Here's the complete list of status conditions following this patch: config option internal default mask id mask text1 tex2 text3 "cond_barehanded" bl_bareh opt_in BL_MASK_BAREH 0x00000001L Bare Bar Bh "cond_blind" bl_blind opt_out BL_MASK_BLIND 0x00000002L Blind Blnd Bl "cond_busy" bl_busy opt_in BL_MASK_BUSY 0x00000004L Busy Bsy By "cond_conf" bl_conf opt_out BL_MASK_CONF 0x00000008L Conf Cnf Cf "cond_deaf" bl_deaf opt_out BL_MASK_DEAF 0x00000010L Deaf Def Df "cond_iron" bl_elf_iron opt_out BL_MASK_ELF_IRON 0x00000020L Iron Irn Fe "cond_fly" bl_fly opt_out BL_MASK_FLY 0x00000040L Fly Fly Fl "cond_foodPois" bl_foodpois opt_out BL_MASK_FOODPOIS 0x00000080L FoodPois Fpois Poi "cond_glowhands" bl_glowhands opt_in BL_MASK_GLOWHANDS 0x00000100L Glow Glo Gl "cond_grab" bl_grab opt_out BL_MASK_GRAB 0x00000200L Grab Grb Gr "cond_hallu" bl_hallu opt_out BL_MASK_HALLU 0x00000400L Hallu Hal Hl "cond_held" bl_held opt_in BL_MASK_HELD 0x00000800L Held Hld Hd "cond_ice" bl_icy opt_in BL_MASK_ICY 0x00001000L Icy Icy Ic "cond_lava" bl_inlava opt_out BL_MASK_INLAVA 0x00002000L Lava Lav La "cond_lev" bl_lev opt_out BL_MASK_LEV 0x00004000L Lev Lev Lv "cond_paralyze" bl_parlyz opt_in BL_MASK_PARLYZ 0x00008000L Parlyz Para Par "cond_ride" bl_ride opt_out BL_MASK_RIDE 0x00010000L Ride Rid Rd "cond_sleep" bl_sleeping opt_in BL_MASK_SLEEPING 0x00020000L Zzz Zzz Zz "cond_slime" bl_slime opt_out BL_MASK_SLIME 0x00040000L Slime Slim Slm "cond_slip" bl_slippery opt_in BL_MASK_SLIPPERY 0x00080000L Slip Sli Sl "cond_stone" bl_stone opt_out BL_MASK_STONE 0x00100000L Stone Ston Sto "cond_strngl" bl_strngl opt_out BL_MASK_STRNGL 0x00200000L Strngl Stngl Str "cond_stun" bl_stun opt_out BL_MASK_STUN 0x00400000L Stun Stun St "cond_submerged" bl_submerged opt_in BL_MASK_SUBMERGED 0x00800000L Sub Sub Sw "cond_termIll" bl_termill opt_out BL_MASK_TERMILL 0x01000000L TermIll Ill Ill "cond_tethered" bl_tethered opt_in BL_MASK_TETHERED 0x02000000L Teth Tth Te "cond_trap" bl_trapped opt_in BL_MASK_TRAPPED 0x04000000L Trap Trp Tr "cond_unconscious" bl_unconsc opt_in BL_MASK_UNCONSC 0x08000000L Out Out KO "cond_woundedl" bl_woundedl opt_in BL_MASK_WOUNDEDL 0x10000000L Legs Leg Lg
This commit is contained in:
nhmall
@@ -3691,25 +3691,8 @@ static unsigned long *tty_colormasks;
|
||||
static long tty_condition_bits;
|
||||
static struct tty_status_fields tty_status[2][MAXBLSTATS]; /* 2: NOW,BEFORE */
|
||||
static int hpbar_percent, hpbar_color;
|
||||
static struct condition_t {
|
||||
long mask;
|
||||
const char *text[3]; /* 3: potential display vals, progressively shorter */
|
||||
} conditions[] = {
|
||||
/* The sequence order of these matters */
|
||||
{ BL_MASK_STONE, { "Stone", "Ston", "Sto" } },
|
||||
{ BL_MASK_SLIME, { "Slime", "Slim", "Slm" } },
|
||||
{ BL_MASK_STRNGL, { "Strngl", "Stngl", "Str" } },
|
||||
{ BL_MASK_FOODPOIS, { "FoodPois", "Fpois", "Poi" } },
|
||||
{ BL_MASK_TERMILL, { "TermIll" , "Ill", "Ill" } },
|
||||
{ BL_MASK_BLIND, { "Blind", "Blnd", "Bl" } },
|
||||
{ BL_MASK_DEAF, { "Deaf", "Def", "Df" } },
|
||||
{ BL_MASK_STUN, { "Stun", "Stun", "St" } },
|
||||
{ BL_MASK_CONF, { "Conf", "Cnf", "Cf" } },
|
||||
{ BL_MASK_HALLU, { "Hallu", "Hal", "Hl" } },
|
||||
{ BL_MASK_LEV, { "Lev", "Lev", "Lv" } },
|
||||
{ BL_MASK_FLY, { "Fly", "Fly", "Fl" } },
|
||||
{ BL_MASK_RIDE, { "Ride", "Rid", "Rd" } },
|
||||
};
|
||||
extern const struct conditions_t conditions[CONDITION_COUNT];
|
||||
|
||||
static const char *encvals[3][6] = {
|
||||
{ "", "Burdened", "Stressed", "Strained", "Overtaxed", "Overloaded" },
|
||||
{ "", "Burden", "Stress", "Strain", "Overtax", "Overload" },
|
||||
@@ -3833,19 +3816,36 @@ boolean enable;
|
||||
* -- ptr is usually a "char *", unless fldindex is BL_CONDITION.
|
||||
* If fldindex is BL_CONDITION, then ptr is a long value with
|
||||
* any or none of the following bits set (from botl.h):
|
||||
* BL_MASK_STONE 0x00000001L
|
||||
* BL_MASK_SLIME 0x00000002L
|
||||
* BL_MASK_STRNGL 0x00000004L
|
||||
* BL_MASK_FOODPOIS 0x00000008L
|
||||
* BL_MASK_TERMILL 0x00000010L
|
||||
* BL_MASK_BLIND 0x00000020L
|
||||
* BL_MASK_DEAF 0x00000040L
|
||||
* BL_MASK_STUN 0x00000080L
|
||||
* BL_MASK_CONF 0x00000100L
|
||||
* BL_MASK_HALLU 0x00000200L
|
||||
* BL_MASK_LEV 0x00000400L
|
||||
* BL_MASK_FLY 0x00000800L
|
||||
* BL_MASK_RIDE 0x00001000L
|
||||
* BL_MASK_BAREH 0x00000001L
|
||||
* BL_MASK_BLIND 0x00000002L
|
||||
* BL_MASK_BUSY 0x00000004L
|
||||
* BL_MASK_CONF 0x00000008L
|
||||
* BL_MASK_DEAF 0x00000010L
|
||||
* BL_MASK_ELF_IRON 0x00000020L
|
||||
* BL_MASK_FLY 0x00000040L
|
||||
* BL_MASK_FOODPOIS 0x00000080L
|
||||
* BL_MASK_GLOWHANDS 0x00000100L
|
||||
* BL_MASK_GRAB 0x00000200L
|
||||
* BL_MASK_HALLU 0x00000400L
|
||||
* BL_MASK_HELD 0x00000800L
|
||||
* BL_MASK_ICY 0x00001000L
|
||||
* BL_MASK_INLAVA 0x00002000L
|
||||
* BL_MASK_LEV 0x00004000L
|
||||
* BL_MASK_PARLYZ 0x00008000L
|
||||
* BL_MASK_RIDE 0x00010000L
|
||||
* BL_MASK_SLEEPING 0x00020000L
|
||||
* BL_MASK_SLIME 0x00040000L
|
||||
* BL_MASK_SLIPPERY 0x00080000L
|
||||
* BL_MASK_STONE 0x00100000L
|
||||
* BL_MASK_STRNGL 0x00200000L
|
||||
* BL_MASK_STUN 0x00400000L
|
||||
* BL_MASK_SUBMERGED 0x00800000L
|
||||
* BL_MASK_TERMILL 0x01000000L
|
||||
* BL_MASK_TETHERED 0x02000000L
|
||||
* BL_MASK_TRAPPED 0x04000000L
|
||||
* BL_MASK_UNCONSC 0x08000000L
|
||||
* BL_MASK_WOUNDEDL 0x10000000L
|
||||
*
|
||||
* -- The value passed for BL_GOLD usually includes an encoded leading
|
||||
* symbol for GOLD "\GXXXXNNNN:nnn". If the window port needs to use
|
||||
* the textual gold amount without the leading "$:" the port will
|
||||
|
||||
Reference in New Issue
Block a user