#include "angband.h"
#include "util.h"
+#include "main/music-definitions-table.h"
-#include "core.h"
-#include "dungeon.h"
-#include "floor.h"
-#include "floor-save.h"
-#include "floor-events.h"
+#include "core/system-variables.h"
+#include "dungeon/dungeon.h"
+#include "floor/floor.h"
+#include "floor/floor-save.h"
+#include "floor/floor-events.h"
#include "grid.h"
#include "quest.h"
-#include "monsterrace-hook.h"
-#include "monster.h"
-#include "player-status.h"
-#include "player-personality.h"
+#include "monster/monsterrace-hook.h"
+#include "monster/monster.h"
+#include "player/player-status.h"
+#include "player/player-personality.h"
#include "artifact.h"
#include "feature.h"
-#include "world.h"
-#include "cmd-dump.h"
+#include "world/world.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
#include "english.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
quest_type *quest; /*!< Quest info */
QUEST_IDX max_q_idx; /*!< Maximum number of quests */
* Random monster 5 - 10 levels out of depth
* (depending on level)
*/
- r_idx = get_mon_num(player_ptr, q_ptr->level + 5 + randint1(q_ptr->level / 10));
+ r_idx = get_mon_num(player_ptr, q_ptr->level + 5 + randint1(q_ptr->level / 10), GMN_ARENA);
monster_race *r_ptr;
r_ptr = &r_info[r_idx];
return;
}
- bool is_random_quest_skipped = (r_ptr->flags1 & RF1_UNIQUE);
- is_random_quest_skipped &= 0 == r_ptr->max_num;
+ bool is_random_quest_skipped = (r_ptr->flags1 & RF1_UNIQUE) != 0;
+ is_random_quest_skipped &= r_ptr->max_num == 0;
if (!is_random_quest_skipped)
{
msg_format(_("注意せよ!この階は%sによって守られている!", "Beware, this level is protected by %s!"), name);
msg_print(_("ここにはクエストへの入口があります。", "There is an entry of a quest."));
if (!get_check(_("クエストに入りますか?", "Do you enter? "))) return;
- if ((player_ptr->pseikaku == SEIKAKU_COMBAT) || (player_ptr->inventory_list[INVEN_BOW].name1 == ART_CRIMSON))
+ if (IS_ECHIZEN(player_ptr))
msg_print(_("『とにかく入ってみようぜぇ。』", ""));
else if (player_ptr->pseikaku == SEIKAKU_CHARGEMAN) msg_print("『全滅してやるぞ!』");