OSDN Git Service

Integrate initial flag, level and value settings of activations for random artifacts...
[hengband/hengband.git] / src / init1.c
index f063877..ba9accb 100644 (file)
@@ -123,6 +123,8 @@ static cptr r_info_blow_effect[] =
        "EXP_VAMP",
        "DR_MANA",
        "SUPERHURT",
+       "INERTIA",
+       "STUN",
        NULL
 };
 
@@ -246,22 +248,8 @@ static cptr f_info_flags[] =
        "MIRROR",
        "UNPERM",
        "TELEPORTABLE",
-};
-
-
-/*
- * Special feature info tags
- */
-static cptr f_info_special_tags[] =
-{
-       "*FLOOR*",
-       "*WALL*",
-       "*INNER*",
-       "*OUTER*",
-       "*SOLID*",
-       "*STREAM1*",
-       "*STREAM2*",
-       NULL,
+       "CONVERT",
+       "GLASS",
 };
 
 
@@ -743,7 +731,7 @@ static cptr k_info_flags[] =
        "HIDE_TYPE",
        "SHOW_MODS",
        "XXX1",
-       "FEATHER",
+       "LEVITATION",
        "LITE",
        "SEE_INVIS",
        "TELEPATHY",
@@ -785,6 +773,7 @@ static cptr k_info_flags[] =
        "ESP_NONLIVING",
        "ESP_UNIQUE",
        "FULL_NAME",
+       "FIXED_FLAVOR",
 };
 
 
@@ -806,7 +795,7 @@ static cptr k_info_gen_flags[] =
        "RANDOM_CURSE0",
        "RANDOM_CURSE1",
        "RANDOM_CURSE2",
-       "XXX",
+       "XTRA_DICE",
        "XXX",
        "XXX",
        "XXX",
@@ -824,7 +813,6 @@ static cptr k_info_gen_flags[] =
        "XXX",
 };
 
-
 /*
  * Dungeon flags
  */
@@ -838,8 +826,8 @@ static cptr d_info_flags1[] =
        "NO_DOORS",
        "WATER_RIVER",
        "LAVA_RIVER",
-       "XXX",
-       "XXX",
+       "CURTAIN",
+       "GLASS_DOOR",
        "CAVE",
        "CAVERN",
        "XXX",
@@ -854,7 +842,7 @@ static cptr d_info_flags1[] =
        "NO_VAULT",
        "ARENA",
        "DESTROY",
-       "XXX",
+       "GLASS_ROOM",
        "NO_CAVE",
        "NO_MAGIC",
        "NO_MELEE",
@@ -871,7 +859,7 @@ static cptr d_info_flags1[] =
  * Returns FALSE when there isn't enough space available to store
  * the text.
  */
