#define H_VER_MAJOR 2
#define H_VER_MINOR 1
#define H_VER_PATCH 2
-#define H_VER_EXTRA 1
+#define H_VER_EXTRA 2
#define ANGBAND_2_8_1
#define ART_PALANTIR 15
#define ART_STONE_LORE 17
#define ART_FLY_STONE 147
-
+#define ART_ORB_OF_FATE 245
/* Amulets */
#define ART_CARLAMMAS 4
#define ART_INGWE 5
#define ART_GHB 192
#define ART_DASAI 200
#define ART_KESHO 204
+#define ART_MILIM 246
/* Shields */
#define ART_THORIN 30
#define ART_KAMUI 198
#define ART_GOURYU 207
#define ART_EOWYN 216
+#define ART_NANACHO 248
/* Polearms */
#define ART_THEODEN 93
/* 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
#define EGO_PERMANENCE 11
#define EGO_YOIYAMI 12
-/* xxx */
+#define EGO_URUKISH 13
/* xxx */
/* xxx */
#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
-#define EGO_INTELLIGENCE 24
-#define EGO_WISDOM 25
-#define EGO_BEAUTY 26
+#define EGO_BRILLIANCE 24
+#define EGO_H_PROTECTION 25
+//#define EGO_BEAUTY 26
#define EGO_MAGI 27
#define EGO_MIGHT 28
#define EGO_LORDLINESS 29
#define EGO_TELEPATHY 33
#define EGO_REGENERATION 34
#define EGO_TELEPORTATION 35
-#define EGO_STUPIDITY 36
-#define EGO_NAIVETY 37
-#define EGO_UGLINESS 38
+#define EGO_FOOL 36
+//#define EGO_NAIVETY 37
+//#define EGO_UGLINESS 38
#define EGO_SICKLINESS 39
/* Cloaks */
#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
#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
#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
#define ACT_BR_FIRE 38
#define ACT_BR_COLD 39
#define ACT_BR_DRAGON 40
-/* 33 - 50 unused */
+#define ACT_BA_FIRE_4 41
+#define ACT_BA_NUKE_1 42
+/* 42 - 50 unused */
#define ACT_CONFUSE 51
#define ACT_SLEEP 52
#define ACT_QUAKE 53
#define ACT_DETECT_ALL_MONS 137
#define ACT_ULTIMATE_RESIST 138
/* 127 -> unused */
+#define ACT_STRAIN_HASTE 247
+#define ACT_TELEPORT_LEVEL 248
+#define ACT_GRAND_CROSS 249
#define ACT_CAST_OFF 250
#define ACT_FISHING 251
#define ACT_INROU 252
#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
#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
#define get_feat_mimic(C) \
(f_info[(C)->mimic ? (C)->mimic : (C)->feat].mimic)
-#define update_playtime() \
-{\
- u32b tmp;\
- tmp = time(NULL);\
- playtime += (tmp - start_time);\
- start_time = tmp;\
-}
-
/*
* Hack -- Prepare to use the "Secure" routines
*/
#define MON_JIZOTAKO 1065
#define MON_TANUKI 1067
#define MON_HATOPOPPO 1083
+#define MON_KOGAN 1096
/* Maximum "Nazguls" number */
#define MAX_NAZGUL_NUM 5