X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fdefines.h;h=3f7537f9b5385146c6a6aae7a1c76fc207713533;hb=96da58808dce5159113cd7214526007115ee7360;hp=03e66f0b98dc1390169addbf64da7221292a7402;hpb=cbc246d628acf6aea409fca82560888a0942a906;p=hengband%2Fhengband.git diff --git a/src/defines.h b/src/defines.h index 03e66f0b9..3f7537f9b 100644 --- a/src/defines.h +++ b/src/defines.h @@ -51,13 +51,20 @@ #define FAKE_VERSION 0 #define FAKE_VER_MAJOR 12 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ã¡ã¸ã£ã¼çªå· + 10) */ -#define FAKE_VER_MINOR 1 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ãã¤ãã¼çªå·) */ -#define FAKE_VER_PATCH 5 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ãããçªå·) */ +#define FAKE_VER_MINOR 2 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ãã¤ãã¼çªå·) */ +#define FAKE_VER_PATCH 0 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ãããçªå·) */ +#define FAKE_VER_EXTRA 34 /*!< ã²ã¼ã ã®ãã¼ã¸ã§ã³çªå·å®ç¾©(ã¨ã¯ã¹ãã©çªå·) */ + /*! + * @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 1 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ãã¤ãã¼çªå·) */ -#define H_VER_PATCH 2 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ãããçªå·) */ -#define H_VER_EXTRA 4 /*!< ã»ã¼ããã¡ã¤ã«ä¸ã®ãã¼ã¸ã§ã³å®ç¾©(ã¨ã¯ã¹ãã©çªå·) */ +#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 */ @@ -552,50 +560,54 @@ /* * Follow distances */ -#define PET_CLOSE_DIST 1 -#define PET_FOLLOW_DIST 6 -#define PET_SEEK_DIST 10 -#define PET_DESTROY_DIST 255 -#define PET_SPACE_DIST (-10) -#define PET_AWAY_DIST (-25) +#define PET_CLOSE_DIST 1 /*!<ãããã®è¡åç¯å²â¦è¿ãã«ãã */ +#define PET_FOLLOW_DIST 6 /*!<ãããã®è¡åç¯å²â¦ã¤ãã¦æ¥ã */ +#define PET_SEEK_DIST 10 /*!<ãããã®è¡åç¯å²â¦ç¹ã«ãªã? */ +#define PET_DESTROY_DIST 255 /*!<ãããã®è¡åç¯å²â¦æµãè¦ã¤ãã¦åã */ +#define PET_SPACE_DIST (-10) /*!<ãããã®è¡åç¯å²â¦å°ãé¢ãã¦ãã */ +#define PET_AWAY_DIST (-25) /*!<ãããã®è¡åç¯å²â¦é¢ãã¦ãã */ -#define PF_OPEN_DOORS 0x0001 -#define PF_PICKUP_ITEMS 0x0002 -#define PF_TELEPORT 0x0004 -#define PF_ATTACK_SPELL 0x0008 -#define PF_SUMMON_SPELL 0x0010 -#define PF_BALL_SPELL 0x0020 -#define PF_RYOUTE 0x0040 +#define PF_OPEN_DOORS 0x0001 /*!< ãããã®è¡å許å¯â¦ãã¢ãéãã¦ãã */ +#define PF_PICKUP_ITEMS 0x0002 /*!< ãããã®è¡å許å¯â¦ã¢ã¤ãã ãæ¾ã£ã¦ãã */ +#define PF_TELEPORT 0x0004 /*!< ãããã®è¡å許å¯â¦ãã¬ãã¼ãéæ³ã使ã£ã¦ãã */ +#define PF_ATTACK_SPELL 0x0008 /*!< ãããã®è¡å許å¯â¦æ»æéæ³ã使ã£ã¦ãã */ +#define PF_SUMMON_SPELL 0x0010 /*!< ãããã®è¡å許å¯â¦å¬åéæ³ã使ã£ã¦ãã */ +#define PF_BALL_SPELL 0x0020 /*!< ãããã®è¡å許å¯â¦ãã¼ã«éæ³ã§ãã¬ã¤ã¤ã¼ãå·»ãè¾¼ãã§ãã */ +#define PF_RYOUTE 0x0040 /*!< ãã¬ã¤ã¤ã¼ã®é¨ä¹ãã©ã°â¦æ¦å¨ãçæã§æ㤠*/ #define CAN_TWO_HANDS_WIELDING() (!p_ptr->riding || (p_ptr->pet_extra_flags & PF_RYOUTE)) -/* - * There is a 1/20 (5%) chance of inflating the requested object_level +/*! + * @brief ãã¼ã¹ã¢ã¤ãã çæé層ãå ç®ããã確ç + * @details + * There is a 1/10 (10%) chance of inflating the requested object_level * during the creation of an object (see "get_obj_num()" in "object.c"). * Lower values yield better objects more often. */ #define GREAT_OBJ 10 -/* +/*! + * @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 -#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 @@ -607,7 +619,6 @@ #define MIN_M_ALLOC_TD 4 /*!< è¡(æ¼é)ã®æä½ä½äººé ç½®æ° / The town starts out with 4 residents during the day */ #define MIN_M_ALLOC_TN 8 /*!< è¡(å¤é)ã®æä½ä½äººé ç½®æ° / The town starts out with 8 residents during the night */ - /*! * @brief ã¢ã³ã¹ã¿ã¼å¢æ®ã®æå¤§æ° * @details @@ -618,7 +629,6 @@ */ #define MAX_REPRO 100 - /* * Player constants */ @@ -867,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. @@ -983,123 +995,120 @@ * Originally from UnAngband, and modified into TR-like style in Hengband */ +#define FF_LOS 0 /*!< è¦çãéãå°å½¢ã§ãã */ +#define FF_PROJECT 1 /*!< é£ã³éå ·ãééã§ããå°å½¢ã§ãã */ +#define FF_MOVE 2 /*!< 移åå¯è½ãªå°å½¢ã§ãã */ +#define FF_PLACE 3 /*!< ã¢ã³ã¹ã¿ã¼é ç½®ããã¦ãè¯ãå°å½¢ã§ãã(cave_empty_bold/cave_empty_gridã§å©ç¨) */ +#define FF_DROP 4 /*!< ã¢ã¤ãã ãè½ã¨ãã¦ããå°å½¢ã§ãã */ +#define FF_SECRET 5 /*!< é ãæããã©ãããæ½ãã§ããå°å½¢ã§ãã */ +#define FF_NOTICE 6 /*!< ä½ãèå³ãå¼ããã®ãããå°å½¢ã§ãã(ã·ãããã¼ï¼æ¹åã§èµ°è¡ä¸ã®æã«æ¢ã¾ãåºæº) */ +#define FF_REMEMBER 7 /*!< 常ã«è¨æ¶å¯¾è±¡ã¨ãªãå°å½¢ã§ãã(è¨æ¶åªå¤±æã«å¿ãããããªããªã) */ +#define FF_OPEN 8 /*!< éããã³ãã³ãã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_CLOSE 9 /*!< éããã³ãã³ãã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_BASH 10 /*!< ä½å½ããã³ãã³ãã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_SPIKE 11 /*!< ããã³ãæã¤ã³ãã³ãã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_DISARM 12 /*!< 解é¤ã³ãã³ãã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_STORE 13 /*!< åºèã®å ¥å£ã¨ãªãå°å½¢ã§ãã */ +#define FF_TUNNEL 14 /*!< éçå¤åãªã©ã§æãé²ããããå°å½¢ã§ãã */ +#define FF_MAY_HAVE_GOLD 15 /*!< ä½ã財å®ãé ããå¯è½æ§ã®ããå°å½¢ã§ããï¼(f_infoã«ä½¿ç¨ãã¦ããå°å½¢ãªã) */ +#define FF_HAS_GOLD 16 /*!< 財å®ãå«ãã å°å½¢ã§ãã */ +#define FF_HAS_ITEM 17 /*!< ã¢ã¤ãã ãå«ãã å°å½¢ã§ãã */ +#define FF_DOOR 18 /*!< ãã¢ã®ããå°å½¢ã§ãã */ +#define FF_TRAP 19 /*!< ãã©ããã®ããå°å½¢ã§ãã */ +#define FF_STAIRS 20 /*!< é段ã®ããå°å½¢ã§ãã */ +#define FF_GLYPH 21 /*!< å®ãã®ã«ã¼ã³ãå¼µãããå°å½¢ã§ãã */ +#define FF_LESS 22 /*!< éä¸ã«éããå°å½¢ã§ãã */ +#define FF_MORE 23 /*!< éä¸ã«éããå°å½¢ã§ãã */ +#define FF_AVOID_RUN 24 /*!< èªå移åæ©è½æã«é害ã¨ãã¦è¿åãã¹ãå°å½¢ã§ãã */ +#define FF_FLOOR 25 /*!< åºã®ããå°å½¢ã§ãã */ +#define FF_WALL 26 /*!< å£ã®ããå°å½¢ã§ãã */ +#define FF_PERMANENT 27 /*!< 絶対ã«ç ´å£ã§ããªãæ°¸ä¹ å°å½¢ã§ãã */ +/* #define FF_XXX00 28 æªå®ç¾© */ +/* #define FF_XXX01 29 æªå®ç¾© */ +/* #define FF_XXX02 30 æªå®ç¾© */ +#define FF_HIT_TRAP 31 /*!< ãã©ããã®ããå°å½¢ã§ãã(TRAPã¨å¸¸ã«éè¤ãã¦ããï¼) */ +/* #define FF_BRIDGE 32 æªä½¿ç¨ */ +/* #define FF_RIVER 33 æªä½¿ç¨ */ +/* #define FF_LAKE 34 æªä½¿ç¨ */ +/* #define FF_BRIDGED 35 æªä½¿ç¨ */ +/* #define FF_COVERED 36 æªä½¿ç¨ */ +#define FF_GLOW 37 /*!< 常ã«å ã£ã¦ããå°å½¢ã§ãã */ +#define FF_ENSECRET 38 /*!< ä¸æ(f_info.txtä¸ã§å©ç¨ãã¦ããå°å½¢ããªã) */ +#define FF_WATER 39 /*!< æ°´ã®ããå°å½¢ã§ãã */ +#define FF_LAVA 40 /*!< 溶岩ã®ããå°å½¢ã§ãã */ +#define FF_SHALLOW 41 /*!< æµ ãå°å½¢ã§ãã */ +#define FF_DEEP 42 /*!< æ·±ãå°å½¢ã§ãã */ +/* #define FF_FILLED 43 */ /*!< æªä½¿ç¨ */ +#define FF_HURT_ROCK 44 /*!< 岩ç³æº¶è§£ã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +/* #define FF_HURT_FIRE 45 */ /*!< æªä½¿ç¨ */ +/* #define FF_HURT_COLD 46 */ /*!< æªä½¿ç¨ */ +/* #define FF_HURT_ACID 47 */ /*!< æªä½¿ç¨ */ +/* #define FF_ICE 48 */ /*!< æªä½¿ç¨ */ +/* #define FF_ACID 49 */ /*!< æªä½¿ç¨ */ +/* #define FF_OIL 50 */ /*!< æªä½¿ç¨ */ +/* #define FF_XXX04 51 */ /*!< æªä½¿ç¨ */ +/* #define FF_CAN_CLIMB 52 */ /*!< æªä½¿ç¨ */ +#define FF_CAN_FLY 53 /*!< é£è¡å¯è½ãªå°å½¢ã§ãã */ +#define FF_CAN_SWIM 54 /*!< æ³³ããã¨ãå¯è½ãªå°å½¢ã§ãã */ +#define FF_CAN_PASS 55 /*!< ééå¯è½ãªå°å½¢ã§ãã */ +/* #define FF_CAN_OOZE 56 */ /*!< æªä½¿ç¨ */ +#define FF_CAN_DIG 57 /*!< æåã³ãã³ãã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +/* #define FF_HIDE_ITEM 58 æªä½¿ç¨ */ +/* #define FF_HIDE_SNEAK 59 æªä½¿ç¨ */ +/* #define FF_HIDE_SWIM 60 æªä½¿ç¨ */ +/* #define FF_HIDE_DIG 61 æªä½¿ç¨ */ +/* #define FF_KILL_HUGE 62 æªä½¿ç¨ */ +/* #define FF_KILL_MOVE 63 æªä½¿ç¨ */ +/* #define FF_PICK_TRAP 64 æªä½¿ç¨ */ +/* #define FF_PICK_DOOR 65 æªä½¿ç¨ */ +/* #define FF_ALLOC 66 æªä½¿ç¨ */ +/* #define FF_CHEST 67 æªä½¿ç¨ */ +/* #define FF_DROP_1D2 68 æªä½¿ç¨ */ +/* #define FF_DROP_2D2 69 æªä½¿ç¨ */ +/* #define FF_DROP_GOOD 70 æªä½¿ç¨ */ +/* #define FF_DROP_GREAT 71 æªä½¿ç¨ */ +/* #define FF_HURT_POIS 72 æªä½¿ç¨ */ +/* #define FF_HURT_ELEC 73 æªä½¿ç¨ */ +/* #define FF_HURT_WATER 74 æªä½¿ç¨ */ +/* #define FF_HURT_BWATER 75 æªä½¿ç¨ */ +/* #define FF_USE_FEAT 76 æªä½¿ç¨ */ +/* #define FF_GET_FEAT 77 æªä½¿ç¨ */ +/* #define FF_GROUND 78 æªä½¿ç¨ */ +/* #define FF_OUTSIDE 79 æªä½¿ç¨ */ +/* #define FF_EASY_HIDE 80 æªä½¿ç¨ */ +/* #define FF_EASY_CLIMB 81 æªä½¿ç¨ */ +/* #define FF_MUST_CLIMB 82 æªä½¿ç¨ */ +#define FF_TREE 83 /*!< æ¨ã®çããå°å½¢ã§ãã */ +/* #define FF_NEED_TREE 84 æªä½¿ç¨ */ +/* #define FF_BLOOD 85 æªä½¿ç¨ */ +/* #define FF_DUST 86 æªä½¿ç¨ */ +/* #define FF_SLIME 87 æªä½¿ç¨ */ +#define FF_PLANT 88 /*!< æ¤ç©ã®çããå°å½¢ã§ãã */ +/* #define FF_XXX2 89 æªå®ç¾© */ +/* #define FF_INSTANT 90 æªä½¿ç¨ */ +/* #define FF_EXPLODE 91 æªä½¿ç¨ */ +/* #define FF_TIMED 92 æªä½¿ç¨ */ +/* #define FF_ERUPT 93 æªä½¿ç¨ */ +/* #define FF_STRIKE 94 æªä½¿ç¨ */ +/* #define FF_SPREAD 95 æªä½¿ç¨ */ +#define FF_SPECIAL 96 /*!< ã¯ã¨ã¹ãããã³ã¸ã§ã³ã«é¢ããç¹å¥ãªå°å½¢ã§ãã */ +#define FF_HURT_DISI 97 /*!< å解å±æ§ã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_QUEST_ENTER 98 /*!< ã¯ã¨ã¹ãã®å ¥ãå£ã§ãã */ +#define FF_QUEST_EXIT 99 /*!< ã¯ã¨ã¹ãã®åºå£ã§ãã */ +#define FF_QUEST 100 /*!< ã¯ã¨ã¹ãã«é¢ããå°å½¢ã§ãã */ +#define FF_SHAFT 101 /*!< åéã§ããã(2é層移åããé段ã§ãã) */ +#define FF_MOUNTAIN 102 /*!< ãã³ã¸ã§ã³ã®å±±å°å½¢ã§ãã */ +#define FF_BLDG 103 /*!< æ½è¨ã®å ¥ãå£ã§ãã */ +#define FF_MINOR_GLYPH 104 /*!< ççºã®ã«ã¼ã³ã®ããå°å½¢ã§ãã */ +#define FF_PATTERN 105 /*!< ãã¿ã¼ã³ã®ããå°å½¢ã§ãã */ +#define FF_TOWN 106 /*!< åºåãããç¨ã®è¡ãããå°å½¢ã§ãã */ +#define FF_ENTRANCE 107 /*!< åºåãããç¨ã®ãã³ã¸ã§ã³ãããå°å½¢ã§ãã */ +#define FF_MIRROR 108 /*!< é¡ä½¿ãã®é¡ãå¼µãããå°å½¢ã§ãã */ +#define FF_UNPERM 109 /*!< ç ´å£ä¸è½ãªå°å½¢ã§ãã(K:ãã©ã°åãï¼) */ +#define FF_TELEPORTABLE 110 /*!< ãã¬ãã¼ãå ã®å¯¾è±¡ã¨ãªãå°å½¢ã§ãã */ +#define FF_CONVERT 111 /*!< å°å½¢çæå¦çä¸ã®çä¼¼ãã©ã° */ +#define FF_GLASS 112 /*!< ã¬ã©ã¹è£½ã®å°å½¢ã§ãã */ -#define FF_LOS 0 -#define FF_PROJECT 1 -#define FF_MOVE 2 -#define FF_PLACE 3 -#define FF_DROP 4 -#define FF_SECRET 5 -#define FF_NOTICE 6 -#define FF_REMEMBER 7 -#define FF_OPEN 8 -#define FF_CLOSE 9 -#define FF_BASH 10 -#define FF_SPIKE 11 -#define FF_DISARM 12 -#define FF_STORE 13 -#define FF_TUNNEL 14 -#define FF_MAY_HAVE_GOLD 15 -#define FF_HAS_GOLD 16 -#define FF_HAS_ITEM 17 -#define FF_DOOR 18 -#define FF_TRAP 19 -#define FF_STAIRS 20 -#define FF_GLYPH 21 -#define FF_LESS 22 -#define FF_MORE 23 -#define FF_AVOID_RUN 24 -#define FF_FLOOR 25 -#define FF_WALL 26 -#define FF_PERMANENT 27 -/* #define FF_XXX00 28 */ -/* #define FF_XXX01 29 */ -/* #define FF_XXX02 30 */ -#define FF_HIT_TRAP 31 - -/* #define FF_BRIDGE 32 */ -/* #define FF_RIVER 33 */ -/* #define FF_LAKE 34 */ -/* #define FF_BRIDGED 35 */ -/* #define FF_COVERED 36 */ -#define FF_GLOW 37 -#define FF_ENSECRET 38 -#define FF_WATER 39 -#define FF_LAVA 40 -#define FF_SHALLOW 41 -#define FF_DEEP 42 -/* #define FF_FILLED 43 */ -#define FF_HURT_ROCK 44 -/* #define FF_HURT_FIRE 45 */ -/* #define FF_HURT_COLD 46 */ -/* #define FF_HURT_ACID 47 */ -/* #define FF_ICE 48 */ -/* #define FF_ACID 49 */ -/* #define FF_OIL 50 */ -/* #define FF_XXX04 51 */ -/* #define FF_CAN_CLIMB 52 */ -#define FF_CAN_FLY 53 -#define FF_CAN_SWIM 54 -#define FF_CAN_PASS 55 -/* #define FF_CAN_OOZE 56 */ -#define FF_CAN_DIG 57 -/* #define FF_HIDE_ITEM 58 */ -/* #define FF_HIDE_SNEAK 59 */ -/* #define FF_HIDE_SWIM 60 */ -/* #define FF_HIDE_DIG 61 */ -/* #define FF_KILL_HUGE 62 */ -/* #define FF_KILL_MOVE 63 */ - -/* #define FF_PICK_TRAP 64 */ -/* #define FF_PICK_DOOR 65 */ -/* #define FF_ALLOC 66 */ -/* #define FF_CHEST 67 */ -/* #define FF_DROP_1D2 68 */ -/* #define FF_DROP_2D2 69 */ -/* #define FF_DROP_GOOD 70 */ -/* #define FF_DROP_GREAT 71 */ -/* #define FF_HURT_POIS 72 */ -/* #define FF_HURT_ELEC 73 */ -/* #define FF_HURT_WATER 74 */ -/* #define FF_HURT_BWATER 75 */ -/* #define FF_USE_FEAT 76 */ -/* #define FF_GET_FEAT 77 */ -/* #define FF_GROUND 78 */ -/* #define FF_OUTSIDE 79 */ -/* #define FF_EASY_HIDE 80 */ -/* #define FF_EASY_CLIMB 81 */ -/* #define FF_MUST_CLIMB 82 */ -#define FF_TREE 83 -/* #define FF_NEED_TREE 84 */ -/* #define FF_BLOOD 85 */ -/* #define FF_DUST 86 */ -/* #define FF_SLIME 87 */ -#define FF_PLANT 88 -/* #define FF_XXX2 89 */ -/* #define FF_INSTANT 90 */ -/* #define FF_EXPLODE 91 */ -/* #define FF_TIMED 92 */ -/* #define FF_ERUPT 93 */ -/* #define FF_STRIKE 94 */ -/* #define FF_SPREAD 95 */ - -#define FF_SPECIAL 96 -#define FF_HURT_DISI 97 -#define FF_QUEST_ENTER 98 -#define FF_QUEST_EXIT 99 -#define FF_QUEST 100 -#define FF_SHAFT 101 -#define FF_MOUNTAIN 102 -#define FF_BLDG 103 -#define FF_MINOR_GLYPH 104 -#define FF_PATTERN 105 -#define FF_TOWN 106 -#define FF_ENTRANCE 107 -#define FF_MIRROR 108 -#define FF_UNPERM 109 -#define FF_TELEPORTABLE 110 -#define FF_CONVERT 111 -#define FF_GLASS 112 #define FF_FLAG_MAX 113 #define FF_FLAG_SIZE (1 + ((FF_FLAG_MAX - 1) / 32)) @@ -2973,7 +2982,7 @@ #define GF_SOUND 21 #define GF_CONFUSION 22 #define GF_FORCE 23 -#define GF_INERTIA 24 +#define GF_INERTIAL 24 #define GF_MANA 26 #define GF_METEOR 27 #define GF_ICE 28 @@ -3193,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. @@ -3808,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 */ @@ -4053,7 +4062,7 @@ */ #define is_seen(A) \ ((bool)((A)->ml && (!ignore_unview || p_ptr->inside_battle || \ - (player_can_see_bold((A)->fy, (A)->fx) && projectable(py, px, (A)->fy, (A)->fx))))) + (player_can_see_bold((A)->fy, (A)->fx) && projectable(p_ptr->y, p_ptr->x, (A)->fy, (A)->fx))))) /*** Option Definitions ***/ @@ -4222,14 +4231,14 @@ * Determine if player is on this grid */ #define player_bold(Y,X) \ - (((Y) == py) && ((X) == px)) + (((Y) == p_ptr->y) && ((X) == p_ptr->x)) /* * Grid based version of "player_bold()" */ #define player_grid(C) \ - ((C) == &cave[py][px]) + ((C) == &cave[p_ptr->y][p_ptr->x]) #define cave_have_flag_bold(Y,X,INDEX) \ @@ -4451,7 +4460,10 @@ extern int PlayerUID; #define MUSIC_BASIC_QUEST 15 #define MUSIC_BASIC_ARENA 16 #define MUSIC_BASIC_BATTLE 17 -#define MUSIC_BASIC_MAX 18 /*!< BGMå®ç¾©ã®æå¤§æ° */ +#define MUSIC_BASIC_QUEST_CLEAR 18 +#define MUSIC_BASIC_FINAL_QUEST_CLEAR 19 +#define MUSIC_BASIC_AMBUSH 20 +#define MUSIC_BASIC_MAX 21 /*!< BGMå®ç¾©ã®æå¤§æ° */ /*** Sound constants ***/ @@ -4627,26 +4639,26 @@ extern int PlayerUID; /* * Quest status */ -#define QUEST_STATUS_UNTAKEN 0 -#define QUEST_STATUS_TAKEN 1 -#define QUEST_STATUS_COMPLETED 2 -#define QUEST_STATUS_REWARDED 3 -#define QUEST_STATUS_FINISHED 4 -#define QUEST_STATUS_FAILED 5 -#define QUEST_STATUS_FAILED_DONE 6 -#define QUEST_STATUS_STAGE_COMPLETED 7 +#define QUEST_STATUS_UNTAKEN 0 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼æªçºç*/ +#define QUEST_STATUS_TAKEN 1 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼çºçä¸*/ +#define QUEST_STATUS_COMPLETED 2 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼éæ*/ +#define QUEST_STATUS_REWARDED 3 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼å ±é ¬åãåãå*/ +#define QUEST_STATUS_FINISHED 4 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼å®äº*/ +#define QUEST_STATUS_FAILED 5 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼å¤±æ*/ +#define QUEST_STATUS_FAILED_DONE 6 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼å¤±æå®äº*/ +#define QUEST_STATUS_STAGE_COMPLETED 7 /*!< ã¯ã¨ã¹ãã¹ãã¼ã¿ã¹ç¶æ ï¼ã¹ãã¼ã¸æ¯éæ*/ /* * Quest type */ -#define QUEST_TYPE_KILL_LEVEL 1 -#define QUEST_TYPE_KILL_ANY_LEVEL 2 -#define QUEST_TYPE_FIND_ARTIFACT 3 -#define QUEST_TYPE_FIND_EXIT 4 -#define QUEST_TYPE_KILL_NUMBER 5 -#define QUEST_TYPE_KILL_ALL 6 -#define QUEST_TYPE_RANDOM 7 -#define QUEST_TYPE_TOWER 8 +#define QUEST_TYPE_KILL_LEVEL 1 /*!< ã¯ã¨ã¹ãç®ç: ç¹å®ã®ã¦ãã¼ã¯ã¢ã³ã¹ã¿ã¼ãåã */ +#define QUEST_TYPE_KILL_ANY_LEVEL 2 /*!< ã¯ã¨ã¹ãç®ç: ã¤ãã³ãåè¨æç¹ã§ã©ã³ãã ã§é¸ã°ããç¹å®ã®ã¦ãã¼ã¯ã¢ã³ã¹ã¿ã¼ãåã */ +#define QUEST_TYPE_FIND_ARTIFACT 3 /*!< ã¯ã¨ã¹ãç®ç: ç¹å®ã®ã¢ã¼ãã£ãã¡ã¯ããçºè¦ãã */ +#define QUEST_TYPE_FIND_EXIT 4 /*!< ã¯ã¨ã¹ãç®ç: è±åºãã */ +#define QUEST_TYPE_KILL_NUMBER 5 /*!< ã¯ã¨ã¹ãç®ç: ã¢ã³ã¹ã¿ã¼ãç¡å·®å¥ã«ç¹å®æ°åã */ +#define QUEST_TYPE_KILL_ALL 6 /*!< ã¯ã¨ã¹ãç®ç: ã¨ãªã¢ä¸ã®ãã¹ã¦ã®ã¢ã³ã¹ã¿ã¼ãå ¨ã¦åã */ +#define QUEST_TYPE_RANDOM 7 /*!< ã¯ã¨ã¹ãç®ç: ã©ã³ãã ã¯ã¨ã¹ãã¨ãã¦é¸ã°ããã¦ãã¼ã¯1ä½ãåã */ +#define QUEST_TYPE_TOWER 8 /*!< ã¯ã¨ã¹ãç®ç: è¤æ°ã®ã¨ãªã¢ã®å ¨ã¦ã®ã¢ã³ã¹ã¿ã¼ãåã */ /* * Initialization flags @@ -4661,10 +4673,10 @@ extern int PlayerUID; /* * Quest flags */ -#define QUEST_FLAG_SILENT 0x01 /* no messages fro completion */ -#define QUEST_FLAG_PRESET 0x02 /* quest is outside the main dungeon */ -#define QUEST_FLAG_ONCE 0x04 /* quest is marked finished after leaving */ -#define QUEST_FLAG_TOWER 0x08 /* Tower quest is special */ +#define QUEST_FLAG_SILENT 0x01 /*!< ã¯ã¨ã¹ããã©ã°: ã¯ã¨ã¹ãé²è¡ã«é¢ããæ å ±è¡¨ç¤ºãææ¢ãã / no messages from completion */ +#define QUEST_FLAG_PRESET 0x02 /*!< ã¯ã¨ã¹ããã©ã°: ã¯ã¨ã¹ãããã³ã¸ã§ã³å¤ã§çºçãã / quest is outside the main dungeon */ +#define QUEST_FLAG_ONCE 0x04 /*!< ã¯ã¨ã¹ããã©ã°: ã¯ã¨ã¹ããããã¢ãåºãæç¹ã§å®äºãã / quest is marked finished after leaving */ +#define QUEST_FLAG_TOWER 0x08 /*!< ã¯ã¨ã¹ããã©ã°: ã¯ã¨ã¹ã:å¡ã®å½¢å¼ã§é²è¡ãã / Tower quest is special */ /* * Available graphic modes @@ -4710,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 @@ -4768,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