-static bool add_text(u32b *offset, header *head, cptr buf)
+static bool add_text(u32b *offset, header *head, cptr buf, bool normal_text)
 {
        /* Hack -- Verify space */
        if (head->text_size + strlen(buf) + 8 > FAKE_TEXT_SIZE)
@@ -881,7 +869,34 @@ static bool add_text(u32b *offset, header *head, cptr buf)
        if (*offset == 0)
        {
                /* Advance and save the text index */
-               *offset = ++head->text_size;    
+               *offset = ++head->text_size;
+       }
+
+       /* Additional text */
+       else if (normal_text)
+       {
+               /*
+                * If neither the end of the last line nor
+                * the beginning of current line is not a space,
+                * fill up a space as a correct separator of two words.
+                */
+               if (head->text_size > 0 &&
+#ifdef JP
+                   (*(head->text_ptr + head->text_size - 1) != ' ') &&
+                   ((head->text_size == 1) || !iskanji(*(head->text_ptr + head->text_size - 2))) && 
+                   (buf[0] != ' ') && !iskanji(buf[0])
+#else
+                   (*(head->text_ptr + head->text_size - 1) != ' ') &&
+                   (buf[0] != ' ')
+#endif
+                   )
+               {
+                       /* Append a space */
+                       *(head->text_ptr + head->text_size) = ' ';
+
+                       /* Advance the index */
+                       head->text_size++;
+               }
        }
 
        /* Append chars to the text */
@@ -1020,7 +1035,7 @@ errr init_info_txt(FILE *fp, char *buf, header *head,
        /* Prepare the "fake" stuff */
        head->name_size = 0;
        head->text_size = 0;
-       head->tag_size = 1;
+       head->tag_size = 0;
 
        /* Parse */
        while (0 == my_fgets(fp, buf, 1024))
@@ -1123,7 +1138,7 @@ errr parse_v_info(char *buf, header *head)
                s = buf+2;
 
                /* Store the text */
-               if (!add_text(&v_ptr->text, head, s)) return (7);
+               if (!add_text(&v_ptr->text, head, s, FALSE)) return (7);
        }
 
        /* Process 'X' for "Extra info" (one line only) */
@@ -1543,7 +1558,7 @@ errr parse_f_info(char *buf, header *head)
        else if (buf[0] == 'G')
        {
                int j;
-               byte def_attr[F_LIT_MAX];
+               byte s_attr;
                char char_tmp[F_LIT_MAX];
 
                /* Paranoia */
@@ -1556,43 +1571,29 @@ errr parse_f_info(char *buf, header *head)
                char_tmp[F_LIT_STANDARD] = buf[2];
 
                /* Extract the color */
-               def_attr[F_LIT_STANDARD] = color_char_to_attr(buf[4]);
+               s_attr = color_char_to_attr(buf[4]);
 
                /* Paranoia */
-               if (def_attr[F_LIT_STANDARD] > 127) return (1);
+               if (s_attr > 127) return (1);
 
-               /* Save the default values for lighting */
-               for (j = 0; j < F_LIT_MAX; j++)
-               {
-                       f_ptr->d_attr[j] = def_attr[F_LIT_STANDARD];
-                       f_ptr->d_char[j] = char_tmp[F_LIT_STANDARD];
-               }
+               /* Save the standard values */
+               f_ptr->d_attr[F_LIT_STANDARD] = s_attr;
+               f_ptr->d_char[F_LIT_STANDARD] = char_tmp[F_LIT_STANDARD];
 
                /* Is this feature supports lighting? */
                if (buf[5] == ':')
                {
-                       def_attr[F_LIT_LITE] = lighting_colours[def_attr[F_LIT_STANDARD]][0];
-                       def_attr[F_LIT_DARK] = lighting_colours[def_attr[F_LIT_STANDARD]][1];
-                       def_attr[F_LIT_DARKDARK] = lighting_colours[lighting_colours[def_attr[F_LIT_STANDARD]][1]][1];
-
                        /* G:c:a:LIT (default) */
-                       if (streq(buf + 6, "LIT"))
-                       {
-                               for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
-                               {
-                                       f_ptr->d_attr[j] = def_attr[j];
-                               }
-                       }
+                       apply_default_feat_lighting(f_ptr->d_attr, f_ptr->d_char);
 
-                       /* G:c:a:lc:la:dc:da:Dc:Da */
-                       else
+                       /* G:c:a:lc:la:dc:da */
+                       if (!streq(buf + 6, "LIT"))
                        {
                                char attr_lite_tmp[F_LIT_MAX - F_LIT_NS_BEGIN];
 
-                               if ((F_LIT_MAX - F_LIT_NS_BEGIN) * 2 != sscanf(buf + 6, "%c:%c:%c:%c:%c:%c",
+                               if ((F_LIT_MAX - F_LIT_NS_BEGIN) * 2 != sscanf(buf + 6, "%c:%c:%c:%c",
                                        &char_tmp[F_LIT_LITE], &attr_lite_tmp[F_LIT_LITE - F_LIT_NS_BEGIN],
-                                       &char_tmp[F_LIT_DARK], &attr_lite_tmp[F_LIT_DARK - F_LIT_NS_BEGIN],
-                                       &char_tmp[F_LIT_DARKDARK], &attr_lite_tmp[F_LIT_DARKDARK - F_LIT_NS_BEGIN])) return 1;
+                                       &char_tmp[F_LIT_DARK], &attr_lite_tmp[F_LIT_DARK - F_LIT_NS_BEGIN])) return 1;
                                if (buf[F_LIT_MAX * 4 + 1]) return 1;
 
                                for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
@@ -1601,11 +1602,10 @@ errr parse_f_info(char *buf, header *head)
                                        {
                                        case '*':
                                                /* Use default lighting */
-                                               f_ptr->d_attr[j] = def_attr[j];
                                                break;
                                        case '-':
                                                /* No lighting support */
-                                               f_ptr->d_attr[j] = def_attr[F_LIT_STANDARD];
+                                               f_ptr->d_attr[j] = f_ptr->d_attr[F_LIT_STANDARD];
                                                break;
                                        default:
                                                /* Extract the color */
@@ -1617,7 +1617,15 @@ errr parse_f_info(char *buf, header *head)
                                }
                        }
                }
-               else if (buf[5]) return 1;
+               else if (!buf[5])
+               {
+                       for (j = F_LIT_NS_BEGIN; j < F_LIT_MAX; j++)
+                       {
+                               f_ptr->d_attr[j] = s_attr;
+                               f_ptr->d_char[j] = char_tmp[F_LIT_STANDARD];
+                       }
+               }
+               else return 1;
        }
 
        /* Hack -- Process 'F' for flags */
@@ -1636,6 +1644,19 @@ errr parse_f_info(char *buf, header *head)
                                while (*t == ' ' || *t == '|') t++;
                        }
 
