X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fdefines.h;h=400fe0775d5b4c80175fd6b7e9856a9336eda51a;hb=67a5a32944f12de9a30808919a49f08c5c5ffbfa;hp=64a1c83cfa70115990a8019ef5fb1be764c844e7;hpb=48678322342c5276877e71dbf28a97a52ebc120c;p=hengband%2Fhengband.git

diff --git a/src/defines.h b/src/defines.h
index 64a1c83cf..400fe0775 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -1463,6 +1463,7 @@
 #define ART_KAMUI               198
 #define ART_GOURYU              207
 #define ART_EOWYN               216
+#define ART_NANACHO             248
 
 /* Polearms */
 #define ART_THEODEN             93
@@ -1551,10 +1552,10 @@
 /* xxx */
 
 /* Body Armor */
-#define EGO_RESIST_ACID         4
-#define EGO_RESIST_ELEC         5
-#define EGO_RESIST_FIRE         6
-#define EGO_RESIST_COLD         7
+#define EGO_A_MORGUL            4
+#define EGO_A_DEMON             5
+#define EGO_DRUID               6
+#define EGO_OLOG                7
 #define EGO_RESISTANCE          8
 #define EGO_ELVENKIND           9
 #define EGO_DWARVEN             10
@@ -1572,6 +1573,8 @@
 #define EGO_ENDURANCE           20
 #define EGO_REFLECTION          21
 #define EGO_NIGHT_DAY           22
+#define EGO_S_PROTECTION        238
+#define EGO_S_DWARVEN           239
 
 /* Crowns and Helms */
 #define EGO_DARK                23
@@ -1641,14 +1644,14 @@
 #define EGO_CHAOTIC             77
 #define EGO_SHARPNESS           78
 #define EGO_EARTHQUAKES         79
-#define EGO_SLAY_ANIMAL         80
-#define EGO_SLAY_EVIL           81
-#define EGO_SLAY_UNDEAD         82
-#define EGO_SLAY_DEMON          83
-#define EGO_SLAY_ORC            84
-#define EGO_SLAY_TROLL          85
-#define EGO_SLAY_GIANT          86
-#define EGO_SLAY_DRAGON         87
+#define EGO_XXX_1               80
+#define EGO_XXX_2               81
+#define EGO_XXX_3               82
+#define EGO_XXX_4               83
+#define EGO_XXX_5               84
+#define EGO_XXX_6               85
+#define EGO_XXX_7               86
+#define EGO_WEIRD               87
 #define EGO_KILL_ANIMAL         88
 #define EGO_KILL_EVIL           89
 #define EGO_KILL_UNDEAD         90
@@ -1662,7 +1665,7 @@
 #define EGO_TRUMP               98
 #define EGO_PATTERN             99
 #define EGO_DIGGING             100
-#define EGO_SLAY_HUMAN          101
+#define EGO_DEMON               101
 #define EGO_MORGUL              102
 #define EGO_KILL_HUMAN          103
 
@@ -1769,6 +1772,7 @@
 #define EGO_AMU_GREAT           235
 #define EGO_AMU_DETECTION       236
 #define EGO_AMU_NAIVETY         237
+// MAX 239
 
 /* Activation effects for random artifacts */
 #define ACT_SUNLIGHT            1
@@ -3410,8 +3414,10 @@
 #define TR_FIXED_FLAVOR        117
 #define TR_ADD_L_CURSE         118
 #define TR_ADD_H_CURSE         119
+#define TR_DRAIN_HP            120
+#define TR_DRAIN_MANA          121
 
-#define TR_FLAG_MAX            120
+#define TR_FLAG_MAX            122
 #define TR_FLAG_SIZE           4
 
 
@@ -3432,6 +3438,7 @@
 #define TRG_RANDOM_CURSE1       0x00004000L     /* Item is Random Cursed */
 #define TRG_RANDOM_CURSE2       0x00008000L     /* Item is Random Cursed */
 #define TRG_XTRA_DICE           0x00010000L     /* Extra dice */
+#define TRG_POWERFUL            0x00020000L     /* Item has good value even if Cursed */
 
 
 #define MAX_CURSE 17
@@ -5195,6 +5202,7 @@ extern int PlayerUID;
 #define MON_JIZOTAKO      1065
 #define MON_TANUKI        1067
 #define MON_HATOPOPPO     1083
+#define MON_KOGAN         1096
 
 /* Maximum "Nazguls" number */
 #define MAX_NAZGUL_NUM 5