#include "cmd-magiceat.h"
#include "cmd-quaff.h"
#include "cmd-read.h"
+#include "cmd-smith.h"
#include "cmd-usestaff.h"
#include "cmd-zaprod.h"
#include "cmd-zapwand.h"
#include "quest.h"
#include "artifact.h"
#include "avatar.h"
+#include "player-move.h"
#include "player-status.h"
#include "cmd-spell.h"
#include "realm-hex.h"
#include "object-hook.h"
#include "wild.h"
+#include "monster-status.h"
static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
* and create a first saved floor
*/
prepare_change_floor_mode(CFM_FIRST_FLOOR);
-
- /* Leaving */
p_ptr->leaving = TRUE;
}
/*!
- * @brief 種族アンバライトが出血時パターンの上に乗った際のペナルティ処理
- * @return なし
- */
-static void wreck_the_pattern(void)
-{
- int to_ruin = 0;
- POSITION r_y, r_x;
- int pattern_type = f_info[current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].feat].subtype;
-
- if (pattern_type == PATTERN_TILE_WRECKED)
- {
- /* Ruined already */
- return;
- }
-
- msg_print(_("パターンを血で汚してしまった！", "You bleed on the Pattern!"));
- msg_print(_("何か恐ろしい事が起こった！", "Something terrible happens!"));
-
- if (!IS_INVULN()) take_hit(DAMAGE_NOESCAPE, damroll(10, 8), _("パターン損壊", "corrupting the Pattern"), -1);
- to_ruin = randint1(45) + 35;
-
- while (to_ruin--)
- {
- scatter(&r_y, &r_x, p_ptr->y, p_ptr->x, 4, 0);
-
- if (pattern_tile(r_y, r_x) &&
- (f_info[current_floor_ptr->grid_array[r_y][r_x].feat].subtype != PATTERN_TILE_WRECKED))
- {
- cave_set_feat(r_y, r_x, feat_pattern_corrupted);
- }
- }
-
- cave_set_feat(p_ptr->y, p_ptr->x, feat_pattern_corrupted);
-}
-
-/*!
* @brief 各種パターン地形上の特別な処理 / Returns TRUE if we are on the Pattern...
* @return 実際にパターン地形上にプレイヤーが居た場合はTRUEを返す。
*/
/* Skip dead monsters */
- if (!m_ptr->r_idx) continue;
+ if (!monster_is_valid(m_ptr)) continue;
/* Allow regeneration (if needed) */
if (m_ptr->hp < m_ptr->maxhp)
}
}
-/*!
- * @brief クエスト階層から離脱する際の処理
- * @return なし
- */
-void leave_quest_check(void)
-{
- /* Save quest number for dungeon pref file ($LEAVING_QUEST) */
- leaving_quest = p_ptr->inside_quest;
-
- /* Leaving an 'only once' quest marks it as failed */
- if (leaving_quest)
- {
- quest_type* const q_ptr = &quest[leaving_quest];
-
- if(((q_ptr->flags & QUEST_FLAG_ONCE) || (q_ptr->type == QUEST_TYPE_RANDOM)) &&
- (q_ptr->status == QUEST_STATUS_TAKEN))
- {
- q_ptr->status = QUEST_STATUS_FAILED;
- q_ptr->complev = p_ptr->lev;
- update_playtime();
- q_ptr->comptime = playtime;
-
- /* Additional settings */
- switch (q_ptr->type)
- {
- case QUEST_TYPE_TOWER:
- quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
- quest[QUEST_TOWER1].complev = p_ptr->lev;
- break;
- case QUEST_TYPE_FIND_ARTIFACT:
- a_info[q_ptr->k_idx].gen_flags &= ~(TRG_QUESTITEM);
- break;
- case QUEST_TYPE_RANDOM:
- r_info[q_ptr->r_idx].flags1 &= ~(RF1_QUESTOR);
-
- /* Floor of random quest will be blocked */
- prepare_change_floor_mode(CFM_NO_RETURN);
- break;
- }
-
- /* Record finishing a quest */
- if (q_ptr->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);
- }
- }
- }
-}
-
-/*!
- * @brief 「塔」クエストの各階層から離脱する際の処理
- * @return なし
- */
-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 = p_ptr->lev;
- update_playtime();
- quest[QUEST_TOWER1].comptime = playtime;
- }
- }
-}
-
/*!
* @brief !!を刻んだ魔道具の時間経過による再充填を知らせる処理 / If player has inscribed the object with "!!", let him know when it's recharged. -LM-
/* Special floor -- Pattern, in a wall -- yields no healing */
if (cave_no_regen) regen_amount = 0;
- regen_amount = (regen_amount * mutant_regenerate_mod) / 100;
+ regen_amount = (regen_amount * p_ptr->mutant_regenerate_mod) / 100;
/* Regenerate Hit Points if needed */
if ((p_ptr->chp < p_ptr->mhp) && !cave_no_regen)
monster_race *r_ptr = &r_info[m_ptr->r_idx];
/* Paranoia -- Skip dead monsters */
- if (!m_ptr->r_idx) continue;
+ if (!monster_is_valid(m_ptr)) continue;
if (r_ptr->level >= p_ptr->lev)
{
* and create a first saved floor
*/
prepare_change_floor_mode(CFM_FIRST_FLOOR);
-
- /* Leaving */
p_ptr->leaving = TRUE;
if (p_ptr->dungeon_idx == DUNGEON_ANGBAND)
q_ptr->status = QUEST_STATUS_FAILED;
q_ptr->complev = (byte)p_ptr->lev;
update_playtime();
- q_ptr->comptime = playtime;
+ q_ptr->comptime = current_world_ptr->play_time;
r_info[q_ptr->r_idx].flags1 &= ~(RF1_QUESTOR);
}
}
* and create a first saved floor
*/
prepare_change_floor_mode(CFM_FIRST_FLOOR);
-
- /* Leaving */
p_ptr->leaving = TRUE;
}
else
int delta = 0;
/* Skip dead monsters */
- if (!m_ptr->r_idx) continue;
+ if (!monster_is_valid(m_ptr)) continue;
/* Ignore pet */
if (is_pet(m_ptr)) continue;
p_ptr->energy_need = 0;
battle_monsters();
}
- else if (current_world_ptr->game_turn - old_turn == 150 * TURNS_PER_TICK)
+ else if (current_world_ptr->game_turn - current_floor_ptr->generated_turn == 150 * TURNS_PER_TICK)
{
msg_print(_("申し分けありませんが、この勝負は引き分けとさせていただきます。", "This battle have ended in a draw."));
p_ptr->au += kakekin;
/* Stop playing */
p_ptr->playing = FALSE;
-
- /* Leaving */
p_ptr->leaving = TRUE;
}
}
/* Check every feature */
for (i = 1; i < max_f_idx; i++)
{
- /* Access the index */
feature_type *f_ptr = &f_info[i];
/* Skip empty index */
/* Every 15 minutes after 11:00 pm */
if ((hour == 23) && !(min % 15))
{
- /* Disturbing */
disturb(FALSE, TRUE);
switch (min / 15)
{
if (vanilla_town) break;
- if (ambush_flag)
+ if (p_ptr->ambush_flag)
{
msg_print(_("襲撃から逃げるにはマップの端まで移動しなければならない。", "To flee the ambush you have to reach the edge of the map."));
break;
/* Fire an item */
case 'f':
{
- do_cmd_fire();
+ do_cmd_fire(SP_NONE);
break;
}
/* Access the slot to be dropped */
o_ptr = &inventory[INVEN_PACK];
- /* Disturbing */
disturb(FALSE, TRUE);
/* Warning */
*/
static void process_player(void)
{
- IDX i;
+ MONSTER_IDX m_idx;
/*** Apply energy ***/
{
msg_print(_("何か変わった気がする！", "You feel different!"));
- (void)gain_random_mutation(0);
+ (void)gain_mutation(p_ptr, 0);
hack_mutation = FALSE;
}
if (p_ptr->inside_battle)
{
- for(i = 1; i < m_max; i++)
+ for(m_idx = 1; m_idx < m_max; m_idx++)
{
- monster_type *m_ptr = ¤t_floor_ptr->m_list[i];
+ monster_type *m_ptr = ¤t_floor_ptr->m_list[m_idx];
- if (!m_ptr->r_idx) continue;
+ if (!monster_is_valid(m_ptr)) continue;
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
- update_monster(i, FALSE);
+ update_monster(m_idx, FALSE);
}
prt_time();
}
/*** Check for interupts ***/
/* Complete resting */
- if (resting < 0)
+ if (p_ptr->resting < 0)
{
/* Basic resting */
- if (resting == COMMAND_ARG_REST_FULL_HEALING)
+ if (p_ptr->resting == COMMAND_ARG_REST_FULL_HEALING)
{
/* Stop resting */
if ((p_ptr->chp == p_ptr->mhp) &&
}
/* Complete resting */
- else if (resting == COMMAND_ARG_REST_UNTIL_DONE)
+ else if (p_ptr->resting == COMMAND_ARG_REST_UNTIL_DONE)
{
/* Stop resting */
if ((p_ptr->chp == p_ptr->mhp) &&
}
}
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
}
p_ptr->window |= PW_PLAYER;
p_ptr->sutemi = FALSE;
p_ptr->counter = FALSE;
- now_damaged = FALSE;
+ p_ptr->now_damaged = FALSE;
handle_stuff();
else if (p_ptr->action == ACTION_REST)
{
/* Timed rest */
- if (resting > 0)
+ if (p_ptr->resting > 0)
{
/* Reduce rest count */
- resting--;
+ p_ptr->resting--;
- if (!resting) set_action(ACTION_NONE);
+ if (!p_ptr->resting) set_action(ACTION_NONE);
p_ptr->redraw |= (PR_STATE);
}
process_command();
}
-
/* Hack -- Pack Overflow */
pack_overflow();
-
/*** Clean up ***/
/* Significant */
shimmer_monsters = FALSE;
/* Shimmer multi-hued monsters */
- for (i = 1; i < m_max; i++)
+ for (m_idx = 1; m_idx < m_max; m_idx++)
{
monster_type *m_ptr;
monster_race *r_ptr;
- /* Access monster */
- m_ptr = ¤t_floor_ptr->m_list[i];
+ m_ptr = ¤t_floor_ptr->m_list[m_idx];
/* Skip dead monsters */
- if (!m_ptr->r_idx) continue;
+ if (!monster_is_valid(m_ptr)) continue;
/* Skip unseen monsters */
if (!m_ptr->ml) continue;
repair_monsters = FALSE;
/* Rotate detection flags */
- for (i = 1; i < m_max; i++)
+ for (m_idx = 1; m_idx < m_max; m_idx++)
{
monster_type *m_ptr;
-
- /* Access monster */
- m_ptr = ¤t_floor_ptr->m_list[i];
+ m_ptr = ¤t_floor_ptr->m_list[m_idx];
/* Skip dead monsters */
- if (!m_ptr->r_idx) continue;
+ if (!monster_is_valid(m_ptr)) continue;
/* Nice monsters get mean */
if (m_ptr->mflag & MFLAG_NICE)
/* Assume invisible */
m_ptr->ml = FALSE;
- update_monster(i, FALSE);
+ update_monster(m_idx, FALSE);
- if (p_ptr->health_who == i) p_ptr->redraw |= (PR_HEALTH);
- if (p_ptr->riding == i) p_ptr->redraw |= (PR_UHEALTH);
+ if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
+ if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
/* Redraw regardless */
lite_spot(m_ptr->fy, m_ptr->fx);
}
if (p_ptr->pclass == CLASS_IMITATOR)
{
+ int j;
if (p_ptr->mane_num > (p_ptr->lev > 44 ? 3 : p_ptr->lev > 29 ? 2 : 1))
{
p_ptr->mane_num--;
- for (i = 0; i < p_ptr->mane_num; i++)
+ for (j = 0; j < p_ptr->mane_num; j++)
{
- p_ptr->mane_spell[i] = p_ptr->mane_spell[i+1];
- p_ptr->mane_dam[i] = p_ptr->mane_dam[i+1];
+ p_ptr->mane_spell[j] = p_ptr->mane_spell[j + 1];
+ p_ptr->mane_dam[j] = p_ptr->mane_dam[j + 1];
}
}
new_mane = FALSE;
p_ptr->redraw |= (PR_MAP);
p_ptr->update |= (PU_MONSTERS);
-
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
msg_print(_("「時は動きだす…」", "You feel time flowing around you once more."));
p_ptr->timewalk = FALSE;
p_ptr->energy_need = ENERGY_NEED();
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
}
}
target_who = 0;
pet_t_m_idx = 0;
riding_t_m_idx = 0;
- ambush_flag = FALSE;
+ p_ptr->ambush_flag = FALSE;
/* Cancel the health bar */
health_track(0);
character_xtra = TRUE;
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER | PW_MONSTER | PW_OVERHEAD | PW_DUNGEON);
+ p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_EQUIPPY | PR_MAP);
+ p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS | PU_VIEW | PU_LITE | PU_MON_LITE | PU_TORCH | PU_MONSTERS | PU_DISTANCE | PU_FLOW);
- /* Redraw dungeon */
- p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_EQUIPPY);
-
- p_ptr->redraw |= (PR_MAP);
-
- p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
- /* Update lite/view */
- p_ptr->update |= (PU_VIEW | PU_LITE | PU_MON_LITE | PU_TORCH);
- p_ptr->update |= (PU_MONSTERS | PU_DISTANCE | PU_FLOW);
-
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
/* Leave "xtra" mode */
process_player();
process_upkeep_with_speed();
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
/* Hack -- Hilite the player */
/* Count game turns */
current_world_ptr->game_turn++;
- if (dungeon_turn < dungeon_turn_limit)
+ if (current_world_ptr->dungeon_turn < current_world_ptr->dungeon_turn_limit)
{
- if (!p_ptr->wild_mode || wild_regen) dungeon_turn++;
- else if (p_ptr->wild_mode && !(current_world_ptr->game_turn % ((MAX_HGT + MAX_WID) / 2))) dungeon_turn++;
+ if (!p_ptr->wild_mode || wild_regen) current_world_ptr->dungeon_turn++;
+ else if (p_ptr->wild_mode && !(current_world_ptr->game_turn % ((MAX_HGT + MAX_WID) / 2))) current_world_ptr->dungeon_turn++;
}
prevent_turn_overflow();
{
while (1)
{
- kubi_r_idx[i] = get_mon_num(MAX_DEPTH - 1);
- r_ptr = &r_info[kubi_r_idx[i]];
+ current_world_ptr->bounty_r_idx[i] = get_mon_num(MAX_DEPTH - 1);
+ r_ptr = &r_info[current_world_ptr->bounty_r_idx[i]];
if (!(r_ptr->flags1 & RF1_UNIQUE)) continue;
if (r_ptr->rarity > 100) continue;
- if (no_questor_or_bounty_uniques(kubi_r_idx[i])) continue;
+ if (no_questor_or_bounty_uniques(current_world_ptr->bounty_r_idx[i])) continue;
for (j = 0; j < i; j++)
- if (kubi_r_idx[i] == kubi_r_idx[j]) break;
+ if (current_world_ptr->bounty_r_idx[i] == current_world_ptr->bounty_r_idx[j]) break;
if (j == i) break;
}
{
for (j = i; j < MAX_KUBI; j++)
{
- if (r_info[kubi_r_idx[i]].level > r_info[kubi_r_idx[j]].level)
+ if (r_info[current_world_ptr->bounty_r_idx[i]].level > r_info[current_world_ptr->bounty_r_idx[j]].level)
{
- tmp = kubi_r_idx[i];
- kubi_r_idx[i] = kubi_r_idx[j];
- kubi_r_idx[j] = tmp;
+ tmp = current_world_ptr->bounty_r_idx[i];
+ current_world_ptr->bounty_r_idx[i] = current_world_ptr->bounty_r_idx[j];
+ current_world_ptr->bounty_r_idx[j] = tmp;
}
}
}
p_ptr->teleport_town = FALSE;
p_ptr->sutemi = FALSE;
- world_monster = FALSE;
- now_damaged = FALSE;
+ current_world_ptr->timewalk_m_idx = 0;
+ p_ptr->now_damaged = FALSE;
now_message = 0;
start_time = time(NULL) - 1;
record_o_name[0] = '\0';
int rollback_days, i, j;
s32b rollback_turns;
- if (current_world_ptr->game_turn < turn_limit) return;
+ if (current_world_ptr->game_turn < current_world_ptr->game_turn_limit) return;
- rollback_days = 1 + (current_world_ptr->game_turn - turn_limit) / (TURNS_PER_TICK * TOWN_DAWN);
+ rollback_days = 1 + (current_world_ptr->game_turn - current_world_ptr->game_turn_limit) / (TURNS_PER_TICK * TOWN_DAWN);
rollback_turns = TURNS_PER_TICK * TOWN_DAWN * rollback_days;
if (current_world_ptr->game_turn > rollback_turns) current_world_ptr->game_turn -= rollback_turns;
else current_world_ptr->game_turn = 1; /* Paranoia */
- if (old_turn > rollback_turns) old_turn -= rollback_turns;
- else old_turn = 1;
+ if (current_floor_ptr->generated_turn > rollback_turns) current_floor_ptr->generated_turn -= rollback_turns;
+ else current_floor_ptr->generated_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;
OSDN Git Service
