X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Ftypes.h;h=550076dabcb2869823b00eeb0b1fb00b2c9ee7d0;hb=32838e337dd387e48039b85154bcb5b4e38ab98c;hp=7eab1537d30339875160bd95255100a826460b32;hpb=457c27ad8a40534c2494a6a5fc85604ec3610fca;p=hengband%2Fhengband.git diff --git a/src/types.h b/src/types.h index 7eab1537d..550076dab 100644 --- a/src/types.h +++ b/src/types.h @@ -44,18 +44,16 @@ */ -/* - * Feature state structure - * - * - Action (FF_*) - * - Result (f_info ID) +/*! + * @struct feature_state + * @brief 地形状態変化指定構造体 / Feature state structure */ typedef struct feature_state feature_state; struct feature_state { - byte action; - s16b result; + byte action; /*!< 変化条件をFF_*のIDで指定 / Action (FF_*) */ + s16b result; /*!< 変化先ID / Result (f_info ID) */ }; @@ -77,7 +75,7 @@ struct feature_type u32b flags[FF_FLAG_SIZE]; /*!< 地形の基本特性ビット配列 / Flags */ u16b priority; /*!< 縮小表示で省略する際の表示優先度 / Map priority */ - s16b destroyed; /*!< 一度*破壊*に巻き込まれたかどうかのフラグ / Default destroyed state */ + s16b destroyed; /*!< *破壊*に巻き込まれた時の地形移行先(未実装？) / Default destroyed state */ feature_state state[MAX_FEAT_STATES]; /*!< feature_state テーブル */ @@ -291,43 +289,52 @@ typedef struct monster_race monster_race; struct monster_race { - u32b name; /* Name (offset) */ + u32b name; /*!< 名前データのオフセット(日本語) / Name offset(Japanese) */ #ifdef JP - u32b E_name; /* 英語名 (offset) */ + u32b E_name; /*!< 名前データのオフセット(英語) / Name offset(English) */ #endif - u32b text; /* Text (offset) */ + u32b text; /*!< 思い出テキストのオフセット / Lore text offset */ - byte hdice; /* Creatures hit dice count */ - byte hside; /* Creatures hit dice sides */ + byte hdice; /*!< HPのダイス数 / Creatures hit dice count */ + byte hside; /*!< HPのダイス面数 / Creatures hit dice sides */ - s16b ac; /* Armour Class */ + s16b ac; /*!< アーマークラス / Armour Class */ - s16b sleep; /* Inactive counter (base) */ - byte aaf; /* Area affect radius (1-100) */ - byte speed; /* Speed (normally 110) */ + s16b sleep; /*!< 睡眠値 / Inactive counter (base) */ + byte aaf; /*!< 感知範囲(1-100スクエア) / Area affect radius (1-100) */ + byte speed; /*!< 加速(110で+0) / Speed (normally 110) */ - s32b mexp; /* Exp value for kill */ + s32b mexp; /*!< 殺害時基本経験値 / Exp value for kill */ - s16b extra; /* Unused (for now) */ + s16b extra; /*!< 未使用 / Unused (for now) */ - byte freq_spell; /* Spell frequency */ + byte freq_spell; /*!< 魔法＆特殊能力仕様頻度(1/n) / Spell frequency */ u32b flags1; /* Flags 1 (general) */ u32b flags2; /* Flags 2 (abilities) */ u32b flags3; /* Flags 3 (race/resist) */ u32b flags4; /* Flags 4 (inate/breath) */ - u32b flags5; /* Flags 5 (normal spells) */ - u32b flags6; /* Flags 6 (special spells) */ u32b flags7; /* Flags 7 (movement related abilities) */ u32b flags8; /* Flags 8 (wilderness info) */ u32b flags9; /* Flags 9 (drops info) */ u32b flagsr; /* Flags R (resistances info) */ + u32b a_ability_flags1; /* Activate Ability Flags 5 (normal spells) */ + u32b a_ability_flags2; /* Activate Ability Flags 6 (special spells) */ + u32b a_ability_flags3; /* Activate Ability Flags 7 (implementing) */ + u32b a_ability_flags4; /* Activate Ability Flags 8 (implementing) */ + monster_blow blow[4]; /* Up to four blows per round */ u16b reinforce_id[6]; u16b reinforce_dd[6]; u16b reinforce_ds[6]; + u16b artifact_id[4]; /* 特定アーティファクトドロップID */ + u16b artifact_rarity[4]; /* 特定アーティファクトレア度 */ + u16b artifact_percent[4]; /* 特定アーティファクトドロップ率 */ + + u32b arena_ratio; /* アリーナの評価修正値(%基準 / 0=100%) / Arena */ + s16b next_r_idx; u32b next_exp; @@ -347,7 +354,7 @@ struct monster_race byte cur_num; /* Monster population on current level */ - s16b floor_id; /* Location of unique monster */ + s16b floor_id; /* Location of unique monster */ s16b r_sights; /* Count sightings of this monster */ @@ -376,7 +383,7 @@ struct monster_race u32b r_flags4; /* Observed racial flags */ u32b r_flags5; /* Observed racial flags */ u32b r_flags6; /* Observed racial flags */ - /* u32b r_flags7; */ /* Observed racial flags */ + /* u32b r_flags7; */ /* Observed racial flags */ u32b r_flagsr; /* Observed racial resistance flags */ }; @@ -678,32 +685,34 @@ struct option_type }; -/* - * Structure for the "quests" - */ typedef struct quest_type quest_type; +/*! + * @struct quest_type + * @brief クエスト情報の構造体 / Structure for the "quests". + */ + struct quest_type { - s16b status; /* Is the quest taken, completed, finished? */ + s16b status; /*!< クエストの進行ステータス / Is the quest taken, completed, finished? */ - s16b type; /* The quest type */ + s16b type; /*!< クエストの種別 / The quest type */ - char name[60]; /* Quest name */ - s16b level; /* Dungeon level */ - s16b r_idx; /* Monster race */ + char name[60]; /*!< クエスト名 / Quest name */ + s16b level; /*!< 処理階層 / Dungeon level */ + s16b r_idx; /*!< クエスト対象のモンスターID / Monster race */ - s16b cur_num; /* Number killed */ - s16b max_num; /* Number required */ + s16b cur_num; /*!< 撃破したモンスターの数 / Number killed */ + s16b max_num; /*!< 求められるモンスターの撃破数 / Number required */ - s16b k_idx; /* object index */ - s16b num_mon; /* number of monsters on level */ + s16b k_idx; /*!< クエスト対象のアイテムID / object index */ + s16b num_mon; /*!< QUEST_TYPE_KILL_NUMBER時の目標撃破数 number of monsters on level */ - byte flags; /* quest flags */ - byte dungeon; /* quest dungeon */ + byte flags; /*!< クエストに関するフラグビット / quest flags */ + byte dungeon; /*!< クエスト対象のダンジョンID / quest dungeon */ - byte complev; /* player level (complete) */ - u32b comptime; /* quest clear time*/ + byte complev; /*!< クリア時プレイヤーレベル / player level (complete) */ + u32b comptime; /*!< クリア時ゲーム時間 / quest clear time*/ }; @@ -716,7 +725,7 @@ struct owner_type { cptr owner_name; /* Name */ - s16b max_cost; /* Purse limit */ + s32b max_cost; /* Purse limit */ byte max_inflate; /* Inflation (max) */ byte min_inflate; /* Inflation (min) */ @@ -1100,7 +1109,7 @@ struct player_type s16b spell_exp[64]; /* Proficiency of spells */ s16b weapon_exp[5][64]; /* Proficiency of weapons */ - s16b skill_exp[10]; /* Proficiency of misc. skill */ + s16b skill_exp[GINOU_MAX]; /* Proficiency of misc. skill */ s32b magic_num1[108]; /* Array for non-spellbook type magic */ byte magic_num2[108]; /* Flags for non-spellbook type magics */ @@ -1340,6 +1349,12 @@ struct player_type byte tval_ammo; /* Correct ammo tval */ byte pspeed; /* Current speed */ + + s16b energy_use; /* Energy use this turn */ + + int y; /* Player location in dungeon */ + int x; /* Player location in dungeon */ + char name[32]; /* Current player's character name */ }; @@ -1614,13 +1629,16 @@ struct dungeon_info_type { u32b mflags2; u32b mflags3; u32b mflags4; - u32b mflags5; - u32b mflags6; u32b mflags7; u32b mflags8; u32b mflags9; u32b mflagsr; + u32b m_a_ability_flags1; + u32b m_a_ability_flags2; + u32b m_a_ability_flags3; + u32b m_a_ability_flags4; + char r_char[5]; /* Monster race allowed */ int final_object; /* The object you'll find at the bottom */ int final_artifact; /* The artifact you'll find at the bottom */