+                       /* XXX XXX XXX Hack -- Read feature subtype */
+                       if (1 == sscanf(s, "SUBTYPE_%d", &i))
+                       {
+                               /* Extract a "subtype" */
+                               f_ptr->subtype =  i;
+
+                               /* Start at next entry */
+                               s = t;
+
+                               /* Continue */
+                               continue;
+                       }
+
                        /* XXX XXX XXX Hack -- Read feature power */
                        if (1 == sscanf(s, "POWER_%d", &i))
                        {
@@ -1734,18 +1755,8 @@ s16b f_tag_to_index(cptr str)
                }
        }
 
-       /* Search for special index corresponding to this fake tag */
-       for (i = 0; f_info_special_tags[i]; i++)
-       {
-               if (streq(f_info_special_tags[i], str))
-               {
-                       /* Return the special index */
-                       return (s16b)(FEAT_DUNGEON_FLOOR - i);
-               }
-       }
-
        /* Not found */
-       return 0;
+       return -1;
 }
 
 
@@ -1770,17 +1781,6 @@ static void search_real_feat(s16b *feat)
                }
        }
 
-       /* Search for special index corresponding to this fake tag */
-       for (i = 0; f_info_special_tags[i]; i++)
-       {
-               if (streq(f_info_special_tags[i], f_tag + (-(*feat))))
-               {
-                       /* Record special index */
-                       *feat = (s16b)(FEAT_DUNGEON_FLOOR - i);
-                       return;
-               }
-       }
-
        /* Undefined tag */
 #ifdef JP
        msg_format("̤ÄêµÁ¤Î¥¿¥° '%s'¡£", f_tag + (-(*feat)));
