*/
#include "angband.h"
+#include "trap.h"
"LAVA",
"SHALLOW",
"DEEP",
- "FILLED",
+ "POISON_PUDDLE",
"HURT_ROCK",
"HURT_FIRE",
"HURT_COLD",
"HURT_ACID",
- "ICE",
- "ACID",
+ "COLD_PUDDLE",
+ "ACID_PUDDLE",
"OIL",
- "XXX04",
+ "ELEC_PUDDLE",
"CAN_CLIMB",
"CAN_FLY",
"CAN_SWIM",
"HURT_ROCK",
"HURT_FIRE",
"HURT_COLD",
- "XXX",
+ "ANGEL",
"XXX",
"XXX",
"XXX",
"S_UNIQUE"
};
+#if 0
/*!
* モンスター特性トークン(発動型能力3) /
* Monster race flags
"XXXA3X30",
"XXXA3X31",
};
+#endif
+#if 0
/*!
* モンスター特性トークン(発動型能力4) /
* Monster race flags
"XXXA4X30",
"XXXA4X31",
};
+#endif
/*!
"CAVE",
"CAVERN",
"ARCADE",
- "XXX",
- "XXX",
+ "LAKE_ACID",
+ "LAKE_POISONOUS",
"XXX",
"FORGET",
"LAKE_WATER",
"NO_MELEE",
"CHAMELEON",
"DARKNESS",
- "XXX",
- "XXX"
+ "ACID_RIVER",
+ "POISONOUS_RIVER"
};
* @param parse_info_txt_line パース関数
* @return エラーコード
*/
-errr init_info_txt(FILE *fp, char *buf, header *head,
- parse_info_txt_func parse_info_txt_line)
+errr init_info_txt(FILE *fp, char *buf, header *head, parse_info_txt_func parse_info_txt_line)
{
errr err;
/* Process 'X' for "Extra info" (one line only) */
else if (buf[0] == 'X')
{
- int typ, rat, hgt, wid;
+ EFFECT_ID typ, rat, hgt, wid;
/* Scan for the values */
if (4 != sscanf(buf+2, "%d:%d:%d:%d",
v_ptr->wid = (POSITION)wid;
}
- /* Oops */
else return (6);
/* Success */
}
- /* Oops */
else return (6);
/* Success */
}
- /* Oops */
else return (6);
/* Success */
}
}
- /* Oops */
msg_format(_("未知の地形フラグ '%s'。", "Unknown feature flag '%s'."), what);
/* Error */
*/
static errr grab_one_feat_action(feature_type *f_ptr, cptr what, int count)
{
- int i;
+ FF_FLAGS_IDX i;
/* Check flags */
for (i = 0; i < FF_FLAG_MAX; i++)
}
}
- /* Oops */
msg_format(_("未知の地形アクション '%s'。", "Unknown feature action '%s'."), what);
/* Error */
}
/* Default "mimic" */
- f_ptr->mimic = (IDX)i;
+ f_ptr->mimic = (FEAT_IDX)i;
/* Default "destroyed state" -- if not specified */
- f_ptr->destroyed = (IDX)i;
+ f_ptr->destroyed = (FEAT_IDX)i;
/* Default "states" */
for (i = 0; i < MAX_FEAT_STATES; i++) f_ptr->state[i].action = FF_FLAG_MAX;
if (!add_tag(&offset, head, buf + 2)) return PARSE_ERROR_OUT_OF_MEMORY;
/* Record a fake tag index */
- f_ptr->mimic = -offset;
+ f_ptr->mimic_tag = offset;
}
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read feature subtype */
+ /* Hack -- Read feature subtype */
if (1 == sscanf(s, "SUBTYPE_%d", &i))
{
/* Extract a "subtype" */
- f_ptr->subtype = i;
+ f_ptr->subtype = (FEAT_SUBTYPE)i;
/* Start at next entry */
s = t;
- /* Continue */
continue;
}
- /* XXX XXX XXX Hack -- Read feature power */
+ /* Hack -- Read feature power */
if (1 == sscanf(s, "POWER_%d", &i))
{
/* Extract a "power" */
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
if (1 != sscanf(buf+2, "%d", &priority)) return (PARSE_ERROR_GENERIC);
/* Save the value */
- f_ptr->priority = priority;
+ f_ptr->priority = (FEAT_PRIORITY)priority;
}
/* Process 'K' for "States" (up to four lines + default (which cannot be last)) */
if (!add_tag(&offset, head, t)) return PARSE_ERROR_OUT_OF_MEMORY;
/* Record a fake tag index */
- f_ptr->destroyed = -offset;
+ f_ptr->destroyed_tag = offset;
}
else
{
if (!add_tag(&offset, head, t)) return PARSE_ERROR_OUT_OF_MEMORY;
/* Record a fake tag index */
- f_ptr->state[i].result = -offset;
+ f_ptr->state[i].result_tag = offset;
}
}
- /* Oops */
else return (6);
/* Success */
/*!
* @brief 地形タグからIDを得る /
* Search for real index corresponding to this fake tag
- * @param feat タグ文字列
- * @return なし
+ * @param feat タグ文字列のオフセット
+ * @return 地形ID。該当がないなら-1
*/
-static void search_real_feat(s16b *feat)
+static FEAT_IDX search_real_feat(STR_OFFSET feat)
{
- int i;
+ FEAT_IDX i;
/* Don't convert non-fake tag */
- if (*feat >= 0) return;
+ if (feat <= 0)
+ {
+ return -1;
+ }
/* Search for real index corresponding to this fake tag */
for (i = 0; i < f_head.info_num; i++)
{
- if ((-(*feat)) == f_info[i].tag)
+ if (feat == f_info[i].tag)
{
/* Record real index */
- *feat = (s16b)i;
- return;
+ return i;
}
}
/* Undefined tag */
- msg_format(_("未定義のタグ '%s'。", "%s is undefined."), f_tag + (-(*feat)));
+ msg_format(_("未定義のタグ '%s'。", "%s is undefined."), f_tag + feat);
+ return -1;
}
for (i = 0; i < head->info_num; i++)
{
feature_type *f_ptr = &f_info[i];
- int j;
+ FEAT_IDX j, k;
- search_real_feat(&f_ptr->mimic);
-
- search_real_feat(&f_ptr->destroyed);
-
- for (j = 0; j < MAX_FEAT_STATES; j++) search_real_feat(&f_ptr->state[j].result);
+ k = search_real_feat(f_ptr->mimic_tag);
+ f_ptr->mimic = k < 0 ? f_ptr->mimic : k;
+ k = search_real_feat(f_ptr->destroyed_tag);
+ f_ptr->destroyed = k < 0 ? f_ptr->destroyed : k;
+ for (j = 0; j < MAX_FEAT_STATES; j++)
+ {
+ k = search_real_feat(f_ptr->state[j].result_tag);
+ f_ptr->state[j].result = k < 0 ? f_ptr->state[j].result : k;
+ }
}
}
if (grab_one_flag(&k_ptr->gen_flags, k_info_gen_flags, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知のアイテム・フラグ '%s'。", "Unknown object flag '%s'."), what);
/* Error */
return ((byte) i);
}
- /* Oops */
msg_format(_("未知の発動・フラグ '%s'。", "Unknown activation flag '%s'."), what);
/* Error */
else if (buf[0] == 'A')
{
- /* XXX XXX XXX Simply read each number following a colon */
+ /* Simply read each number following a colon */
for (i = 0, s = buf+1; s && (s[0] == ':') && s[1]; ++i)
{
/* Default chance */
}
- /* Oops */
else return (6);
if (grab_one_flag(&a_ptr->gen_flags, k_info_gen_flags, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知の伝説のアイテム・フラグ '%s'。", "Unknown artifact flag '%s'."), what);
/* Error */
}
- /* Oops */
else return (6);
if (grab_one_flag(&e_ptr->gen_flags, k_info_gen_flags, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知の名のあるアイテム・フラグ '%s'。", "Unknown ego-item flag '%s'."), what);
/* Error */
errr parse_e_info(char *buf, header *head)
{
int i;
-
char *s, *t;
/* Current entry */
static ego_item_type *e_ptr = NULL;
-
/* Just before the first record */
error_idx = -1;
/* Just before the first line */
error_line = -1;
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
/* Find the colon before the name */
s = my_strchr(buf+2, ':');
- /* Verify that colon */
+ /* Verify that colon */
if (!s) return (1);
/* Nuke the colon, advance to the name */
}
}
- /* Oops */
else return (6);
/* Success */
if (grab_one_flag(&r_ptr->flagsr, r_info_flagsr, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知のモンスター・フラグ '%s'。", "Unknown monster flag '%s'."), what);
/* Failure */
if (grab_one_flag(&r_ptr->a_ability_flags2, r_a_ability_flags2, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知のモンスター・フラグ '%s'。", "Unknown monster flag '%s'."), what);
/* Failure */
errr parse_r_info(char *buf, header *head)
{
int i;
-
char *s, *t;
/* Current entry */
{
int id, ds, dd;
/* Find the next empty blow slot (if any) */
- for (i = 0; i < 6; i++) if (r_ptr->reinforce_id[i] == 0) break;
+ for (i = 0; i < A_MAX; i++) if (r_ptr->reinforce_id[i] == 0) break;
/* Oops, no more slots */
if (i == 6) return (1);
while ((*t == ' ') || (*t == '|')) t++;
}
- /* XXX XXX XXX Hack -- Read spell frequency */
+ /* Hack -- Read spell frequency */
if (1 == sscanf(s, "1_IN_%d", &i))
{
/* Extract a "frequency" */
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
r_ptr->arena_ratio = (PERCENTAGE)val;
}
- /* Oops */
else return (6);
if (grab_one_flag(&d_ptr->flags1, d_info_flags1, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知のダンジョン・フラグ '%s'。", "Unknown dungeon type flag '%s'."), what);
/* Failure */
if (grab_one_flag(&d_ptr->mflagsr, r_info_flagsr, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知のモンスター・フラグ '%s'。", "Unknown monster flag '%s'."), what);
/* Failure */
return (1);
if (grab_one_flag(&d_ptr->m_a_ability_flags2, r_a_ability_flags2, what) == 0)
return 0;
- /* Oops */
msg_format(_("未知のモンスター・フラグ '%s'。", "Unknown monster flag '%s'."), what);
/* Failure */
errr parse_d_info(char *buf, header *head)
{
int i;
-
char *s, *t;
/* Current entry */
static dungeon_info_type *d_ptr = NULL;
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read Final Artifact */
+ /* Hack -- Read Final Artifact */
if (1 == sscanf(s, "FINAL_ARTIFACT_%d", &artif))
{
/* Extract a "Final Artifact" */
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
- /* XXX XXX XXX Hack -- Read Final Object */
+ /* Hack -- Read Final Object */
if (1 == sscanf(s, "FINAL_OBJECT_%d", &artif))
{
/* Extract a "Final Artifact" */
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
- /* XXX XXX XXX Hack -- Read Artifact Guardian */
+ /* Hack -- Read Artifact Guardian */
if (1 == sscanf(s, "FINAL_GUARDIAN_%d", &monst))
{
/* Extract a "Artifact Guardian" */
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
- /* XXX XXX XXX Hack -- Read Special Percentage */
+ /* Hack -- Read Special Percentage */
if (1 == sscanf(s, "MONSTER_DIV_%d", &monst))
{
/* Extract a "Special %" */
- d_ptr->special_div = monst;
+ d_ptr->special_div = (PROB)monst;
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
while ((*t == ' ') || (*t == '|')) t++;
}
- /* XXX XXX XXX Hack -- Read spell frequency */
+ /* Hack -- Read spell frequency */
if (1 == sscanf(s, "1_IN_%d", &i))
{
/* Start at next entry */
s = t;
-
- /* Continue */
continue;
}
}
}
- /* Oops */
else return (6);
/* Success */
struct dungeon_grid
{
- IDX feature; /* Terrain feature */
- IDX monster; /* Monster */
- IDX object; /* Object */
- IDX ego; /* Ego-Item */
- IDX artifact; /* Artifact */
- IDX trap; /* Trap */
- int cave_info; /* Flags for CAVE_MARK, CAVE_GLOW, CAVE_ICKY, CAVE_ROOM */
- int special; /* Reserved for special terrain info */
- int random; /* Number of the random effect */
+ FEAT_IDX feature; /* Terrain feature */
+ MONSTER_IDX monster; /* Monster */
+ OBJECT_IDX object; /* Object */
+ EGO_IDX ego; /* Ego-Item */
+ ARTIFACT_IDX artifact; /* Artifact */
+ IDX trap; /* Trap */
+ BIT_FLAGS cave_info; /* Flags for CAVE_MARK, CAVE_GLOW, CAVE_ICKY, CAVE_ROOM */
+ s16b special; /* Reserved for special terrain info */
+ int random; /* Number of the random effect */
};
int num;
char *zz[9];
-
if (init_flags & INIT_ONLY_BUILDINGS) return (0);
/* Tokenize the line */
{
/* Special */
case 9:
- letter[index].special = atoi(zz[8]);
+ letter[index].special = (s16b)atoi(zz[8]);
/* Fall through */
/* Trap */
case 8:
{
if (p_ptr->inside_quest)
{
- int a_idx = quest[p_ptr->inside_quest].k_idx;
+ ARTIFACT_IDX a_idx = quest[p_ptr->inside_quest].k_idx;
if (a_idx)
{
artifact_type *a_ptr = &a_info[a_idx];
building[index].letters[action_index] = zz[4][0];
/* Action code */
- building[index].actions[action_index] = atoi(zz[5]);
+ building[index].actions[action_index] = (BACT_IDX)atoi(zz[5]);
/* Action restriction */
- building[index].action_restr[action_index] = atoi(zz[6]);
+ building[index].action_restr[action_index] = (BACT_RESTRICT_IDX)atoi(zz[6]);
break;
}
* @param x 配置先X座標
* @return エラーコード
*/
-static void drop_here(object_type *j_ptr, int y, int x)
+static void drop_here(object_type *j_ptr, POSITION y, POSITION x)
{
cave_type *c_ptr = &cave[y][x];
object_type *o_ptr;
- /* Get new object */
- s16b o_idx = o_pop();
+ OBJECT_IDX o_idx = o_pop();
/* Access new object */
o_ptr = &o_list[o_idx];
/* Structure copy */
object_copy(o_ptr, j_ptr);
-
/* Locate */
o_ptr->iy = y;
o_ptr->ix = x;
static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, int xmax, int *y, int *x)
{
int i;
-
char *zz[33];
-
/* Skip "empty" lines */
if (!buf[0]) return (0);
for (*x = xmin, i = 0; ((*x < xmax) && (i < len)); (*x)++, s++, i++)
{
- /* Access the grid */
cave_type *c_ptr = &cave[*y][*x];
int idx = s[0];
- IDX object_index = letter[idx].object;
- IDX monster_index = letter[idx].monster;
+ OBJECT_IDX object_index = letter[idx].object;
+ MONSTER_IDX monster_index = letter[idx].monster;
int random = letter[idx].random;
- IDX artifact_index = letter[idx].artifact;
+ ARTIFACT_IDX artifact_index = letter[idx].artifact;
/* Lay down a floor */
c_ptr->feat = conv_dungeon_feat(letter[idx].feature);
}
else if (object_index)
{
- /* Get local object */
object_type *o_ptr = &object_type_body;
-
- /* Create the item */
object_prep(o_ptr, object_index);
if (o_ptr->tval == TV_GOLD)
{
if (a_info[artifact_index].cur_num)
{
- IDX k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
+ KIND_OBJECT_IDX k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
object_type forge;
object_type *q_ptr = &forge;
object_prep(q_ptr, k_idx);
-
- /* Drop it in the dungeon */
drop_here(q_ptr, *y, *x);
}
else
/* Place player in a quest level */
if (p_ptr->inside_quest)
{
- int py, px;
+ POSITION py, px;
/* Delete the monster (if any) */
delete_monster(p_ptr->y, p_ptr->x);
/* Maximum quests */
else if (zz[0][0] == 'Q')
{
- max_quests = (IDX)atoi(zz[1]);
+ max_q_idx = (IDX)atoi(zz[1]);
}
/* Maximum r_idx */
/* Analyze */
if (*s == b1)
{
- const char *p;
- const char *t;
+ cptr p;
+ cptr t;
/* Skip b1 */
s++;
/* First */
t = process_dungeon_file_expr(&s, &f);
- /* Oops */
if (!*t)
{
/* Nothing */
}
}
- /* Oops */
else
{
while (*s && (f != b2))
/* Save */
(*sp) = s;
-
- /* Result */
return (v);
}
errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax)
{
FILE *fp;
-
char buf[1024];
-
int num = -1;
-
errr err = 0;
-
bool bypass = FALSE;
-
int x = xmin, y = ymin;
/* Set flag */
bypass = (streq(v, "0") ? TRUE : FALSE);
-
- /* Continue */
continue;
}
/* Process the line */
err = process_dungeon_file_aux(buf, ymin, xmin, ymax, xmax, &y, &x);
- /* Oops */
if (err) break;
}
/* Error string */
oops = (((err > 0) && (err < PARSE_ERROR_MAX)) ? err_str[err] : "unknown");
- /* Oops */
msg_format("Error %d (%s) at line %d of '%s'.", err, oops, num, name);
msg_format(_("'%s'を解析中。", "Parsing '%s'."), buf);
msg_print(NULL);
}
-
- /* Close the file */
my_fclose(fp);
-
- /* Result */
return (err);
}
r_info_blow_effect[b_ptr->effect],
b_ptr->d_dice, b_ptr->d_side);
}
-
- /* Extract the flags */
for (fc = 0, j = 0; j < 32 * 3; j++)
{
/* Check this flag */
fprintf(fff, "\n");
}
- /* Done */
fclose(fff);
}
OSDN Git Service
