X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fdefines.h;h=400fe0775d5b4c80175fd6b7e9856a9336eda51a;hb=67a5a32944f12de9a30808919a49f08c5c5ffbfa;hp=fcf31c268d525ad53093885b6b10dd53d8200cea;hpb=6a3720a0a1d5a23a4774bef037191669506701bd;p=hengband%2Fhengband.git diff --git a/src/defines.h b/src/defines.h index fcf31c268..400fe0775 100644 --- a/src/defines.h +++ b/src/defines.h @@ -57,7 +57,7 @@ #define FAKE_VERSION 0 #define FAKE_VER_MAJOR 12 #define FAKE_VER_MINOR 1 -#define FAKE_VER_PATCH 1 +#define FAKE_VER_PATCH 3 /* @@ -75,8 +75,8 @@ */ #define H_VER_MAJOR 2 #define H_VER_MINOR 1 -#define H_VER_PATCH 1 -#define H_VER_EXTRA 0 +#define H_VER_PATCH 2 +#define H_VER_EXTRA 2 #define ANGBAND_2_8_1 @@ -1291,7 +1291,7 @@ #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 @@ -1342,6 +1342,7 @@ #define ART_GHB 192 #define ART_DASAI 200 #define ART_KESHO 204 +#define ART_MILIM 246 /* Shields */ #define ART_THORIN 30 @@ -1462,6 +1463,7 @@ #define ART_KAMUI 198 #define ART_GOURYU 207 #define ART_EOWYN 216 +#define ART_NANACHO 248 /* Polearms */ #define ART_THEODEN 93 @@ -1550,16 +1552,16 @@ /* 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 */ @@ -1571,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 @@ -1640,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 @@ -1661,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 @@ -1768,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 @@ -1803,7 +1808,14 @@ #define ACT_BA_MANA 31 #define ACT_PESTICIDE 32 #define ACT_BLINDING_LIGHT 33 -/* 34 - 50 unused */ +#define ACT_BIZARRE 34 +#define ACT_CAST_BA_STAR 35 +#define ACT_BLADETURNER 36 +#define ACT_BA_ACID_1 37 +#define ACT_BR_FIRE 38 +#define ACT_BR_COLD 39 +#define ACT_BR_DRAGON 40 +/* 33 - 50 unused */ #define ACT_CONFUSE 51 #define ACT_SLEEP 52 #define ACT_QUAKE 53 @@ -1812,6 +1824,8 @@ #define ACT_BANISH_EVIL 56 #define ACT_GENOCIDE 57 #define ACT_MASS_GENO 58 +#define ACT_SCARE_AREA 59 +#define ACT_AGGRAVATE 60 /* 59 - 64 unused */ #define ACT_CHARM_ANIMAL 65 #define ACT_CHARM_UNDEAD 66 @@ -1824,6 +1838,8 @@ #define ACT_SUMMON_DEMON 73 #define ACT_SUMMON_UNDEAD 74 #define ACT_SUMMON_HOUND 75 +#define ACT_SUMMON_DAWN 76 +#define ACT_SUMMON_OCTOPUS 77 /* 76 - 80 unused */ #define ACT_CHOIR_SINGS 80 #define ACT_CURE_LW 81 @@ -1868,14 +1884,28 @@ #define ACT_DIM_DOOR 124 #define ACT_TELEPORT 125 #define ACT_RECALL 126 -#define ACT_TELEKINESIS 127 -#define ACT_DETECT_UNIQUE 128 +#define ACT_JUDGE 127 +#define ACT_TELEKINESIS 128 +#define ACT_DETECT_UNIQUE 129 +#define ACT_ESCAPE 130 +#define ACT_DISP_CURSE_XTRA 131 +#define ACT_BRAND_FIRE_BOLTS 132 +#define ACT_RECHARGE_XTRA 133 +#define ACT_LORE 134 +#define ACT_SHIKOFUMI 135 +#define ACT_PHASE_DOOR 136 +#define ACT_DETECT_ALL_MONS 137 +#define ACT_ULTIMATE_RESIST 138 /* 127 -> unused */ - -#define ACT_BRAND_FIRE_BOLTS 253 -#define ACT_JUDGE 254 -#define ACT_BIZARRE 255 - +#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 ACT_MURAMASA 253 +#define ACT_BLOODY_MOON 254 +#define ACT_CRIMSON 255 /*** Object "tval" and "sval" codes ***/ @@ -2452,6 +2482,8 @@ #define SV_SCROLL_ARTIFACT 52 #define SV_SCROLL_RESET_RECALL 53 #define SV_SCROLL_SUMMON_KIN 54 +#define SV_SCROLL_AMUSEMENT 55 +#define SV_SCROLL_STAR_AMUSEMENT 56 /* The "sval" codes for TV_POTION */ #define SV_POTION_WATER 0 @@ -2609,7 +2641,7 @@ #define CAVE_MASK (CAVE_FLOOR | CAVE_EXTRA | CAVE_INNER | CAVE_OUTER | CAVE_SOLID | CAVE_VAULT) /* Used only after cave generation */ -#define CAVE_XXXX1 0x0200 +#define CAVE_KNOWN 0x0200 /* Directly viewed or map detected flag */ #define CAVE_NOTE 0x0400 /* Flag for delayed visual update (needs note_spot()) */ #define CAVE_REDRAW 0x0800 /* Flag for delayed visual update (needs lite_spot()) */ #define CAVE_OBJECT 0x1000 /* Mirror, glyph, etc. */ @@ -3336,7 +3368,7 @@ #define TR_WARNING 72 /* Warning */ #define TR_HIDE_TYPE 73 /* Hide "pval" description */ #define TR_SHOW_MODS 74 /* Always show Tohit/Todam */ -#define TR_XXX1 75 /* XXX1 */ +#define TR_SLAY_GOOD 75 #define TR_LEVITATION 76 /* Feather Falling */ #define TR_LITE 77 /* Permanent Light */ #define TR_SEE_INVIS 78 /* See Invisible */ @@ -3356,7 +3388,7 @@ #define TR_BLESSED 92 /* Item is Blessed */ #define TR_ES_ATTACK 93 /* Fake flag for Smith */ #define TR_ES_AC 94 /* Fake flag for Smith */ -#define TR_XXX5 95 +#define TR_KILL_GOOD 95 #define TR_KILL_ANIMAL 96 #define TR_KILL_EVIL 97 @@ -3380,8 +3412,12 @@ #define TR_ESP_UNIQUE 115 #define TR_FULL_NAME 116 #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 118 +#define TR_FLAG_MAX 122 #define TR_FLAG_SIZE 4 @@ -3402,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 @@ -3765,7 +3802,7 @@ #define RF7_SELF_LITE_2 0x00000800 /* Monster lights itself */ #define RF7_GUARDIAN 0x00001000 /* Guardian of a dungeon */ #define RF7_CHAMELEON 0x00002000 /* Chameleon can change */ -#define RF7_KILL_EXP 0x00004000 /* No exp until you kill it */ +#define RF7_XXXX4XXX 0x00004000 /* Now Empty */ #define RF7_TANUKI 0x00008000 /* Tanuki disguise */ #define RF7_HAS_DARK_1 0x00010000 /* Monster carries darkness */ #define RF7_SELF_DARK_1 0x00020000 /* Monster darkens itself */ @@ -4408,14 +4445,6 @@ #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 */ @@ -4628,8 +4657,9 @@ extern int PlayerUID; #define BACT_POKER 43 #define BACT_IDENT_ONE 44 #define BACT_RECHARGE_ALL 45 -#define BACT_EVAL_AC 46 -#define MAX_BACT 47 +#define BACT_EVAL_AC 46 +#define BACT_BROKEN_WEAPON 47 +#define MAX_BACT 48 /* * Quest status @@ -5172,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 @@ -5304,7 +5335,7 @@ extern int PlayerUID; #define DF1_GLASS_DOOR 0x00000200L #define DF1_CAVE 0x00000400L #define DF1_CAVERN 0x00000800L -#define DF1_XXX12 0x00001000L +#define DF1_ARCADE 0x00001000L #define DF1_XXX13 0x00002000L #define DF1_XXX14 0x00004000L #define DF1_XXX15 0x00008000L @@ -5604,3 +5635,12 @@ extern int PlayerUID; #define HEX_SHADOW_MOVE 29 #define HEX_ANTI_MAGIC 30 #define HEX_REVENGE 31 + +/* + Language selection macro +*/ +#ifdef JP +#define _(JAPANESE,ENGLISH) (JAPANESE) +#else +#define _(JAPANESE,ENGLISH) (ENGLISH) +#endif