@@ -1861,19 +1861,19 @@ errr parse_k_info(char *buf, header *head)
        /* Process 'N' for "New/Number/Name" */
        if (buf[0] == 'N')
        {
+#ifdef JP
+               char *flavor;
+#endif
+
                /* 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 */
                *s++ = '\0';
 
-#ifdef JP
-               /* Paranoia -- require a name */
-               if (!*s) return (1);
-#endif
                /* Get the index */
                i = atoi(buf+2);
 
@@ -1890,6 +1890,22 @@ errr parse_k_info(char *buf, header *head)
                k_ptr = &k_info[i];
 
 #ifdef JP
+               /* Paranoia -- require a name */
+               if (!*s) return (1);
+
+               /* Find the colon before the flavor */
+               flavor = my_strchr(s, ':');
+
+               /* Verify that colon */
+               if (flavor)
+               {
+                       /* Nuke the colon, advance to the flavor */
+                       *flavor++ = '\0';
+
+                       /* Store the flavor */
+                       if (!add_name(&k_ptr->flavor_name, head, flavor)) return (7);
+               }
+
                /* Store the name */
                if (!add_name(&k_ptr->name, head, s)) return (7);
 #endif
@@ -1909,9 +1925,24 @@ errr parse_k_info(char *buf, header *head)
 #else
        else if (buf[0] == 'E')
        {
-               /* Acquire the Text */
+               char *flavor;
+
+               /* Acquire the name */
                s = buf+2;
 
+               /* Find the colon before the flavor */
+               flavor = my_strchr(s, ':');
+
+               /* Verify that colon */
+               if (flavor)
+               {
+                       /* Nuke the colon, advance to the flavor */
+                       *flavor++ = '\0';
+
+                       /* Store the flavor */
+                       if (!add_name(&k_ptr->flavor_name, head, flavor)) return (7);
+               }
+
                /* Store the name */
                if (!add_name(&k_ptr->name, head, s)) return (7);
        }
@@ -1933,7 +1964,7 @@ errr parse_k_info(char *buf, header *head)
 #endif
 
                /* Store the text */
-               if (!add_text(&k_ptr->text, head, s)) return (7);
+               if (!add_text(&k_ptr->text, head, s, TRUE)) return (7);
        }
 
        /* Process 'G' for "Graphics" (one line only) */
@@ -2106,7 +2137,39 @@ static errr grab_one_artifact_flag(artifact_type *a_ptr, cptr what)
        return (1);
 }
 
+/*
+ * Grab one activation index flag
+ */
+static byte grab_one_activation_flag(cptr what)
+{
+       int i;
+
+       for (i = 0; ; i++)
+       {
+               if (activation_info[i].flag == NULL) break;
+
+               if (streq(what, activation_info[i].flag))
+               {
+                       return activation_info[i].index;
+               }
+       }
+
+       i = atoi(what);
+        if (i > 0)
+        {
+                return ((byte) i);
+        }
+
+       /* Oops */
+#ifdef JP
+       msg_format("̤ÃΤÎȯư¡¦¥Õ¥é¥° '%s'¡£", what);
+#else
+       msg_format("Unknown activation flag '%s'.", what);
+#endif
 
+       /* Error */
+       return (0);
+}
 
 
 /*
@@ -2201,7 +2264,7 @@ errr parse_a_info(char *buf, header *head)
 #endif
 
                /* Store the text */
-               if (!add_text(&a_ptr->text, head, s)) return (7);
+               if (!add_text(&a_ptr->text, head, s, TRUE)) return (7);
        }
 
 
@@ -2254,6 +2317,21 @@ errr parse_a_info(char *buf, header *head)
                a_ptr->to_a =  ta;
        }
 
+       /* Hack -- Process 'U' for activation index */
+       else if (buf[0] == 'U')
+       {
+               byte n;
+               n = grab_one_activation_flag(buf + 2);
+               if (n > 0)
+               {
+                       a_ptr->act_idx = n;
+               }
+               else
+               {
+                       return (5);
+               }
+       }
+
        /* Hack -- Process 'F' for flags */
        else if (buf[0] == 'F')
        {
@@ -2408,7 +2486,7 @@ errr parse_e_info(char *buf, header *head)
                s = buf+2;
 
                /* Store the text */
-               if (!add_text(&e_ptr->text, head, s)) return (7);
+               if (!add_text(&e_ptr->text, head, s, TRUE)) return (7);
        }
 
 #endif
@@ -2648,7 +2726,7 @@ errr parse_r_info(char *buf, header *head)
 #endif
 
                /* Store the text */
