}
case CLASS_PALADIN:
+ case CLASS_SNIPER:
{
/* Bad sensing */
if (0 != randint0(77777L / (plev * plev + 40))) return;
case CLASS_SAMURAI:
case CLASS_CAVALRY:
case CLASS_BERSERKER:
+ case CLASS_SNIPER:
{
return;
}
#else
else if (get_check("Normal teleport? "))
#endif
-
{
- teleport_player(200, FALSE);
+ teleport_player(200, 0L);
return;
}
else
static void wreck_the_pattern(void)
{
int to_ruin = 0, r_y, r_x;
- int pattern_type = f_info[cave[py][px].feat].power;
+ int pattern_type = f_info[cave[py][px].feat].subtype;
if (pattern_type == PATTERN_TILE_WRECKED)
{
scatter(&r_y, &r_x, py, px, 4, 0);
if (pattern_tile(r_y, r_x) &&
- (f_info[cave[r_y][r_x].feat].power != PATTERN_TILE_WRECKED))
+ (f_info[cave[r_y][r_x].feat].subtype != PATTERN_TILE_WRECKED))
{
- cave_set_feat(r_y, r_x, FEAT_PATTERN_XTRA2);
+ cave_set_feat(r_y, r_x, feat_pattern_corrupted);
}
}
- cave_set_feat(py, px, FEAT_PATTERN_XTRA2);
+ cave_set_feat(py, px, feat_pattern_corrupted);
}
wreck_the_pattern();
}
- pattern_type = f_info[cave[py][px].feat].power;
+ pattern_type = f_info[cave[py][px].feat].subtype;
switch (pattern_type)
{
(void)restore_level();
(void)hp_player(1000);
- cave_set_feat(py, px, FEAT_PATTERN_OLD);
+ cave_set_feat(py, px, feat_pattern_old);
#ifdef JP
msg_print("¡Ö¥Ñ¥¿¡¼¥ó¡×¤Î¤³¤ÎÉôʬ¤Ï¾¤ÎÉôʬ¤è¤ê¶¯ÎϤǤʤ¤¤è¤¦¤À¡£");
{
quest[leaving_quest].status = QUEST_STATUS_FAILED;
quest[leaving_quest].complev = (byte)p_ptr->lev;
- if (quest[leaving_quest].type == QUEST_TYPE_RANDOM)
+
+ /* Additional settings */
+ switch (quest[leaving_quest].type)
{
+ case QUEST_TYPE_TOWER:
+ quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
+ quest[QUEST_TOWER1].complev = (byte)p_ptr->lev;
+ break;
+ case QUEST_TYPE_FIND_ARTIFACT:
+ a_info[quest[leaving_quest].type].gen_flags &= ~(TRG_QUESTITEM);
+ break;
+ case QUEST_TYPE_RANDOM:
r_info[quest[leaving_quest].r_idx].flags1 &= ~(RF1_QUESTOR);
- if (record_rand_quest)
- do_cmd_write_nikki(NIKKI_RAND_QUEST_F, leaving_quest, NULL);
/* Floor of random quest will be blocked */
prepare_change_floor_mode(CFM_NO_RETURN);
+ break;
+ }
+
+ /* Record finishing a quest */
+ if (quest[leaving_quest].type == QUEST_TYPE_RANDOM)
+ {
+ if (record_rand_quest) do_cmd_write_nikki(NIKKI_RAND_QUEST_F, leaving_quest, NULL);
+ }
+ else
+ {
+ if (record_fix_quest) do_cmd_write_nikki(NIKKI_FIX_QUEST_F, leaving_quest, NULL);
+ }
+ }
+}
+
+void leave_tower_check(void)
+{
+ leaving_quest = p_ptr->inside_quest;
+ /* Check for Tower Quest */
+ if (leaving_quest &&
+ (quest[leaving_quest].type == QUEST_TYPE_TOWER) &&
+ (quest[QUEST_TOWER1].status != QUEST_STATUS_COMPLETED))
+ {
+ if(quest[leaving_quest].type == QUEST_TYPE_TOWER)
+ {
+ quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
+ quest[QUEST_TOWER1].complev = (byte)p_ptr->lev;
}
- else if (record_fix_quest)
- do_cmd_write_nikki(NIKKI_FIX_QUEST_F, leaving_quest, NULL);
}
}
/* "Inscribe" it */
o_ptr->feeling = feel;
+ /* Player touches it */
+ o_ptr->marked |= OM_TOUCHED;
+
/* Combine / Reorder the pack (later) */
p_ptr->notice |= (PN_COMBINE | PN_REORDER);
#endif
(void)set_shero(10 + randint1(p_ptr->lev), FALSE);
+ (void)set_afraid(0);
}
if ((p_ptr->muta2 & MUT2_COWARDICE) && (randint1(3000) == 13))
#endif
msg_print(NULL);
- teleport_player(40, TRUE);
+ teleport_player(40, TELEPORT_PASSIVE);
}
}
msg_print(NULL);
if (one_in_(3)) lose_all_info();
else wiz_dark();
- (void)teleport_player_aux(100, TRUE, TRUE);
+ (void)teleport_player_aux(100, TELEPORT_NONMAGICAL | TELEPORT_PASSIVE);
wiz_dark();
#ifdef JP
msg_print("¤¢¤Ê¤¿¤Ï¸«ÃΤé¤Ì¾ì½ê¤ÇÌܤ¬Àä᤿...Ƭ¤¬Äˤ¤¡£");
msg_print(NULL);
set_food(PY_FOOD_WEAK);
if (music_singing_any()) stop_singing();
+ if (hex_spelling_any()) stop_hex_spell_all();
}
if ((p_ptr->muta2 & MUT2_WALK_SHAD) &&
if (slot && !object_is_cursed(o_ptr))
{
#ifdef JP
- msg_print("Éð´ï¤òÍ¤Æ¤·¤Þ¤Ã¤¿¡ª");
+ msg_print("Éð´ï¤òÍî¤Ȥ·¤Æ¤·¤Þ¤Ã¤¿¡ª");
#else
msg_print("You drop your weapon!");
#endif
{
char o_name[MAX_NLEN];
object_type *o_ptr;
- int i;
+ int i, i_keep = 0, count = 0;
/* Scan the equipment with random teleport ability */
for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
{
u32b flgs[TR_FLAG_SIZE];
o_ptr = &inventory[i];
-
+
/* Skip non-objects */
if (!o_ptr->k_idx) continue;
-
+
/* Extract the item flags */
object_flags(o_ptr, flgs);
-
- if (have_flag(flgs, TR_TELEPORT)) break;
+
+ if (have_flag(flgs, TR_TELEPORT))
+ {
+ /* {.} will stop random teleportation. */
+ if (!o_ptr->inscription || !my_strchr(quark_str(o_ptr->inscription), '.'))
+ {
+ count++;
+ if (one_in_(count)) i_keep = i;
+ }
+ }
}
+ o_ptr = &inventory[i_keep];
object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
#endif
{
disturb(0, 0);
- teleport_player(50, FALSE);
+ teleport_player(50, 0L);
}
else
{
disturb(0, 0);
/* Teleport player */
- teleport_player(40, TRUE);
+ teleport_player(40, TELEPORT_PASSIVE);
}
/* Handle HP draining */
if ((p_ptr->cursed & TRC_DRAIN_HP) && one_in_(666))
take_hit(DAMAGE_LOSELIFE, MIN(p_ptr->lev*2, 100), o_name, -1);
}
/* Handle mana draining */
- if ((p_ptr->cursed & TRC_DRAIN_MANA) && one_in_(666))
+ if ((p_ptr->cursed & TRC_DRAIN_MANA) && p_ptr->csp && one_in_(666))
{
char o_name[MAX_NLEN];
msg_print("You feel yourself yanked upwards!");
#endif
- p_ptr->recall_dungeon = dungeon_type;
+ if (dungeon_type) p_ptr->recall_dungeon = dungeon_type;
if (record_stair)
do_cmd_write_nikki(NIKKI_RECALL, dun_level, NULL);
dungeon_type = 0;
leave_quest_check();
+ leave_tower_check();
p_ptr->inside_quest = 0;
if (!o_ptr->k_idx) continue;
/* Skip known objects */
- if (object_is_known(o_ptr)) continue;
+ if (object_is_known(o_ptr))
+ {
+ /* Touched? */
+ if (o_ptr->marked & OM_TOUCHED) continue;
+ }
/* Skip pseudo-known objects */
if (o_ptr->ident & IDENT_SENSE) continue;
if (!have_flag(f_ptr->flags, FF_STORE)) continue;
/* Verify store type */
- if (f_ptr->power == n)
+ if (f_ptr->subtype == n)
{
/* Message */
#ifdef JP
}
}
- /* TY_CURSE activates at mignight! */
+ /* TY_CURSE activates at midnight! */
if (!hour && !min)
{
int count = 0;
now_message = 0;
+ /* Sniper */
+ if ((p_ptr->pclass == CLASS_SNIPER) && (p_ptr->concent))
+ reset_concent = TRUE;
+
/* Parse the command */
switch (command_cmd)
{
do_cmd_kaji(TRUE);
else if (p_ptr->pclass == CLASS_MAGIC_EATER)
do_cmd_magic_eater(TRUE);
+ else if (p_ptr->pclass == CLASS_SNIPER)
+ do_cmd_snipe_browse();
else do_cmd_browse();
break;
}
do_cmd_cast_learned();
else if (p_ptr->pclass == CLASS_SMITH)
do_cmd_kaji(FALSE);
+ else if (p_ptr->pclass == CLASS_SNIPER)
+ do_cmd_snipe();
else
do_cmd_cast();
}
case '=':
{
do_cmd_options();
+ (void)combine_and_reorder_home(STORE_HOME);
do_cmd_redraw();
break;
}
break;
}
+ /* Record/stop "Movie" */
+ case ']':
+ {
+ prepare_movie_hooks();
+ break;
+ }
+
/* Make random artifact list */
case KTRL('V'):
{
break;
}
+#ifdef TRAVEL
+ case '`':
+ {
+ if (!p_ptr->wild_mode) do_cmd_travel();
+ if (p_ptr->special_defense & KATA_MUSOU)
+ {
+ set_action(ACTION_NONE);
+ }
+ break;
+ }
+#endif
+
/* Hack -- Unknown command */
default:
{
}
+/* Hack -- Pack Overflow */
+static void pack_overflow(void)
+{
+ if (inventory[INVEN_PACK].k_idx)
+ {
+ char o_name[MAX_NLEN];
+ object_type *o_ptr;
+
+ /* Is auto-destroy done? */
+ notice_stuff();
+ if (!inventory[INVEN_PACK].k_idx) return;
+
+ /* Access the slot to be dropped */
+ o_ptr = &inventory[INVEN_PACK];
+
+ /* Disturbing */
+ disturb(0, 0);
+
+ /* Warning */
+#ifdef JP
+ msg_print("¥¶¥Ã¥¯¤«¤é¥¢¥¤¥Æ¥à¤¬¤¢¤Õ¤ì¤¿¡ª");
+#else
+ msg_print("Your pack overflows!");
+#endif
+
+ /* Describe */
+ object_desc(o_name, o_ptr, 0);
+
+ /* Message */
+#ifdef JP
+ msg_format("%s(%c)¤òÍî¤È¤·¤¿¡£", o_name, index_to_label(INVEN_PACK));
+#else
+ msg_format("You drop %s (%c).", o_name, index_to_label(INVEN_PACK));
+#endif
+
+ /* Drop it (carefully) near the player */
+ (void)drop_near(o_ptr, 0, py, px);
+
+ /* Modify, Describe, Optimize */
+ inven_item_increase(INVEN_PACK, -255);
+ inven_item_describe(INVEN_PACK);
+ inven_item_optimize(INVEN_PACK);
+
+ /* Handle "p_ptr->notice" */
+ notice_stuff();
+
+ /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
+ handle_stuff();
+ }
+}
+
+
/*
* Process the player
*
/* Handle the player song */
if (!load) check_music();
+ /* Hex - Handle the hex spells */
+ if (!load) check_hex();
+ if (!load) revenge_spell();
+
load = FALSE;
/* Fast */
/* Hack -- Pack Overflow */
- if (inventory[INVEN_PACK].k_idx)
- {
- int item = INVEN_PACK;
-
- char o_name[MAX_NLEN];
-
- object_type *o_ptr;
-
- /* Access the slot to be dropped */
- o_ptr = &inventory[item];
-
- /* Disturbing */
- disturb(0, 0);
-
- /* Warning */
-#ifdef JP
-msg_print("¥¶¥Ã¥¯¤«¤é¥¢¥¤¥Æ¥à¤¬¤¢¤Õ¤ì¤¿¡ª");
-#else
- msg_print("Your pack overflows!");
-#endif
-
-
- /* Describe */
- object_desc(o_name, o_ptr, 0);
-
- /* Message */
-#ifdef JP
-msg_format("%s(%c)¤òÍî¤È¤·¤¿¡£", o_name, index_to_label(item));
-#else
- msg_format("You drop %s (%c).", o_name, index_to_label(item));
-#endif
-
-
- /* Drop it (carefully) near the player */
- (void)drop_near(o_ptr, 0, py, px);
-
- /* Modify, Describe, Optimize */
- inven_item_increase(item, -255);
- inven_item_describe(item);
- inven_item_optimize(item);
-
- /* Handle "p_ptr->notice" */
- notice_stuff();
-
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
- handle_stuff();
- }
+ pack_overflow();
/* Hack -- cancel "lurking browse mode" */
run_step(0);
}
+#ifdef TRAVEL
+ /* Traveling */
+ else if (travel.run)
+ {
+ /* Take a step */
+ travel_step();
+ }
+#endif
+
/* Repeated command */
else if (command_rep)
{
}
+ /* Hack -- Pack Overflow */
+ pack_overflow();
+
+
/*** Clean up ***/
/* Significant */
}
}
new_mane = FALSE;
- p_ptr->redraw |= (PR_MANE);
+ p_ptr->redraw |= (PR_IMITATION);
}
if (p_ptr->action == ACTION_LEARN)
{
break;
}
+ /* Sniper */
+ if (energy_use && reset_concent) reset_concentration(TRUE);
+
/* Handle "leaving" */
if (p_ptr->leaving) break;
}
if (record_maxdepth) do_cmd_write_nikki(NIKKI_MAXDEAPTH, dun_level, NULL);
}
+ (void)calculate_upkeep();
+
/* Validate the panel */
panel_bounds_center();
/* Count game turns */
turn++;
- if (!p_ptr->wild_mode || wild_regen) dungeon_turn++;
- else if (p_ptr->wild_mode && !(turn % ((MAX_HGT + MAX_WID) / 2))) dungeon_turn++;
+
+ if (dungeon_turn < dungeon_turn_limit)
+ {
+ if (!p_ptr->wild_mode || wild_regen) dungeon_turn++;
+ else if (p_ptr->wild_mode && !(turn % ((MAX_HGT + MAX_WID) / 2))) dungeon_turn++;
+ }
+
+ prevent_turn_overflow();
+
if (wild_regen) wild_regen--;
}
}
#endif
+ if (browsing_movie)
+ {
+ reset_visuals();
+ browse_movie();
+ return;
+ }
+
hack_mutation = FALSE;
/* Hack -- Character is "icky" */
quit(0);
}
+ creating_savefile = new_game;
+
/* Nothing loaded */
if (!character_loaded)
{
}
}
+ creating_savefile = FALSE;
+
p_ptr->teleport_town = FALSE;
p_ptr->sutemi = FALSE;
world_monster = FALSE;
m_ptr->energy_need = ENERGY_NEED() + ENERGY_NEED();
}
+ (void)combine_and_reorder_home(STORE_HOME);
+ (void)combine_and_reorder_home(STORE_MUSEUM);
+
/* Process */
while (TRUE)
{
/* Handle "p_ptr->notice" */
notice_stuff();
+ /* Hack -- prevent "icky" message */
+ character_xtra = TRUE;
+
/* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
+ character_xtra = FALSE;
+
/* Cancel the target */
target_who = 0;
p_ptr->inside_battle = FALSE;
leaving_quest = 0;
p_ptr->inside_quest = 0;
- p_ptr->recall_dungeon = dungeon_type;
+ if (dungeon_type) p_ptr->recall_dungeon = dungeon_type;
dungeon_type = 0;
if (lite_town || vanilla_town)
{
return hoge;
}
}
+
+/*
+ * ¥¿¡¼¥ó¤Î¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤ËÂФ¹¤ëÂнè
+ * ¥¿¡¼¥óµÚ¤Ó¥¿¡¼¥ó¤òµÏ¿¤¹¤ëÊÑ¿ô¤ò¥¿¡¼¥ó¤Î¸Â³¦¤Î1ÆüÁ°¤Þ¤Ç´¬¤Ì᤹.
+ */
+void prevent_turn_overflow(void)
+{
+ int rollback_days, i, j;
+ s32b rollback_turns;
+
+ if (turn < turn_limit) return;
+
+ rollback_days = 1 + (turn - turn_limit) / (TURNS_PER_TICK * TOWN_DAWN);
+ rollback_turns = TURNS_PER_TICK * TOWN_DAWN * rollback_days;
+
+ if (turn > rollback_turns) turn -= rollback_turns;
+ else turn = 1; /* Paranoia */
+ if (old_turn > rollback_turns) old_turn -= rollback_turns;
+ else old_turn = 1;
+ if (old_battle > rollback_turns) old_battle -= rollback_turns;
+ else old_battle = 1;
+ if (p_ptr->feeling_turn > rollback_turns) p_ptr->feeling_turn -= rollback_turns;
+ else p_ptr->feeling_turn = 1;
+
+ for (i = 1; i < max_towns; i++)
+ {
+ for (j = 0; j < MAX_STORES; j++)
+ {
+ store_type *st_ptr = &town[i].store[j];
+
+ if (st_ptr->last_visit > -10L * TURNS_PER_TICK * STORE_TICKS)
+ {
+ st_ptr->last_visit -= rollback_turns;
+ if (st_ptr->last_visit < -10L * TURNS_PER_TICK * STORE_TICKS) st_ptr->last_visit = -10L * TURNS_PER_TICK * STORE_TICKS;
+ }
+
+ if (st_ptr->store_open)
+ {
+ st_ptr->store_open -= rollback_turns;
+ if (st_ptr->store_open < 1) st_ptr->store_open = 1;
+ }
+ }
+ }
+}