/* File: init1.c */
+/*
+ * Copyright (c) 1997 Ben Harrison
+ *
+ * This software may be copied and distributed for educational, research,
+ * and not for profit purposes provided that this copyright and statement
+ * are included in all such copies. Other copyrights may also apply.
+ */
+
/* Purpose: Initialization (part 1) -BEN- */
#include "angband.h"
"MALE",
"FEMALE",
"CHAR_CLEAR",
- "CHAR_MULTI",
+ "SHAPECHANGER",
"ATTR_CLEAR",
"ATTR_MULTI",
"FORCE_DEPTH",
"FORCE_MAXHP",
"FORCE_SLEEP",
"FORCE_EXTRA",
- "XXX1",
+ "ATTR_SEMIRAND",
"FRIENDS",
"ESCORT",
"ESCORTS",
"WEIRD_MIND",
"MULTIPLY",
"REGENERATE",
- "SHAPECHANGER",
+ "CHAR_MULTI",
"ATTR_ANY",
"POWERFUL",
"ELDRITCH_HORROR",
"KILL_BODY",
"TAKE_ITEM",
"KILL_ITEM",
- "BRAIN_1",
- "BRAIN_2",
- "BRAIN_3",
- "BRAIN_4",
- "BRAIN_5",
- "BRAIN_6",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
"HUMAN",
"QUANTUM"
};
"HURT_ROCK",
"HURT_FIRE",
"HURT_COLD",
- "IM_ACID",
- "IM_ELEC",
- "IM_FIRE",
- "IM_COLD",
- "IM_POIS",
- "RES_TELE",
- "RES_NETH",
- "RES_WATE",
- "RES_PLAS",
- "RES_NEXU",
- "RES_DISE",
- "RES_ALL",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
"NO_FEAR",
"NO_STUN",
"NO_CONF",
"CHAMELEON",
"KILL_EXP",
"TANUKI",
- "XXX7X16",
- "XXX7X17",
- "XXX7X18",
- "XXX7X19",
+ "HAS_DARK_1",
+ "SELF_DARK_1",
+ "HAS_DARK_2",
+ "SELF_DARK_2",
"XXX7X20",
"XXX7X21",
"XXX7X22",
/*
+ * Monster race flags - Resistances
+ */
+static cptr r_info_flagsr[] =
+{
+ "IM_ACID",
+ "IM_ELEC",
+ "IM_FIRE",
+ "IM_COLD",
+ "IM_POIS",
+ "RES_LITE",
+ "RES_DARK",
+ "RES_NETH",
+ "RES_WATE",
+ "RES_PLAS",
+ "RES_SHAR",
+ "RES_SOUN",
+ "RES_CHAO",
+ "RES_NEXU",
+ "RES_DISE",
+ "RES_WALL",
+ "RES_INER",
+ "RES_TIME",
+ "RES_GRAV",
+ "RES_ALL",
+ "RES_TELE",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+};
+
+
+/*
* Object flags
*/
static cptr k_info_flags[] =
"SUST_CON",
"SUST_CHR",
"RIDING",
- "XXX2",
+ "EASY_SPELL",
"IM_ACID",
"IM_ELEC",
"IM_FIRE",
*/
static cptr d_info_flags1[] =
{
- "WINNER",
- "MAZE",
- "SMALLEST",
- "BEGINNER",
- "BIG",
- "NO_DOORS",
- "WATER_RIVER",
- "LAVA_RIVER",
- "WATER_RIVERS",
- "LAVA_RIVERS",
- "CAVE",
- "CAVERN",
- "NO_UP",
- "HOT",
- "COLD",
- "NO_DOWN",
- "FORGET",
- "LAKE_WATER",
- "LAKE_LAVA",
- "LAKE_RUBBLE",
- "LAKE_TREE",
- "NO_VAULT",
- "ARENA",
- "DESTROY",
- "XXX1",
- "NO_CAVE",
- "NO_MAGIC",
- "NO_MELEE",
- "CHAMELEON",
- "DARKNESS",
- "XXX1",
- "XXX1"
+ "WINNER",
+ "MAZE",
+ "SMALLEST",
+ "BEGINNER",
+ "BIG",
+ "NO_DOORS",
+ "WATER_RIVER",
+ "LAVA_RIVER",
+ "XXX",
+ "XXX",
+ "CAVE",
+ "CAVERN",
+ "XXX",
+ "XXX",
+ "XXX",
+ "XXX",
+ "FORGET",
+ "LAKE_WATER",
+ "LAKE_LAVA",
+ "LAKE_RUBBLE",
+ "LAKE_TREE",
+ "NO_VAULT",
+ "ARENA",
+ "DESTROY",
+ "XXX",
+ "NO_CAVE",
+ "NO_MAGIC",
+ "NO_MELEE",
+ "CHAMELEON",
+ "DARKNESS",
+ "XXX",
+ "XXX"
};
* Initialize an "*_info" array, by parsing an ascii "template" file
*/
errr init_info_txt(FILE *fp, char *buf, header *head,
- parse_info_txt_func parse_info_txt_line)
+ parse_info_txt_func parse_info_txt_line)
{
errr err;
head->text_size = 0;
/* Parse */
- while (0 == my_fgets(fp, buf, sizeof(buf)))
+ while (0 == my_fgets(fp, buf, 1024))
{
/* Advance the line number */
error_line++;
continue;
}
+ /* Mega Hack -- Calculate Check Sum */
+ if (buf[0] != 'N' && buf[0] != 'D')
+ {
+ int i;
+ for (i = 0; buf[i]; i++)
+ {
+ head->v_extra += (byte)buf[i];
+ head->v_extra ^= (1 << (i % 8));
+ }
+ }
+
/* Parse the line */
if ((err = (*parse_info_txt_line)(buf, head)) != 0)
return (err);
else if (buf[0] == 'W')
{
int tval, sval, start, max;
- const s16b exp_conv_table[] = { 0, 4000, 6000, 7000, 8000 };
+ const s16b exp_conv_table[] =
+ {
+ WEAPON_EXP_UNSKILLED, WEAPON_EXP_BEGINNER, WEAPON_EXP_SKILLED,
+ WEAPON_EXP_EXPERT, WEAPON_EXP_MASTER
+ };
/* Scan for the values */
if (4 != sscanf(buf+2, "%d:%d:%d:%d",
&tval, &sval, &start, &max)) return (1);
- if (start < 0 || start > 4 || max < 0 || max > 4) return (8);
+ if (start < EXP_LEVEL_UNSKILLED || start > EXP_LEVEL_MASTER
+ || max < EXP_LEVEL_UNSKILLED || max > EXP_LEVEL_MASTER) return (8);
/* Save the values */
s_ptr->w_start[tval][sval] = exp_conv_table[start];
if (3 != sscanf(buf+2, "%d:%d:%d",
&num, &start, &max)) return (1);
- if (start < 0 || start > 8000 || max < 0 || max > 8000) return (8);
+ if (start < WEAPON_EXP_UNSKILLED || start > WEAPON_EXP_MASTER
+ || max < WEAPON_EXP_UNSKILLED || max > WEAPON_EXP_MASTER) return (8);
/* Save the values */
s_ptr->s_start[num] = start;
}
#endif
-#if 0
-
- /* Process 'D' for "Description" */
- else if (buf[0] == 'D')
- {
- /* Acquire the text */
- s = buf+2;
-
- /* Store the text */
- if (!add_text(&f_ptr->text, head, s)) return (7);
- }
-
-#endif
-
/* Process 'M' for "Mimic" (one line only) */
else if (buf[0] == 'M')
}
}
+ /* Scan flagsr (resistance) */
+ for (i = 0; i < 32; i++)
+ {
+ if (streq(what, r_info_flagsr[i]))
+ {
+ r_ptr->flagsr |= (1L << i);
+ return (0);
+ }
+ }
+
/* Oops */
#ifdef JP
msg_format("̤ÃΤΥâ¥ó¥¹¥¿¡¼¡¦¥Õ¥é¥° '%s'¡£", what);
if (1 == sscanf(s, "1_IN_%d", &i))
{
/* Extract a "frequency" */
- r_ptr->freq_spell = r_ptr->freq_inate = 100 / i;
+ r_ptr->freq_spell = 100 / i;
/* Start at next entry */
s = t;
/* Scan flags1 */
for (i = 0; i < 32; i++)
{
- if (streq(what, d_info_flags1[i]))
+ if (streq(what, d_info_flags1[i]))
{
- d_ptr->flags1 |= (1L << i);
+ d_ptr->flags1 |= (1L << i);
return (0);
}
}
/* Oops */
#ifdef JP
- msg_format("̤ÃΤΥÀ¥ó¥¸¥ç¥ó¡¦¥Õ¥é¥° '%s'¡£", what);
+ msg_format("̤ÃΤΥÀ¥ó¥¸¥ç¥ó¡¦¥Õ¥é¥° '%s'¡£", what);
#else
- msg_format("Unknown dungeon type flag '%s'.", what);
+ msg_format("Unknown dungeon type flag '%s'.", what);
#endif
/* Failure */
/* Scan flags1 */
for (i = 0; i < 32; i++)
{
- if (streq(what, r_info_flags1[i]))
+ if (streq(what, r_info_flags1[i]))
{
- d_ptr->mflags1 |= (1L << i);
+ d_ptr->mflags1 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags2[i]))
{
- d_ptr->mflags2 |= (1L << i);
+ d_ptr->mflags2 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags3[i]))
{
- d_ptr->mflags3 |= (1L << i);
+ d_ptr->mflags3 |= (1L << i);
return (0);
}
}
/* Scan flags7 */
for (i = 0; i < 32; i++)
{
- if (streq(what, r_info_flags7[i]))
+ if (streq(what, r_info_flags7[i]))
{
- d_ptr->mflags7 |= (1L << i);
+ d_ptr->mflags7 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags8[i]))
{
- d_ptr->mflags8 |= (1L << i);
+ d_ptr->mflags8 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags9[i]))
{
- d_ptr->mflags9 |= (1L << i);
+ d_ptr->mflags9 |= (1L << i);
+ return (0);
+ }
+ }
+
+ /* Scan flagsr (resistance) */
+ for (i = 0; i < 32; i++)
+ {
+ if (streq(what, r_info_flagsr[i]))
+ {
+ d_ptr->mflagsr |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags4[i]))
{
- d_ptr->mflags4 |= (1L << i);
+ d_ptr->mflags4 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags5[i]))
{
- d_ptr->mflags5 |= (1L << i);
+ d_ptr->mflags5 |= (1L << i);
return (0);
}
}
{
if (streq(what, r_info_flags6[i]))
{
- d_ptr->mflags6 |= (1L << i);
+ d_ptr->mflags6 |= (1L << i);
return (0);
}
}
/* Scan for the values */
if (7 != sscanf(buf+2, "%d:%d:%d:%d:%d:%d:%d",
- &f1, &p1, &f2, &p2, &f3, &p3, &tunnel)) return (1);
+ &f1, &p1, &f2, &p2, &f3, &p3, &tunnel)) return (1);
/* Save the values */
d_ptr->floor1 = f1;
/* Parse every entry */
for (s = buf + 2; *s; )
{
- /* Find the end of this entry */
+ /* Find the end of this entry */
for (t = s; *t && (*t != ' ') && (*t != '|'); ++t) /* loop */;
- /* Nuke and skip any dividers */
+ /* Nuke and skip any dividers */
if (*t)
{
*t++ = '\0';
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read Final Artifact */
+ /* XXX XXX XXX Hack -- Read Final Artifact */
if (1 == sscanf(s, "FINAL_ARTIFACT_%d", &artif))
{
/* Extract a "Final Artifact" */
continue;
}
- /* XXX XXX XXX Hack -- Read Final Object */
+ /* XXX XXX XXX Hack -- Read Final Object */
if (1 == sscanf(s, "FINAL_OBJECT_%d", &artif))
{
/* Extract a "Final Artifact" */
continue;
}
- /* XXX XXX XXX Hack -- Read Artifact Guardian */
+ /* XXX XXX XXX Hack -- Read Artifact Guardian */
if (1 == sscanf(s, "FINAL_GUARDIAN_%d", &monst))
{
/* Extract a "Artifact Guardian" */
continue;
}
- /* XXX XXX XXX Hack -- Read Special Percentage */
+ /* XXX XXX XXX Hack -- Read Special Percentage */
if (1 == sscanf(s, "MONSTER_DIV_%d", &monst))
{
/* Extract a "Special %" */
continue;
}
- /* Parse this entry */
+ /* Parse this entry */
if (0 != grab_one_dungeon_flag(d_ptr, s)) return (5);
- /* Start the next entry */
+ /* Start the next entry */
s = t;
}
}
/* Process 'M' for "Basic Flags" (multiple lines) */
else if (buf[0] == 'M')
{
- byte r_char_number = 0, r_char;
-
/* Parse every entry */
for (s = buf + 2; *s; )
{
- /* Find the end of this entry */
+ /* Find the end of this entry */
for (t = s; *t && (*t != ' ') && (*t != '|'); ++t) /* loop */;
- /* Nuke and skip any dividers */
+ /* Nuke and skip any dividers */
if (*t)
{
*t++ = '\0';
while (*t == ' ' || *t == '|') t++;
}
- /* XXX XXX XXX Hack -- Read monster symbols */
- if (1 == sscanf(s, "R_CHAR_%c", &r_char))
+ /* Hack -- Read monster symbols */
+ if (!strncmp(s, "R_CHAR_", 7))
{
- /* Limited to 5 races */
- if(r_char_number >= 5) continue;
+ /* Skip "R_CHAR_" */
+ s += 7;
- /* Extract a "frequency" */
- d_ptr->r_char[r_char_number++] = r_char;
+ /* Read a string */
+ strncpy(d_ptr->r_char, s, sizeof(d_ptr->r_char));
/* Start at next entry */
s = t;
continue;
}
- /* Parse this entry */
+ /* Parse this entry */
if (0 != grab_one_basic_monster_flag(d_ptr, s)) return (5);
- /* Start the next entry */
+ /* Start the next entry */
s = t;
}
}
*/
if (randint0(100) < 75)
{
- place_object(*y, *x, FALSE, FALSE);
+ place_object(*y, *x, 0L);
}
else
{
/* Create an out of deep object */
if (randint0(100) < 75)
- place_object(*y, *x, FALSE, FALSE);
+ place_object(*y, *x, 0L);
else if (randint0(100) < 80)
- place_object(*y, *x, TRUE, FALSE);
+ place_object(*y, *x, AM_GOOD);
else
- place_object(*y, *x, TRUE, TRUE);
+ place_object(*y, *x, AM_GOOD | AM_GREAT);
object_level = base_level;
}
{
place_trap(*y, *x);
}
+ /* Hidden trap (or door) */
+ else if (letter[idx].trap)
+ {
+ c_ptr->mimic = f_info[c_ptr->feat].mimic;
+ c_ptr->feat = letter[idx].trap;
+ }
else if (object_index)
{
/* Get local object */
}
/* Apply magic (no messages, no artifacts) */
- apply_magic(o_ptr, base_level, FALSE, TRUE, FALSE, FALSE);
+ apply_magic(o_ptr, base_level, AM_NO_FIXED_ART | AM_GOOD);
(void)drop_near(o_ptr, -1, *y, *x);
}
{
if (a_info[artifact_index].cur_num)
{
- int k_idx = 198;
+ int k_idx = lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
object_type forge;
object_type *q_ptr = &forge;
max_e_idx = atoi(zz[1]);
}
- /* Maximum d_idx */
- else if (zz[0][0] == 'D')
+ /* Maximum d_idx */
+ else if (zz[0][0] == 'D')
{
- max_d_idx = atoi(zz[1]);
+ max_d_idx = atoi(zz[1]);
}
/* Maximum o_idx */
else if (streq(b+1, "RACE"))
{
#ifdef JP
- v = rp_ptr->E_title;
+ v = rp_ptr->E_title;
#else
v = rp_ptr->title;
#endif
else if (streq(b+1, "CLASS"))
{
#ifdef JP
- v = cp_ptr->E_title;
+ v = cp_ptr->E_title;
#else
v = cp_ptr->title;
#endif
#ifdef JP
v = E_realm_names[p_ptr->realm1];
#else
- v = realm_names[p_ptr->realm1];
+ v = realm_names[p_ptr->realm1];
#endif
}
else if (streq(b+1, "REALM2"))
{
#ifdef JP
- v = E_realm_names[p_ptr->realm2];
+ v = E_realm_names[p_ptr->realm2];
#else
v = realm_names[p_ptr->realm2];
#endif
/* Apply conditionals */
if (bypass) continue;
-
- /* Process "%:<file>" */
- if (buf[0] == '%')
- {
- /* Process that file if allowed */
- (void)process_dungeon_file(buf + 2, ymin, xmin, ymax, xmax);
-
- /* Continue */
- continue;
- }
-
-
/* Process the line */
err = process_dungeon_file_aux(buf, ymin, xmin, ymax, xmax, &y, &x);
int i, j, z, fc, bc;
int dlen;
- cptr flags[288];
+ cptr flags[32 * 10];
- u32b f_ptr[9];
- cptr *n_ptr[9];
+ u32b f_ptr[10];
+ cptr *n_ptr[10];
monster_race *r_ptr;
f_ptr[6] = r_ptr->flags7; n_ptr[6] = r_info_flags7;
f_ptr[7] = r_ptr->flags8; n_ptr[7] = r_info_flags8;
f_ptr[8] = r_ptr->flags9; n_ptr[8] = r_info_flags9;
+ f_ptr[9] = r_ptr->flagsr; n_ptr[9] = r_info_flagsr;
/* Write New/Number/Name */
fprintf(fff, "N:%d:%s\n", z + 1, r_name + r_ptr->name);
}
/* Extract the flags */
- for (fc = 0, j = 0; j < 96; j++)
+ for (fc = 0, j = 0; j < 32 * 3; j++)
{
/* Check this flag */
if (f_ptr[j / 32] & (1L << (j % 32))) flags[fc++] = n_ptr[j / 32][j % 32];
}
/* Extract the extra flags */
- for (j = 192; j < 288; j++)
+ for (j = 32 * 6; j < 32 * 10; j++)
{
/* Check this flag */
if (f_ptr[j / 32] & (1L << (j % 32))) flags[fc++] = n_ptr[j / 32][j % 32];
OSDN Git Service
