nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

artifact.h formatting

Browse Source 
The automated reformatting way back when left artifact.h in need
of manual fixup, particularly SPFX_HPHDAM.
This commit is contained in:
PatR
2020-10-14 09:25:45 -07:00
parent 6a443226d1
commit 42b466e87b
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/artifact.h
+27 -29
View File
@@ -1,43 +1,40 @@
/* NetHack 3.7 artifact.h $NHDT-Date: 1596498526 2020/08/03 23:48:46 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.14 $ */ /* NetHack 3.7 artifact.h $NHDT-Date: 1602692711 2020/10/14 16:25:11 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.15 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#ifndef ARTIFACT_H #ifndef ARTIFACT_H
#define ARTIFACT_H #define ARTIFACT_H
/* clang-format off */
#define SPFX_NONE 0x00000000L /* no special effects, just a bonus */ #define SPFX_NONE 0x00000000L /* no special effects, just a bonus */
#define SPFX_NOGEN 0x00000001L /* item is special, bequeathed by gods */ #define SPFX_NOGEN 0x00000001L /* item is special, bequeathed by gods */
#define SPFX_RESTR 0x00000002L /* item is restricted - can't be named */ #define SPFX_RESTR 0x00000002L /* item is restricted - can't be named */
#define SPFX_INTEL 0x00000004L /* item is self-willed - intelligent */ #define SPFX_INTEL 0x00000004L /* item is self-willed - intelligent */
#define SPFX_SPEAK 0x00000008L /* item can speak (not implemented) */ #define SPFX_SPEAK 0x00000008L /* item can speak (not implemented) */
#define SPFX_SEEK 0x00000010L /* item helps you search for things */ #define SPFX_SEEK 0x00000010L /* item helps you search for things */
#define SPFX_WARN 0x00000020L /* item warns you of danger */ #define SPFX_WARN 0x00000020L /* item warns you of danger */
#define SPFX_ATTK 0x00000040L /* item has a special attack (attk) */ #define SPFX_ATTK 0x00000040L /* item has a special attack (attk) */
#define SPFX_DEFN 0x00000080L /* item has a special defence (defn) */ #define SPFX_DEFN 0x00000080L /* item has a special defence (defn) */
#define SPFX_DRLI 0x00000100L /* drains a level from monsters */ #define SPFX_DRLI 0x00000100L /* drains a level from monsters */
#define SPFX_SEARCH 0x00000200L /* helps searching */ #define SPFX_SEARCH 0x00000200L /* helps searching */
#define SPFX_BEHEAD 0x00000400L /* beheads monsters */ #define SPFX_BEHEAD 0x00000400L /* beheads monsters */
#define SPFX_HALRES 0x00000800L /* blocks hallucinations */ #define SPFX_HALRES 0x00000800L /* blocks hallucinations */
#define SPFX_ESP 0x00001000L /* ESP (like amulet of ESP) */ #define SPFX_ESP 0x00001000L /* ESP (like amulet of ESP) */
#define SPFX_STLTH 0x00002000L /* Stealth */ #define SPFX_STLTH 0x00002000L /* Stealth */
#define SPFX_REGEN 0x00004000L /* Regeneration */ #define SPFX_REGEN 0x00004000L /* Regeneration */
#define SPFX_EREGEN 0x00008000L /* Energy Regeneration */ #define SPFX_EREGEN 0x00008000L /* Energy Regeneration */
#define SPFX_HSPDAM 0x00010000L /* 1/2 spell damage (on player) in combat */ #define SPFX_HSPDAM 0x00010000L /* 1/2 spell damage (on player) in combat */
#define SPFX_HPHDAM \ #define SPFX_HPHDAM 0x00020000L /* 1/2 physical damage (on player) in combat */
0x00020000L /* 1/2 physical damage (on player) in combat */ #define SPFX_TCTRL 0x00040000L /* Teleportation Control */
#define SPFX_TCTRL 0x00040000L /* Teleportation Control */ #define SPFX_LUCK 0x00080000L /* Increase Luck (like Luckstone) */
#define SPFX_LUCK 0x00080000L /* Increase Luck (like Luckstone) */ #define SPFX_DMONS 0x00100000L /* attack bonus on one monster type */
#define SPFX_DMONS 0x00100000L /* attack bonus on one monster type */ #define SPFX_DCLAS 0x00200000L /* attack bonus on monsters w/ symbol mtype */
#define SPFX_DCLAS 0x00200000L /* attack bonus on monsters w/ symbol mtype \ #define SPFX_DFLAG1 0x00400000L /* attack bonus on monsters w/ mflags1 flag */
*/ #define SPFX_DFLAG2 0x00800000L /* attack bonus on monsters w/ mflags2 flag */
#define SPFX_DFLAG1 0x00400000L /* attack bonus on monsters w/ mflags1 flag \ #define SPFX_DALIGN 0x01000000L /* attack bonus on non-aligned monsters */
*/ #define SPFX_DBONUS 0x01F00000L /* attack bonus mask */
#define SPFX_DFLAG2 0x00800000L /* attack bonus on monsters w/ mflags2 flag \ #define SPFX_XRAY 0x02000000L /* gives X-RAY vision to player */
*/
#define SPFX_DALIGN 0x01000000L /* attack bonus on non-aligned monsters */
#define SPFX_DBONUS 0x01F00000L /* attack bonus mask */
#define SPFX_XRAY 0x02000000L /* gives X-RAY vision to player */
#define SPFX_REFLECT 0x04000000L /* Reflection */ #define SPFX_REFLECT 0x04000000L /* Reflection */
#define SPFX_PROTECT 0x08000000L /* Protection */ #define SPFX_PROTECT 0x08000000L /* Protection */
@@ -52,7 +49,7 @@ struct artifact {
aligntyp alignment; /* alignment of bequeathing gods */ aligntyp alignment; /* alignment of bequeathing gods */
short role; /* character role associated with */ short role; /* character role associated with */
short race; /* character race associated with */ short race; /* character race associated with */
long cost; /* price when sold to hero (default 100 x base cost) */ long cost; /* price when sold to hero (default 100 x base cost) */
char acolor; /* color to use if artifact 'glows' */ char acolor; /* color to use if artifact 'glows' */
}; };
@@ -69,4 +66,5 @@ enum invoke_prop_types {
CREATE_AMMO CREATE_AMMO
}; };
/* clang-format on */
#endif /* ARTIFACT_H */ #endif /* ARTIFACT_H */