Thrown torch's dice is changed

[hengband/hengband.git] / src / defines.h

diff --git a/src/defines.h b/src/defines.h
index f890e8b..336f359 100644 (file)
--- 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 2
 
 
 /*
@@ -75,7 +75,7 @@
  */
 #define H_VER_MAJOR 2
 #define H_VER_MINOR 1
-#define H_VER_PATCH 1
+#define H_VER_PATCH 2
 #define H_VER_EXTRA 0
 
 
@@ -1806,6 +1806,10 @@
 #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
@@ -1884,7 +1888,11 @@
 #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_CAST_OFF            250
 #define ACT_FISHING             251
 #define ACT_INROU               252
 #define ACT_MURAMASA            253
@@ -2466,6 +2474,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
@@ -2623,7 +2633,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. */
@@ -3394,8 +3404,10 @@
 #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_FLAG_MAX            118
+#define TR_FLAG_MAX            120
 #define TR_FLAG_SIZE           4
 
 
@@ -4642,8 +4654,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
@@ -5318,7 +5331,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
@@ -5618,3 +5631,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