X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fdefines.h;h=2ad7911212eef6d84de7c6d99b1e03aa145d3721;hb=cc46d29361b19e088e7cce230cbf4e3ca507922c;hp=ca6d50c1154aff4b0b2e255c5be1f8a2c64bc0b1;hpb=6363bd3ae38352bcb579cc62bbbd9bd148123d52;p=hengband%2Fhengband.git diff --git a/src/defines.h b/src/defines.h index ca6d50c11..2ad791121 100644 --- a/src/defines.h +++ b/src/defines.h @@ -53,11 +53,18 @@ #define FAKE_VER_MAJOR 12 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ã¡ã¸ã£ã¼çªå· + 10) */ #define FAKE_VER_MINOR 2 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ãã¤ãã¼çªå·) */ #define FAKE_VER_PATCH 0 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ãããçªå·) */ -#define FAKE_VER_EXTRA 0 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ã¨ã¯ã¹ãã©çªå·) */ +#define FAKE_VER_EXTRA 53 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ã¨ã¯ã¹ãã©çªå·) */ + + + /*! + * @brief ãã¼ã¸ã§ã³ãéçºçãå®å®çããè¿ã + */ +#define IS_STABLE_VERSION (FAKE_VER_MINOR % 2 == 0 && FAKE_VER_EXTRA == 0) /*! * @brief ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ã¡ã¸ã£ã¼çªå·) / "Savefile Version Number" for Hengband 1.1.1 and later * @details + * å½é¢FAKE_VER_*ãåç §ãã¦ããã *
* First three digits may be same as the Program Version. But not * always same. It means that newer version may preserves lower @@ -68,10 +75,10 @@ * Upper compatibility is always guaranteed. **/ -#define H_VER_MAJOR 2 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ã¡ã¸ã£ã¼çªå·) */ -#define H_VER_MINOR 2 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ãã¤ãã¼çªå·) */ -#define H_VER_PATCH 0 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ãããçªå·) */ -#define H_VER_EXTRA 0 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ã¨ã¯ã¹ãã©çªå·) */ +#define H_VER_MAJOR (FAKE_VER_MAJOR-10) /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ã¡ã¸ã£ã¼çªå·) */ +#define H_VER_MINOR FAKE_VER_MINOR /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ãã¤ãã¼çªå·) */ +#define H_VER_PATCH FAKE_VER_PATCH /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ãããçªå·) */ +#define H_VER_EXTRA FAKE_VER_EXTRA /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ã¨ã¯ã¹ãã©çªå·) */ #define ANGBAND_2_8_1 /*!< Angband 2.8.1以éããæå¹ãªå¦çåå²ãå®ç¾© */ #define ZANGBAND /*!< Zangband 以éããæå¹ãªå¦çåå²ãå®ç¾© */ @@ -80,55 +87,55 @@ * @brief generate.cã§ç¨ããããåºæ¬çãªãããã¯æ°åä½(åç´æ¹å) * Number of grids in each block (vertically) Probably hard-coded to 11, see "generate.c" */ -#define BLOCK_HGT 11 +#define BLOCK_HGT 11 /*! * @brief generate.cã§ç¨ããããåºæ¬çãªãããã¯æ°åä½(æ°´å¹³æ¹å) * Number of grids in each block (horizontally) Probably hard-coded to 11, see "generate.c" */ -#define BLOCK_WID 11 +#define BLOCK_WID 11 /*! * @brief 表示ä¸ã®åºæ¬çãªããã«åä½(åç´æ¹åãBLOCK_HGTã®åæ°ã§è¨å®ãããã¨) * Number of grids in each panel (vertically) Must be a multiple of BLOCK_HGT */ -#define PANEL_HGT 11 +#define PANEL_HGT 11 /*! * @brief 表示ä¸ã®åºæ¬çãªããã«åä½(æ°´å¹³æ¹åãBLOCK_WIDã®åæ°ã§è¨å®ãããã¨) * Number of grids in each panel (horizontally) Must be a multiple of BLOCK_WID */ -#define PANEL_WID 33 +#define PANEL_WID 33 /*! * @brief 表示ä¸ã®åºæ¬çãªãããã¯åä½(åç´æ¹åãPANEL_HGTã®åæ°ã§è¨å®ãããã¨) * Number of grids used to display the dungeon (vertically). Must be a multiple of 11, probably hard-coded to 22. */ -#define SCREEN_HGT 22 +#define SCREEN_HGT 22 /*! * @brief 表示ä¸ã®åºæ¬çãªãããã¯åä½(æ°´å¹³æ¹åãPANEL_WIDã®åæ°ã§è¨å®ãããã¨) * Number of grids used to display the dungeon (horizontally). Must be a multiple of 33, probably hard-coded to 66. */ -#define SCREEN_WID 66 +#define SCREEN_WID 66 /*! * @brief 表示ä¸ã®ãã³ã¸ã§ã³ã®æ大åç´ãµã¤ãº(SCREEN_HGTã®3åãæã¾ãã) * Maximum dungeon height in grids, must be a multiple of SCREEN_HGT, probably hard-coded to SCREEN_HGT * 3. */ -#define MAX_HGT 66 +#define MAX_HGT 66 /*! * @brief 表示ä¸ã®ãã³ã¸ã§ã³ã®æ大水平ãµã¤ãº(SCREEN_WIDã®3åãæã¾ãã) * Maximum dungeon width in grids, must be a multiple of SCREEN_WID, probably hard-coded to SCREEN_WID * 3. */ -#define MAX_WID 198 +#define MAX_WID 198 /* * Quest constants */ -#define MIN_RANDOM_QUEST 40 /* MAX_RANDOM_QUEST)) -#define QUEST_TOWER1 5 /* Harder devices x< Easier devices */ +#define TOWN_DAWN 10000 /*!< 1æ¥åã®ã¿ã¼ã³ / Number of ticks from dawn to dawn XXX */ +#define TURNS_PER_TICK 10L /*!< æéçµéå¦çãè¡ãã¿ã¼ã³æ°ã®å»ã¿ / Number of energy-gain-turns per ticks */ +#define INN_DUNGEON_TURN_ADJ 10 /*!< 宿å±ã§æéãã¤ã¶ããå ´åã«å¢ããdungeon_turnã®åç */ +#define MAX_DAYS 20000 /*!< å é¨å¦çä¸ã§ä¿æãããæ大æ¥æ° / Maximum days */ +#define BREAK_GLYPH 550 /*!< å®ãã®ã«ã¼ã³ã®å¼·é度 / Rune of protection resistance */ +#define BREAK_MINOR_GLYPH 299 /*!< ççºã®ã«ã¼ã³ã®çºåãããã / For explosive runes */ +#define BTH_PLUS_ADJ 3 /*!< æ¦å¨çµé¨å¤åã³ãã¬ã¤ã¤ã¼ã®ææ/å°æè½åã«å¿ããä¿®æ£å¤åç / Adjust BTH per plus-to-hit */ +#define MON_MULT_ADJ 8 /*!< ã¢ã³ã¹ã¿ã¼ã®å¢æ®ãã«ããã®åºæ¬åç / High value slows multiplication */ +#define MON_SUMMON_ADJ 2 /*!< ç¾å¨æªä½¿ç¨ Adjust level of summoned creatures */ +#define MON_DRAIN_LIFE 2 /*!< ã¢ã³ã¹ã¿ã¼ã®ææã«ãããã¬ã¤ã¤ã¼ã®çµé¨å¤å¸ååºæ¬åç(%) / Percent of player exp drained per hit */ +#define USE_DEVICE 3 /*!< ééå ·ã®æä½å¤±æåºæºå¤ x> Harder devices x< Easier devices */ /* "Biases" for random artifact gen */ @@ -581,25 +589,25 @@ #define GREAT_OBJ 10 /*! - * @brief 深層ã¢ã³ã¹ã¿ã¼ãçæãããåºæ¬ç¢ºç(1/x) + * @brief 深層ã¢ã³ã¹ã¿ã¼ãçæããã(NASTYçæ)ã®åºæ¬ç¢ºç(1/x) * @details * There is a 1/25 (4%) chance of inflating the requested monster_level * during the creation of a monsters (see "get_mon_num()" in "monster.c"). * Lower values yield harder monsters more often. */ #define NASTY_MON_BASE 25 -#define NASTY_MON_MAX 3 /*! 深層ã¢ã³ã¹ã¿ã¼ã1ããã¢ã«çæãããæå¤§æ° */ -#define NASTY_MON_PLUS_MAX 25 /*! 深層ã¢ã³ã¹ã¿ã¼ã®é層å ç®æ大é */ +#define NASTY_MON_MAX 3 /*!< 深層ã¢ã³ã¹ã¿ã¼ã1ããã¢ã«çæãããæå¤§æ° */ +#define NASTY_MON_PLUS_MAX 25 /*!< 深層ã¢ã³ã¹ã¿ã¼ã®é層å ç®æ大é */ -#define PENETRATE_INVULNERABILITY 13 /*! ç¡æµåãç ´ããã確ç(1/x) / 1/x chance of hurting even if invulnerable! */ +#define PENETRATE_INVULNERABILITY 13 /*!< ç¡æµåãç ´ããã確ç(1/x) / 1/x chance of hurting even if invulnerable! */ /* * Refueling constants */ -#define FUEL_TORCH 5000 /*! æ¾æã®åºæ¬å¯¿å½å¤ / Maximum amount of fuel in a torch */ -#define FUEL_LAMP 15000 /*! ã©ã³ã¿ã³ã®åºæ¬å¯¿å½å¤ / Maximum amount of fuel in a lantern */ +#define FUEL_TORCH 5000 /*!< æ¾æã®åºæ¬å¯¿å½å¤ / Maximum amount of fuel in a torch */ +#define FUEL_LAMP 15000 /*!< ã©ã³ã¿ã³ã®åºæ¬å¯¿å½å¤ / Maximum amount of fuel in a lantern */ /* * More maximum values @@ -624,19 +632,19 @@ /* * Player constants */ -#define PY_MAX_EXP 99999999L /* Maximum exp */ -#define PY_MAX_GOLD 999999999L /* Maximum gold */ -#define PY_MAX_LEVEL 50 /* Maximum level */ +#define PY_MAX_EXP 99999999L /*!< ãã¬ã¤ã¤ã¼çµé¨å¤ã®æå¤§å¤ / Maximum exp */ +#define PY_MAX_GOLD 999999999L /*!< ãã¬ã¤ã¤ã¼ææéã®æå¤§å¤ / Maximum gold */ +#define PY_MAX_LEVEL 50 /*!< ãã¬ã¤ã¤ã¼ã¬ãã«ã®æå¤§å¤ / Maximum level */ /* * Player "food" crucial values */ -#define PY_FOOD_MAX 15000 /* Food value (Bloated) */ -#define PY_FOOD_FULL 10000 /* Food value (Normal) */ -#define PY_FOOD_ALERT 2000 /* Food value (Hungry) */ -#define PY_FOOD_WEAK 1000 /* Food value (Weak) */ -#define PY_FOOD_FAINT 500 /* Food value (Fainting) */ -#define PY_FOOD_STARVE 100 /* Food value (Starving) */ +#define PY_FOOD_MAX 15000 /*!< é£ã¹éãï½æºè ¹ã®é¾å¤ / Food value (Bloated) */ +#define PY_FOOD_FULL 10000 /*!< æºè ¹ï½å¹³å¸¸ã®é¾å¤ / Food value (Normal) */ +#define PY_FOOD_ALERT 2000 /*!< 平常ï½ç©ºè ¹ã®é¾å¤ / Food value (Hungry) */ +#define PY_FOOD_WEAK 1000 /*!< ç©ºè ¹ï½è¡°å¼±ã®é¾å¤ / Food value (Weak) */ +#define PY_FOOD_FAINT 500 /*!< è¡°å¼±ï½è¡°å¼±(赤表示/麻çº)ã®é¾å¤ / Food value (Fainting) */ +#define PY_FOOD_STARVE 100 /*!< è¡°å¼±(赤表示/麻çº)ï½é£¢é¤ãã¡ã¼ã¸ã®é¾å¤ / Food value (Starving) */ /* * Player regeneration constants @@ -648,8 +656,8 @@ #define PY_REGEN_MNBASE 524 /* Min amount mana regen*2^16 */ /* - * Possible realms that can be chosen; - * currently used only by birth.c and tables.c + * è·æ¥ãã¨ã®é¸æå¯è½ãªéæ³é åç¾å¨ã®æ bitrh.cã¨tables.cã§ã®ã¿ä½¿ç¨ã + * Possible realms that can be chosen currently used only by birth.c and tables.c */ #define CH_NONE 0x00 #define CH_LIFE 0x01 @@ -724,23 +732,23 @@ * Note that "INVEN_PACK" is probably hard-coded by its use in savefiles, and * by the fact that the screen can only show 23 items plus a one-line prompt. */ -#define INVEN_PACK 23 +#define INVEN_PACK 23 /*!< ã¢ã¤ãã ã¹ãããâ¦ææå(0ï½) */ /* * Indexes used for various "equipment" slots (hard-coded by savefiles, etc). */ -#define INVEN_RARM 24 -#define INVEN_LARM 25 -#define INVEN_BOW 26 -#define INVEN_RIGHT 27 -#define INVEN_LEFT 28 -#define INVEN_NECK 29 -#define INVEN_LITE 30 -#define INVEN_BODY 31 -#define INVEN_OUTER 32 -#define INVEN_HEAD 33 -#define INVEN_HANDS 34 -#define INVEN_FEET 35 +#define INVEN_RARM 24 /*!< ã¢ã¤ãã ã¹ãããâ¦å³æ */ +#define INVEN_LARM 25 /*!< ã¢ã¤ãã ã¹ãããâ¦å·¦æ */ +#define INVEN_BOW 26 /*!< ã¢ã¤ãã ã¹ãããâ¦å°æ */ +#define INVEN_RIGHT 27 /*!< ã¢ã¤ãã ã¹ãããâ¦å³ææ */ +#define INVEN_LEFT 28 /*!< ã¢ã¤ãã ã¹ãããâ¦å·¦ææ */ +#define INVEN_NECK 29 /*!< ã¢ã¤ãã ã¹ãããâ¦é¦ */ +#define INVEN_LITE 30 /*!< ã¢ã¤ãã ã¹ãããâ¦å æº */ +#define INVEN_BODY 31 /*!< ã¢ã¤ãã ã¹ãããâ¦ä½ */ +#define INVEN_OUTER 32 /*!< ã¢ã¤ãã ã¹ãããâ¦ä½ã®ä¸ */ +#define INVEN_HEAD 33 /*!< ã¢ã¤ãã ã¹ãããâ¦é é¨ */ +#define INVEN_HANDS 34 /*!< ã¢ã¤ãã ã¹ãããâ¦è é¨ */ +#define INVEN_FEET 35 /*!< ã¢ã¤ãã ã¹ãããâ¦èé¨ */ /* * used for get_random_ego() @@ -869,6 +877,8 @@ /*** Screen Locations ***/ +#define VER_INFO_ROW 3 //!< ã¿ã¤ãã«è¡¨è¨(è¡) + /* * Some screen locations for various display routines * Currently, row 8 and 15 are the only "blank" rows. @@ -2535,7 +2545,7 @@ #define SV_ROD_MIN_DIRECTION 12 /*!< ãã®å¤ä»¥éã®å°é ç®IDãæã£ããããã¯ä½¿ç¨æã«ã¿ã¼ã²ãããè¦æ±ãã / Special "sval" limit -- first "aimed" rod */ #define SV_CHEST_MIN_LARGE 4 /*!< ãã®å¤ä»¥éã®å°é ç®IDãæã£ãç®±ã¯å¤§åã®ç®±ã¨ãã¦ããããæ°ãå¢ãã / Special "sval" limit -- first "large" chest */ -#define SV_CHEST_KANDUME 50 /*!< ç®±ã¢ã¤ãã ã®å°é ç®ID: ããã¡ãã®ã«ã³ã ã¡ +#define SV_CHEST_KANDUME 50 /*!< ç®±ã¢ã¤ãã ã®å°é ç®ID: ããã¡ãã®ã«ã³ã ã¡ */ /* * Special "sval" limit -- first "good" magic/prayer book @@ -3192,7 +3202,7 @@ * Therefore it's very easy to add a lot of new flags; no one need to * worry about in which variable a new flag should be put, nor to * modify a huge number of files all over the source directory at once - * to add new flag variables such as flags4, flags5, etc... + * to add new flag variables such as flags4, a_ability_flags1, etc... * * All management of flags is now treated using a set of macros * instead of bit operations. @@ -3807,11 +3817,11 @@ * Monster bit flags of racial resistances * Note: Resist confusion was merged to RFR_NO_CONF */ -#define RFR_IM_ACID 0x00000001 /* Resist acid */ -#define RFR_IM_ELEC 0x00000002 /* Resist elec */ -#define RFR_IM_FIRE 0x00000004 /* Resist fire */ -#define RFR_IM_COLD 0x00000008 /* Resist cold */ -#define RFR_IM_POIS 0x00000010 /* Resist poison */ +#define RFR_IM_ACID 0x00000001 /* Immunity acid */ +#define RFR_IM_ELEC 0x00000002 /* Immunity elec */ +#define RFR_IM_FIRE 0x00000004 /* Immunity fire */ +#define RFR_IM_COLD 0x00000008 /* Immunity cold */ +#define RFR_IM_POIS 0x00000010 /* Immunity poison */ #define RFR_RES_LITE 0x00000020 /* Resist lite */ #define RFR_RES_DARK 0x00000040 /* Resist dark */ #define RFR_RES_NETH 0x00000080 /* Resist nether */ @@ -4712,9 +4722,10 @@ extern int PlayerUID; #define PARSE_ERROR_UNDEFINED_TERRAIN_TAG 10 #define PARSE_ERROR_MAX 11 -#define GINOU_SUDE 0 -#define GINOU_NITOURYU 1 -#define GINOU_RIDING 2 +#define GINOU_SUDE 0 +#define GINOU_NITOURYU 1 +#define GINOU_RIDING 2 +#define GINOU_MAX 10 /* Proficiency level */ #define EXP_LEVEL_UNSKILLED 0 @@ -4770,6 +4781,7 @@ extern int PlayerUID; #define NIKKI_WIZ_TELE 20 #define NIKKI_NAMED_PET 21 #define NIKKI_PAT_TELE 22 +#define NIKKI_ART_SCROLL 23 #define RECORD_NAMED_PET_NAME 0 #define RECORD_NAMED_PET_UNNAME 1