-               if (!add_text(&r_ptr->text, head, s)) return (7);
+               if (!add_text(&r_ptr->text, head, s, TRUE)) return (7);
        }
 
        /* Process 'G' for "Graphics" (one line only) */
@@ -2688,8 +2766,8 @@ errr parse_r_info(char *buf, header *head)
 
                /* Save the values */
                r_ptr->speed = spd;
-               r_ptr->hdice = hp1;
-               r_ptr->hside = hp2;
+               r_ptr->hdice = MAX(hp1, 1);
+               r_ptr->hside = MAX(hp2, 1);
                r_ptr->aaf = aaf;
                r_ptr->ac = ac;
                r_ptr->sleep = slp;
@@ -3002,7 +3080,7 @@ errr parse_d_info(char *buf, header *head)
 #endif
 
                /* Store the text */
-               if (!add_text(&d_ptr->text, head, s)) return (7);
+               if (!add_text(&d_ptr->text, head, s, TRUE)) return (7);
        }
 
        /* Process 'W' for "More Info" (one line only) */
@@ -3056,6 +3134,8 @@ errr parse_d_info(char *buf, header *head)
                for (i = 0; i < DUNGEON_FEAT_PROB_NUM; i++)
                {
                        d_ptr->floor[i].feat = f_tag_to_index(zz[i * 2]);
+                       if (d_ptr->floor[i].feat < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
+
                        d_ptr->floor[i].percent = atoi(zz[i * 2 + 1]);
                }
                d_ptr->tunnel_percent = atoi(zz[DUNGEON_FEAT_PROB_NUM * 2]);
@@ -3073,12 +3153,22 @@ errr parse_d_info(char *buf, header *head)
                for (i = 0; i < DUNGEON_FEAT_PROB_NUM; i++)
                {
                        d_ptr->fill[i].feat = f_tag_to_index(zz[i * 2]);
+                       if (d_ptr->fill[i].feat < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
+
                        d_ptr->fill[i].percent = atoi(zz[i * 2 + 1]);
                }
+
                d_ptr->outer_wall = f_tag_to_index(zz[DUNGEON_FEAT_PROB_NUM * 2]);
+               if (d_ptr->outer_wall < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
+
                d_ptr->inner_wall = f_tag_to_index(zz[DUNGEON_FEAT_PROB_NUM * 2 + 1]);
+               if (d_ptr->inner_wall < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
+
                d_ptr->stream1 = f_tag_to_index(zz[DUNGEON_FEAT_PROB_NUM * 2 + 2]);
+               if (d_ptr->stream1 < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
+
                d_ptr->stream2 = f_tag_to_index(zz[DUNGEON_FEAT_PROB_NUM * 2 + 3]);
+               if (d_ptr->stream2 < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
        }
 
        /* Process 'F' for "Dungeon Flags" (multiple lines) */
@@ -3251,13 +3341,13 @@ static int i = 0;
 
 
 /* Random dungeon grid effects */
-#define RANDOM_NONE         0x00
-#define RANDOM_FEATURE      0x01
-#define RANDOM_MONSTER      0x02
-#define RANDOM_OBJECT       0x04
-#define RANDOM_EGO          0x08
-#define RANDOM_ARTIFACT     0x10
-#define RANDOM_TRAP         0x20
+#define RANDOM_NONE         0x00000000
+#define RANDOM_FEATURE      0x00000001
+#define RANDOM_MONSTER      0x00000002
+#define RANDOM_OBJECT       0x00000004
+#define RANDOM_EGO          0x00000008
+#define RANDOM_ARTIFACT     0x00000010
+#define RANDOM_TRAP         0x00000020
 
 
 typedef struct dungeon_grid dungeon_grid;
@@ -3297,15 +3387,15 @@ static errr parse_line_feature(char *buf)
                int index = zz[0][0];
 
                /* Reset the info for the letter */
-               letter[index].feature = 0;
+               letter[index].feature = feat_none;
                letter[index].monster = 0;
                letter[index].object = 0;
                letter[index].ego = 0;
                letter[index].artifact = 0;
-               letter[index].trap = 0;
+               letter[index].trap = feat_none;
                letter[index].cave_info = 0;
                letter[index].special = 0;
-               letter[index].random = 0;
+               letter[index].random = RANDOM_NONE;
 
                switch (num)
                {
@@ -3315,19 +3405,14 @@ static errr parse_line_feature(char *buf)
                                /* Fall through */
                        /* Trap */
                        case 8:
-                               if (zz[7][0] == '*')
+                               if ((zz[7][0] == '*') && !zz[7][1])
                                {
                                        letter[index].random |= RANDOM_TRAP;
-
-                                       if (zz[7][1])
-                                       {
-                                               zz[7]++;
-                                               letter[index].trap = atoi(zz[7]);
-                                       }
                                }
                                else
                                {
-                                       letter[index].trap = atoi(zz[7]);
+                                       letter[index].trap = f_tag_to_index(zz[7]);
+                                       if (letter[index].trap < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
                                }
                                /* Fall through */
                        /* Artifact */
@@ -3335,11 +3420,13 @@ static errr parse_line_feature(char *buf)
                                if (zz[6][0] == '*')
                                {
                                        letter[index].random |= RANDOM_ARTIFACT;
-
-                                       if (zz[6][1])
+                                       if (zz[6][1]) letter[index].artifact = atoi(zz[6] + 1);
+                               }
+                               else if (zz[6][0] == '!')
+                               {
+                                       if (p_ptr->inside_quest)
                                        {
-                                               zz[6]++;
-                                               letter[index].artifact = atoi(zz[6]);
+                                               letter[index].artifact = quest[p_ptr->inside_quest].k_idx;
                                        }
                                }
                                else
@@ -3352,12 +3439,7 @@ static errr parse_line_feature(char *buf)
                                if (zz[5][0] == '*')
                                {
                                        letter[index].random |= RANDOM_EGO;
-
-                                       if (zz[5][1])
-                                       {
-                                               zz[5]++;
-                                               letter[index].ego = atoi(zz[5]);
-                                       }
+                                       if (zz[5][1]) letter[index].ego = atoi(zz[5] + 1);
                                }
                                else
                                {
@@ -3369,11 +3451,21 @@ static errr parse_line_feature(char *buf)
                                if (zz[4][0] == '*')
                                {
                                        letter[index].random |= RANDOM_OBJECT;
-
-                                       if (zz[4][1])
+                                       if (zz[4][1]) letter[index].object = atoi(zz[4] + 1);
+                               }
+                               else if (zz[4][0] == '!')
+                               {
+                                       if (p_ptr->inside_quest)
                                        {
-                                               zz[4]++;
-                                               letter[index].object = atoi(zz[4]);
+                                               int a_idx = quest[p_ptr->inside_quest].k_idx;
+                                               if (a_idx)
+                                               {
+                                                       artifact_type *a_ptr = &a_info[a_idx];
+                                                       if (!(a_ptr->gen_flags & TRG_INSTA_ART))
+                                                       {
+                                                               letter[index].object = lookup_kind(a_ptr->tval, a_ptr->sval);
+                                                       }
+                                               }
                                        }
                                }
                                else
@@ -3386,15 +3478,12 @@ static errr parse_line_feature(char *buf)
                                if (zz[3][0] == '*')
                                {
                                        letter[index].random |= RANDOM_MONSTER;
-                                       if (zz[3][1])
-                                       {
-                                               zz[3]++;
-                                               letter[index].monster = atoi(zz[3]);
-                                       }
+                                       if (zz[3][1]) letter[index].monster = atoi(zz[3] + 1);
                                }
                                else if (zz[3][0] == 'c')
                                {
-                                       letter[index].monster = - atoi(zz[3]+1);
+                                       if (!zz[3][1]) return PARSE_ERROR_GENERIC;
+                                       letter[index].monster = - atoi(zz[3] + 1);
                                }
                                else
                                {
@@ -3407,18 +3496,14 @@ static errr parse_line_feature(char *buf)
                                /* Fall through */
                        /* Feature */
                        case 2:
-                               if (zz[1][0] == '*')
+                               if ((zz[1][0] == '*') && !zz[1][1])
                                {
                                        letter[index].random |= RANDOM_FEATURE;
-                                       if (zz[1][1])
-                                       {
-                                               zz[1]++;
-                                               letter[index].feature = atoi(zz[1]);
-                                       }
                                }
                                else
                                {
-                                       letter[index].feature = atoi(zz[1]);
+                                       letter[index].feature = f_tag_to_index(zz[1]);
+                                       if (letter[index].feature < 0) return PARSE_ERROR_UNDEFINED_TERRAIN_TAG;
                                }
                                break;
                }
@@ -3431,7 +3516,7 @@ static errr parse_line_feature(char *buf)
 
 
 /*
- * Process "F:<letter>:<terrain>:<cave_info>:<monster>:<object>:<ego>:<artifact>:<trap>:<special>" -- info for dungeon grid
+ * Process "B:<Index>:<Command>:..." -- Building definition
  */
 static errr parse_line_building(char *buf)
 {
@@ -3583,77 +3668,39 @@ static errr parse_line_building(char *buf)
 }
 
 
-static void drop_here(object_type *j_ptr, int by, int bx)
+/*
+ * Place the object j_ptr to a grid
+ */
+static void drop_here(object_type *j_ptr, int y, int x)
 {
-       int i, k, d, s;
-
-       s16b o_idx = 0;
-
-       s16b this_o_idx, next_o_idx = 0;
-
-       bool done = FALSE;
-
-       cave_type *c_ptr = &cave[by][bx];
-
-       /* Scan objects in that grid for combination */
-       for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
-       {
-               object_type *o_ptr;
-
-               /* Acquire object */
-               o_ptr = &o_list[this_o_idx];
-
-               /* Acquire next object */
-               next_o_idx = o_ptr->next_o_idx;
-
-               /* Check for combination */
-               if (object_similar(o_ptr, j_ptr))
-               {
-                       /* Combine the items */
-                       object_absorb(o_ptr, j_ptr);
-
-                       /* Success */
-                       done = TRUE;
-
-                       /* Done */
-                       break;
-               }
-       }
+       cave_type *c_ptr = &cave[y][x];
+       object_type *o_ptr;
 
        /* Get new object */
-       if (!done) o_idx = o_pop();
-
-
-       /* Stack */
-       if (!done)
-       {
-               /* Structure copy */
-               object_copy(&o_list[o_idx], j_ptr);
+       s16b o_idx = o_pop();
 
-               /* Access new object */
-               j_ptr = &o_list[o_idx];
+       /* Access new object */
+       o_ptr = &o_list[o_idx];
 
-               /* Locate */
-               j_ptr->iy = by;
-               j_ptr->ix = bx;
+       /* Structure copy */
+       object_copy(o_ptr, j_ptr);
 
-               /* No monster */
-               j_ptr->held_m_idx = 0;
 
-               /* Build a stack */
-               j_ptr->next_o_idx = c_ptr->o_idx;
+       /* Locate */
+       o_ptr->iy = y;
+       o_ptr->ix = x;
 
-               /* Place the object */
-               c_ptr->o_idx = o_idx;
+       /* No monster */
+       o_ptr->held_m_idx = 0;
 
-               /* Success */
-               done = TRUE;
-       }
+       /* Build a stack */
+       o_ptr->next_o_idx = c_ptr->o_idx;
 
-       /* Result */
-       return;
+       /* Place the object */
+       c_ptr->o_idx = o_idx;
 }
 
+
 /*
  * Parse a sub-file of the "extra info"
  */
@@ -3716,7 +3763,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        int artifact_index = letter[idx].artifact;
 
                        /* Lay down a floor */
-                       c_ptr->feat = letter[idx].feature;
+                       c_ptr->feat = conv_dungeon_feat(letter[idx].feature);
 
                        /* Only the features */
                        if (init_flags & INIT_ONLY_FEATURES) continue;
@@ -3819,7 +3866,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        else if (letter[idx].trap)
                        {
                                c_ptr->mimic = c_ptr->feat;
-                               c_ptr->feat = letter[idx].trap;
+                               c_ptr->feat = conv_dungeon_feat(letter[idx].trap);
                        }
                        else if (object_index)
                        {
@@ -3859,9 +3906,8 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                                else
                                {
                                        /* Create the artifact */
-                                       create_named_art(artifact_index, *y, *x);
-
-                                       a_info[artifact_index].cur_num = 1;
+                                       if (create_named_art(artifact_index, *y, *x))
+                                               a_info[artifact_index].cur_num = 1;
                                }
                        }
 
@@ -3927,10 +3973,42 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        return (0);
                }
 
+               else if (zz[1][0] == 'R')
+               {
+                       if (init_flags & INIT_ASSIGN)
+                       {
+                               int idx, count = 0;
+                               int reward_idx = 0;
+
+                               for (idx = 2; idx < num; idx++)
+                               {
+                                       int a_idx = atoi(zz[idx]);
+                                       if (a_idx < 1) continue;
+                                       if (a_info[a_idx].cur_num > 0) continue;
+                                       count++;
+                                       if (one_in_(count)) reward_idx = a_idx;
+                               }
+
+                               if (reward_idx)
+                               {
+                                       /* Set quest's rewarding artifact */
+                                       q_ptr->k_idx = reward_idx;
+                                       a_info[reward_idx].gen_flags |= TRG_QUESTITEM;
+                               }
+                               else
+                               {
+                                       /* Change a quest type to KILL_ALL when all artifact of reward list are got */
+                                       q_ptr->type = QUEST_TYPE_KILL_ALL;
+                               }
+                       }
+
+                       return (0);
+               }
+
                /* Process "Q:<q_index>:N:<name>" -- quest name */
                else if (zz[1][0] == 'N')
                {
-                       if (init_flags & (INIT_ASSIGN | INIT_SHOW_TEXT))
+                       if (init_flags & (INIT_ASSIGN | INIT_SHOW_TEXT | INIT_NAME_ONLY))
                        {
                                strcpy(q_ptr->name, zz[2]);
                        }
@@ -4254,7 +4332,15 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
        else
        {
                /* Accept all printables except spaces and brackets */
+#ifdef JP
+               while (iskanji(*s) || (isprint(*s) && !my_strchr(" []", *s)))
+               {
+                       if (iskanji(*s)) s++;
+                       s++;
+               }
+#else
                while (isprint(*s) && !my_strchr(" []", *s)) ++s;
+#endif
 
                /* Extract final and Terminate */
                if ((f = *s) != '\0') *s++ = '\0';
@@ -4325,7 +4411,22 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
                        /* Player name */
                        else if (streq(b+1, "PLAYER"))
                        {
-                               v = player_base;
+                               static char tmp_player_name[32];
+                               char *pn, *tpn;
+                               for (pn = player_name, tpn = tmp_player_name; *pn; pn++, tpn++)
+                               {
+#ifdef JP
+                                       if (iskanji(*pn))
+                                       {
+                                               *(tpn++) = *(pn++);
+                                               *tpn = *pn;
+                                               continue;
+                                       }
+#endif
+                                       *tpn = my_strchr(" []", *pn) ? '_' : *pn;
+                               }
+                               *tpn = '\0';
+                               v = tmp_player_name;
                        }
 
                        /* Town */
@@ -4356,6 +4457,14 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
                                v = tmp;
                        }
 
+                       /* Quest type */
+                       else if (prefix(b+1, "QUEST_TYPE"))
+                       {
+                               /* "QUEST_TYPE" uses a special parameter to determine the type of the quest */
+                               sprintf(tmp, "%d", quest[atoi(b+11)].type);
+                               v = tmp;
+                       }
+
                        /* Quest status */
                        else if (prefix(b+1, "QUEST"))
                        {