#include "cmd-zaprod.h"
#include "cmd-zapwand.h"
#include "cmd-pet.h"
+#include "floor.h"
#include "floor-events.h"
#include "object-curse.h"
+#include "store.h"
+#include "spells-summon.h"
+#include "spells-object.h"
+#include "monsterrace-hook.h"
+#include "world.h"
+#include "mutation.h"
+#include "quest.h"
+#include "artifact.h"
+#include "avatar.h"
+#include "player-status.h"
static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
*/
static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
{
- byte feel;
+ byte feel;
object_type *o_ptr = &inventory[slot];
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
/* We know about it already, do not tell us again */
if (o_ptr->ident & (IDENT_SENSE))return;
/* Auto-inscription/destroy */
autopick_alter_item(slot, destroy_feeling);
-
- /* Combine / Reorder the pack (later) */
- p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+ p_ptr->update |= (PU_COMBINE | PU_REORDER);
p_ptr->window |= (PW_INVEN | PW_EQUIP);
}
/* Ask for level */
if (get_check(_("他の階にテレポートしますか？", "Teleport level? ")))
{
- char ppp[80];
- char tmp_val[160];
+ char ppp[80];
+ char tmp_val[160];
/* Only downward in ironman mode */
if (ironman_downward)
leave_quest_check();
- if (record_stair) do_cmd_write_nikki(NIKKI_PAT_TELE,0,NULL);
+ if (record_stair) do_cmd_write_nikki(NIKKI_PAT_TELE, 0, NULL);
p_ptr->inside_quest = 0;
p_ptr->energy_use = 0;
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);
-
+ if (!IS_INVULN()) take_hit(DAMAGE_NOESCAPE, damroll(10, 8), _("パターン損壊", "corrupting the Pattern"), -1);
to_ruin = randint1(45) + 35;
while (to_ruin--)
*/
static void regenhp(int percent)
{
- s32b new_chp;
+ HIT_POINT new_chp;
u32b new_chp_frac;
- s32b old_chp;
+ HIT_POINT old_chp;
if (p_ptr->special_defense & KATA_KOUKIJIN) return;
if (p_ptr->action == ACTION_HAYAGAKE) return;
/* Notice changes */
if (old_chp != p_ptr->chp)
{
- /* Redraw */
p_ptr->redraw |= (PR_HP);
-
p_ptr->window |= (PW_PLAYER);
-
wild_regen = 20;
}
}
* @param regen_amount 回復量
* @return なし
*/
-static void regenmana(int upkeep_factor, int regen_amount)
+static void regenmana(MANA_POINT upkeep_factor, MANA_POINT regen_amount)
{
- s32b old_csp = p_ptr->csp;
+ MANA_POINT old_csp = p_ptr->csp;
s32b regen_rate = regen_amount * 100 - upkeep_factor * PY_REGEN_NORMAL;
/*
else if (regen_rate > 0)
{
/* (percent/100) is the Regen factor in unit (1/2^16) */
- s32b new_mana = 0;
+ MANA_POINT new_mana = 0;
u32b new_mana_frac = (p_ptr->msp * regen_rate / 100 + PY_REGEN_MNBASE);
/* Convert the unit (1/2^16) to (1/2^32) */
}
}
-
- /* Redraw mana */
if (old_csp != p_ptr->csp)
{
- /* Redraw */
p_ptr->redraw |= (PR_MANA);
-
p_ptr->window |= (PW_PLAYER);
p_ptr->window |= (PW_SPELL);
-
wild_regen = 20;
}
}
*/
static void regenmagic(int regen_amount)
{
- s32b new_mana;
+ MANA_POINT new_mana;
int i;
int dev = 30;
int mult = (dev + adj_mag_mana[p_ptr->stat_ind[A_INT]]); /* x1 to x2 speed bonus for recharging */
if (heal)
{
/* Combine pack */
- p_ptr->notice |= (PN_COMBINE);
-
+ p_ptr->update |= (PU_COMBINE);
p_ptr->window |= (PW_INVEN);
p_ptr->window |= (PW_EQUIP);
wild_regen = 20;
(q_ptr->status == QUEST_STATUS_TAKEN))
{
q_ptr->status = QUEST_STATUS_FAILED;
- q_ptr->complev = (byte)p_ptr->lev;
+ q_ptr->complev = p_ptr->lev;
update_playtime();
q_ptr->comptime = playtime;
{
case QUEST_TYPE_TOWER:
quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
- quest[QUEST_TOWER1].complev = (byte)p_ptr->lev;
+ quest[QUEST_TOWER1].complev = p_ptr->lev;
break;
case QUEST_TYPE_FIND_ARTIFACT:
a_info[q_ptr->k_idx].gen_flags &= ~(TRG_QUESTITEM);
if(quest[leaving_quest].type == QUEST_TYPE_TOWER)
{
quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
- quest[QUEST_TOWER1].complev = (byte)p_ptr->lev;
+ quest[QUEST_TOWER1].complev = p_ptr->lev;
update_playtime();
quest[QUEST_TOWER1].comptime = playtime;
}
*/
static void recharged_notice(object_type *o_ptr)
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
- cptr s;
+ concptr s;
/* No inscription */
if (!o_ptr->inscription) return;
{
const magic_type *s_ptr;
int spell;
- s32b need_mana;
+ MANA_POINT need_mana;
u32b need_mana_frac;
/* Music singed by player */
INTERUPTING_SONG_EFFECT(p_ptr) = MUSIC_NONE;
msg_print(_("歌を再開した。", "You restart singing."));
p_ptr->action = ACTION_SING;
-
- /* Recalculate bonuses */
- p_ptr->update |= (PU_BONUS | PU_HP);
-
- /* Redraw map and status bar */
+ p_ptr->update |= (PU_BONUS | PU_HP | PU_MONSTERS);
p_ptr->redraw |= (PR_MAP | PR_STATUS | PR_STATE);
-
- /* Update monsters */
- p_ptr->update |= (PU_MONSTERS);
-
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
}
}
(flag == TRC_FAST_DIGEST) ||
(flag == TRC_SLOW_REGEN) )
{
- u32b cf;
+ u32b cf = 0L;
BIT_FLAGS flgs[TR_FLAG_SIZE];
object_flags(o_ptr, flgs);
switch (flag)
!p_ptr->resist_lite)
{
object_type * o_ptr = &inventory[INVEN_LITE];
- char o_name [MAX_NLEN];
+ GAME_TEXT o_name [MAX_NLEN];
char ouch [MAX_NLEN+40];
/* Get an object description */
}
else
{
- cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+ concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
msg_format(_("%sで火傷した！", "The %s burns you!"), name);
take_hit(DAMAGE_NOESCAPE, damage, name, -1);
}
}
}
+ if (have_flag(f_ptr->flags, FF_COLD_PUDDLE) && !IS_INVULN() && !p_ptr->immune_cold)
+ {
+ int damage = 0;
+
+ if (have_flag(f_ptr->flags, FF_DEEP))
+ {
+ damage = 6000 + randint0(4000);
+ }
+ else if (!p_ptr->levitation)
+ {
+ damage = 3000 + randint0(2000);
+ }
+
+ if (damage)
+ {
+ if (p_ptr->resist_cold) damage = damage / 3;
+ if (IS_OPPOSE_COLD()) damage = damage / 3;
+ if (p_ptr->levitation) damage = damage / 5;
+
+ damage = damage / 100 + (randint0(100) < (damage % 100));
+
+ if (p_ptr->levitation)
+ {
+ msg_print(_("冷気に覆われた！", "The cold engulfs you!"));
+ take_hit(DAMAGE_NOESCAPE, damage, format(_("%sの上に浮遊したダメージ", "flying over %s"),
+ f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name), -1);
+ }
+ else
+ {
+ concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+ msg_format(_("%sに凍えた！", "The %s frostbites you!"), name);
+ take_hit(DAMAGE_NOESCAPE, damage, name, -1);
+ }
+
+ cave_no_regen = TRUE;
+ }
+ }
+
+ if (have_flag(f_ptr->flags, FF_ELEC_PUDDLE) && !IS_INVULN() && !p_ptr->immune_elec)
+ {
+ int damage = 0;
+
+ if (have_flag(f_ptr->flags, FF_DEEP))
+ {
+ damage = 6000 + randint0(4000);
+ }
+ else if (!p_ptr->levitation)
+ {
+ damage = 3000 + randint0(2000);
+ }
+
+ if (damage)
+ {
+ if (p_ptr->resist_elec) damage = damage / 3;
+ if (IS_OPPOSE_ELEC()) damage = damage / 3;
+ if (p_ptr->levitation) damage = damage / 5;
+
+ damage = damage / 100 + (randint0(100) < (damage % 100));
+
+ if (p_ptr->levitation)
+ {
+ msg_print(_("電撃を受けた！", "The electric shocks you!"));
+ take_hit(DAMAGE_NOESCAPE, damage, format(_("%sの上に浮遊したダメージ", "flying over %s"),
+ f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name), -1);
+ }
+ else
+ {
+ concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+ msg_format(_("%sに感電した！", "The %s shocks you!"), name);
+ take_hit(DAMAGE_NOESCAPE, damage, name, -1);
+ }
+
+ cave_no_regen = TRUE;
+ }
+ }
+
+ if (have_flag(f_ptr->flags, FF_ACID_PUDDLE) && !IS_INVULN() && !p_ptr->immune_acid)
+ {
+ int damage = 0;
+
+ if (have_flag(f_ptr->flags, FF_DEEP))
+ {
+ damage = 6000 + randint0(4000);
+ }
+ else if (!p_ptr->levitation)
+ {
+ damage = 3000 + randint0(2000);
+ }
+
+ if (damage)
+ {
+ if (p_ptr->resist_acid) damage = damage / 3;
+ if (IS_OPPOSE_ACID()) damage = damage / 3;
+ if (p_ptr->levitation) damage = damage / 5;
+
+ damage = damage / 100 + (randint0(100) < (damage % 100));
+
+ if (p_ptr->levitation)
+ {
+ msg_print(_("酸が飛び散った！", "The acid melt you!"));
+ take_hit(DAMAGE_NOESCAPE, damage, format(_("%sの上に浮遊したダメージ", "flying over %s"),
+ f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name), -1);
+ }
+ else
+ {
+ concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+ msg_format(_("%sに溶かされた！", "The %s melts you!"), name);
+ take_hit(DAMAGE_NOESCAPE, damage, name, -1);
+ }
+
+ cave_no_regen = TRUE;
+ }
+ }
+
+ if (have_flag(f_ptr->flags, FF_POISON_PUDDLE) && !IS_INVULN())
+ {
+ int damage = 0;
+
+ if (have_flag(f_ptr->flags, FF_DEEP))
+ {
+ damage = 6000 + randint0(4000);
+ }
+ else if (!p_ptr->levitation)
+ {
+ damage = 3000 + randint0(2000);
+ }
+
+ if (damage)
+ {
+ if (p_ptr->resist_pois) damage = damage / 3;
+ if (IS_OPPOSE_POIS()) damage = damage / 3;
+ if (p_ptr->levitation) damage = damage / 5;
+
+ damage = damage / 100 + (randint0(100) < (damage % 100));
+
+ if (p_ptr->levitation)
+ {
+ msg_print(_("毒気を吸い込んだ！", "The gas poisons you!"));
+ take_hit(DAMAGE_NOESCAPE, damage, format(_("%sの上に浮遊したダメージ", "flying over %s"),
+ f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name), -1);
+ if (p_ptr->resist_pois) (void)set_poisoned(p_ptr->poisoned + 1);
+ }
+ else
+ {
+ concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+ msg_format(_("%sに毒された！", "The %s poisons you!"), name);
+ take_hit(DAMAGE_NOESCAPE, damage, name, -1);
+ if (p_ptr->resist_pois) (void)set_poisoned(p_ptr->poisoned + 3);
+ }
+
+ cave_no_regen = TRUE;
+ }
+ }
+
if (have_flag(f_ptr->flags, FF_WATER) && have_flag(f_ptr->flags, FF_DEEP) &&
- !p_ptr->levitation && !p_ptr->can_swim)
+ !p_ptr->levitation && !p_ptr->can_swim && !p_ptr->resist_water)
{
if (p_ptr->total_weight > weight_limit())
{
if (p_ptr->riding)
{
- int damage;
+ HIT_POINT damage;
if ((r_info[m_list[p_ptr->riding].r_idx].flags2 & RF2_AURA_FIRE) && !p_ptr->immune_fire)
{
damage = r_info[m_list[p_ptr->riding].r_idx].level / 2;
{
if (!IS_INVULN() && !p_ptr->wraith_form && !p_ptr->kabenuke && ((p_ptr->chp > (p_ptr->lev / 5)) || !p_ptr->pass_wall))
{
- cptr dam_desc;
+ concptr dam_desc;
cave_no_regen = TRUE;
if (p_ptr->pass_wall)
if (pet) mode |= PM_FORCE_PET;
else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
- if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, mode))
+ if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, mode, '\0'))
{
msg_print(_("あなたはデーモンを引き寄せた！", "You have attracted a demon!"));
disturb(FALSE, TRUE);
if (pet) mode |= PM_FORCE_PET;
else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
- if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL, mode))
+ if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL, mode, '\0'))
{
msg_print(_("動物を引き寄せた！", "You have attracted an animal!"));
disturb(FALSE, TRUE);
if (pet) mode |= PM_FORCE_PET;
else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
- if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON, mode))
+ if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON, mode, '\0'))
{
msg_print(_("ドラゴンを引き寄せた！", "You have attracted a dragon!"));
disturb(FALSE, TRUE);
take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->wt / 6), _("転倒", "tripping"), -1);
msg_print(NULL);
- if (buki_motteruka(INVEN_RARM))
+ if (has_melee_weapon(INVEN_RARM))
{
slot = INVEN_RARM;
o_ptr = &inventory[INVEN_RARM];
- if (buki_motteruka(INVEN_LARM) && one_in_(2))
+ if (has_melee_weapon(INVEN_LARM) && one_in_(2))
{
o_ptr = &inventory[INVEN_LARM];
slot = INVEN_LARM;
}
}
- else if (buki_motteruka(INVEN_LARM))
+ else if (has_melee_weapon(INVEN_LARM))
{
o_ptr = &inventory[INVEN_LARM];
slot = INVEN_LARM;
*/
if ((p_ptr->cursed & TRC_TELEPORT_SELF) && one_in_(200))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_type *o_ptr;
int i, i_keep = 0, count = 0;
/* Add light curse (Later) */
if ((p_ptr->cursed & TRC_ADD_L_CURSE) && one_in_(2000))
{
- u32b new_curse;
+ BIT_FLAGS new_curse;
object_type *o_ptr;
o_ptr = choose_cursed_obj_name(TRC_ADD_L_CURSE);
new_curse = get_curse(0, o_ptr);
if (!(o_ptr->curse_flags & new_curse))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Add heavy curse (Later) */
if ((p_ptr->cursed & TRC_ADD_H_CURSE) && one_in_(2000))
{
- u32b new_curse;
+ BIT_FLAGS new_curse;
object_type *o_ptr;
o_ptr = choose_cursed_obj_name(TRC_ADD_H_CURSE);
new_curse = get_curse(1, o_ptr);
if (!(o_ptr->curse_flags & new_curse))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
/* Call animal */
if ((p_ptr->cursed & TRC_CALL_ANIMAL) && one_in_(2500))
{
- if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL,
- (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+ if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_ANIMAL, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, choose_cursed_obj_name(TRC_CALL_ANIMAL), (OD_OMIT_PREFIX | OD_NAME_ONLY));
msg_format(_("%sが動物を引き寄せた！", "Your %s have attracted an animal!"), o_name);
/* Call demon */
if ((p_ptr->cursed & TRC_CALL_DEMON) && one_in_(1111))
{
- if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+ if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DEMON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
msg_format(_("%sが悪魔を引き寄せた！", "Your %s have attracted a demon!"), o_name);
if ((p_ptr->cursed & TRC_CALL_DRAGON) && one_in_(800))
{
if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_DRAGON,
- (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+ (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, choose_cursed_obj_name(TRC_CALL_DRAGON), (OD_OMIT_PREFIX | OD_NAME_ONLY));
msg_format(_("%sがドラゴンを引き寄せた！", "Your %s have attracted an dragon!"), o_name);
if ((p_ptr->cursed & TRC_CALL_UNDEAD) && one_in_(1111))
{
if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD,
- (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))
+ (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, choose_cursed_obj_name(TRC_CALL_UNDEAD), (OD_OMIT_PREFIX | OD_NAME_ONLY));
msg_format(_("%sが死霊を引き寄せた！", "Your %s have attracted an undead!"), o_name);
/* Handle HP draining */
if ((p_ptr->cursed & TRC_DRAIN_HP) && one_in_(666))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_HP), (OD_OMIT_PREFIX | OD_NAME_ONLY));
msg_format(_("%sはあなたの体力を吸収した！", "Your %s drains HP from you!"), o_name);
/* Handle mana draining */
if ((p_ptr->cursed & TRC_DRAIN_MANA) && p_ptr->csp && one_in_(666))
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_desc(o_name, choose_cursed_obj_name(TRC_DRAIN_MANA), (OD_OMIT_PREFIX | OD_NAME_ONLY));
msg_format(_("%sはあなたの魔力を吸収した！", "Your %s drains mana from you!"), o_name);
if (o_ptr->name1 == ART_JUDGE)
{
-#ifdef JP
if (object_is_known(o_ptr))
- msg_print("『審判の宝石』はあなたの体力を吸収した！");
+ msg_print(_("『審判の宝石』はあなたの体力を吸収した！", "The Jewel of Judgement drains life from you!"));
else
- msg_print("なにかがあなたの体力を吸収した！");
- take_hit(DAMAGE_LOSELIFE, MIN(p_ptr->lev, 50), "審判の宝石", -1);
-#else
- if (object_is_known(o_ptr))
- msg_print("The Jewel of Judgement drains life from you!");
- else
- msg_print("Something drains life from you!");
- take_hit(DAMAGE_LOSELIFE, MIN(p_ptr->lev, 50), "the Jewel of Judgement", -1);
-#endif
+ msg_print(_("なにかがあなたの体力を吸収した！", "Something drains life from you!"));
+ take_hit(DAMAGE_LOSELIFE, MIN(p_ptr->lev, 50), _("審判の宝石", "the Jewel of Judgement"), -1);
}
}
}
/* Process objects on floor */
for (i = 1; i < o_max; i++)
{
- /* Access object */
object_type *o_ptr = &o_list[i];
/* Skip dead objects */
/* Determine the level */
if (dun_level || p_ptr->inside_quest || p_ptr->enter_dungeon)
{
- msg_print(_("上に引っ張りあげられる感じがする！",
- "You feel yourself yanked upwards!"));
+ msg_print(_("上に引っ張りあげられる感じがする！", "You feel yourself yanked upwards!"));
if (dungeon_type) p_ptr->recall_dungeon = dungeon_type;
if (record_stair)
}
else
{
- msg_print(_("下に引きずり降ろされる感じがする！",
- "You feel yourself yanked downwards!"));
+ msg_print(_("下に引きずり降ろされる感じがする！", "You feel yourself yanked downwards!"));
dungeon_type = p_ptr->recall_dungeon;
static int get_monster_crowd_number(MONSTER_IDX m_idx)
{
monster_type *m_ptr = &m_list[m_idx];
- int my = m_ptr->fy;
- int mx = m_ptr->fx;
+ POSITION my = m_ptr->fy;
+ POSITION mx = m_ptr->fx;
int i;
int count = 0;
/* Artifacts */
if (object_is_artifact(o_ptr))
{
- s32b cost = object_value_real(o_ptr);
+ PRICE cost = object_value_real(o_ptr);
delta += 10 * base;
if (cost > 10000L) delta += 10 * base;
}
if (o_ptr->tval == TV_DRAG_ARMOR) delta += 30 * base;
- if (o_ptr->tval == TV_SHIELD &&
- o_ptr->sval == SV_DRAGON_SHIELD) delta += 5 * base;
- if (o_ptr->tval == TV_GLOVES &&
- o_ptr->sval == SV_SET_OF_DRAGON_GLOVES) delta += 5 * base;
- if (o_ptr->tval == TV_BOOTS &&
- o_ptr->sval == SV_PAIR_OF_DRAGON_GREAVE) delta += 5 * base;
- if (o_ptr->tval == TV_HELM &&
- o_ptr->sval == SV_DRAGON_HELM) delta += 5 * base;
- if (o_ptr->tval == TV_RING &&
- o_ptr->sval == SV_RING_SPEED &&
- !object_is_cursed(o_ptr)) delta += 25 * base;
- if (o_ptr->tval == TV_RING &&
- o_ptr->sval == SV_RING_LORDLY &&
- !object_is_cursed(o_ptr)) delta += 15 * base;
- if (o_ptr->tval == TV_AMULET &&
- o_ptr->sval == SV_AMULET_THE_MAGI &&
- !object_is_cursed(o_ptr)) delta += 15 * base;
+ if (o_ptr->tval == TV_SHIELD && o_ptr->sval == SV_DRAGON_SHIELD) delta += 5 * base;
+ if (o_ptr->tval == TV_GLOVES && o_ptr->sval == SV_SET_OF_DRAGON_GLOVES) delta += 5 * base;
+ if (o_ptr->tval == TV_BOOTS && o_ptr->sval == SV_PAIR_OF_DRAGON_GREAVE) delta += 5 * base;
+ if (o_ptr->tval == TV_HELM && o_ptr->sval == SV_DRAGON_HELM) delta += 5 * base;
+ if (o_ptr->tval == TV_RING && o_ptr->sval == SV_RING_SPEED && !object_is_cursed(o_ptr)) delta += 25 * base;
+ if (o_ptr->tval == TV_RING && o_ptr->sval == SV_RING_LORDLY && !object_is_cursed(o_ptr)) delta += 15 * base;
+ if (o_ptr->tval == TV_AMULET && o_ptr->sval == SV_AMULET_THE_MAGI && !object_is_cursed(o_ptr)) delta += 15 * base;
/* Out-of-depth objects */
- if (!object_is_cursed(o_ptr) && !object_is_broken(o_ptr) &&
- k_ptr->level > dun_level)
+ if (!object_is_cursed(o_ptr) && !object_is_broken(o_ptr) && k_ptr->level > dun_level)
{
/* Rating increase */
delta += (k_ptr->level - dun_level) * base;
}
else if ((number_mon-1) == 0)
{
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
monster_type *wm_ptr;
wm_ptr = &m_list[win_m_idx];
p_ptr->wizard = TRUE;
msg_print(_("ウィザードモード突入。", "Wizard mode on."));
}
-
- /* Update monsters */
p_ptr->update |= (PU_MONSTERS);
/* Redraw "title" */
/* Enter store */
case SPECIAL_KEY_STORE:
{
- if (!p_ptr->wild_mode) do_cmd_store();
+ do_cmd_store();
break;
}
/* Enter building -KMW- */
case SPECIAL_KEY_BUILDING:
{
- if (!p_ptr->wild_mode) do_cmd_bldg();
+ do_cmd_bldg();
break;
}
/* Enter quest level -KMW- */
case SPECIAL_KEY_QUEST:
{
- if (!p_ptr->wild_mode) do_cmd_quest();
+ do_cmd_quest();
break;
}
change_wild_mode();
else
do_cmd_go_down();
-
break;
}
/* Open a door or chest */
case 'o':
{
- if (!p_ptr->wild_mode) do_cmd_open();
+ do_cmd_open();
break;
}
/* Close a door */
case 'c':
{
- if (!p_ptr->wild_mode) do_cmd_close();
+ do_cmd_close();
break;
}
/* Jam a door with spikes */
case 'j':
{
- if (!p_ptr->wild_mode) do_cmd_spike();
+ do_cmd_spike();
break;
}
/* Bash a door */
case 'B':
{
- if (!p_ptr->wild_mode) do_cmd_bash();
+ do_cmd_bash();
break;
}
/* Disarm a trap or chest */
case 'D':
{
- if (!p_ptr->wild_mode) do_cmd_disarm();
+ do_cmd_disarm();
break;
}
else if (p_ptr->pclass == CLASS_SAMURAI)
do_cmd_gain_hissatsu();
else if (p_ptr->pclass == CLASS_MAGIC_EATER)
- gain_magic();
+ import_magic_device();
else
do_cmd_study();
break;
}
else if (p_ptr->anti_magic && (p_ptr->pclass != CLASS_BERSERKER) && (p_ptr->pclass != CLASS_SMITH))
{
- cptr which_power = _("魔法", "magic");
+ concptr which_power = _("魔法", "magic");
if (p_ptr->pclass == CLASS_MINDCRAFTER)
which_power = _("超能力", "psionic powers");
else if (p_ptr->pclass == CLASS_IMITATOR)
/* Issue a pet command */
case 'p':
{
- if (!p_ptr->wild_mode) do_cmd_pet();
+ do_cmd_pet();
break;
}
/* Activate an artifact */
case 'A':
{
- if (!p_ptr->wild_mode)
- {
- if (!p_ptr->inside_arena)
- do_cmd_activate();
- else
- {
- msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
- msg_print(NULL);
- }
- }
+ do_cmd_activate();
break;
}
/* Fire an item */
case 'f':
{
- if (!p_ptr->wild_mode) do_cmd_fire();
+ do_cmd_fire();
break;
}
/* Throw an item */
case 'v':
{
- if (!p_ptr->wild_mode) do_cmd_throw(1, FALSE, -1);
+ do_cmd_throw(1, FALSE, -1);
break;
}
/* Aim a wand */
case 'a':
{
- if (!p_ptr->wild_mode)
- {
- if (!p_ptr->inside_arena)
- do_cmd_aim_wand();
- else
- {
- msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
- msg_print(NULL);
- }
- }
+ do_cmd_aim_wand();
break;
}
/* Zap a rod */
case 'z':
{
- if (!p_ptr->wild_mode)
- {
- if (p_ptr->inside_arena)
- {
- msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
- msg_print(NULL);
- }
- else if (use_command && rogue_like_commands)
+ if (use_command && rogue_like_commands)
{
do_cmd_use();
}
{
do_cmd_zap_rod();
}
- }
break;
}
/* Quaff a potion */
case 'q':
{
- if (!p_ptr->wild_mode)
- {
- if (!p_ptr->inside_arena)
- do_cmd_quaff_potion();
- else
- {
- msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
- msg_print(NULL);
- }
- }
+ do_cmd_quaff_potion();
break;
}
/* Read a scroll */
case 'r':
{
- if (!p_ptr->wild_mode)
- {
- if (!p_ptr->inside_arena)
- do_cmd_read_scroll();
- else
- {
- msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
- msg_print(NULL);
- }
- }
+ do_cmd_read_scroll();
break;
}
/* Use a staff */
case 'u':
{
- if (!p_ptr->wild_mode)
- {
- if (p_ptr->inside_arena)
- {
- msg_print(_("アリーナが魔法を吸収した！", "The arena absorbs all attempted magic!"));
- msg_print(NULL);
- }
- else if (use_command && !rogue_like_commands)
- {
+ if (use_command && !rogue_like_commands)
do_cmd_use();
- }
else
do_cmd_use_staff();
- }
break;
}
/* Use racial power */
case 'U':
{
- if (!p_ptr->wild_mode) do_cmd_racial_power();
+ do_cmd_racial_power();
break;
}
/* Target monster or location */
case '*':
{
- if (!p_ptr->wild_mode) do_cmd_target();
+ do_cmd_target();
break;
}
/* Repeat level feeling */
case KTRL('F'):
{
- if (!p_ptr->wild_mode) do_cmd_feeling();
+ do_cmd_feeling();
break;
}
}
/*!
- * @brief モンスター種族が釣れる種族かどうかを判定する。
- * @param r_idx 判定したいモンスター種族のID
- * @return 釣れる対象ならばTRUEを返す
- */
-static bool monster_tsuri(MONRACE_IDX r_idx)
-{
- monster_race *r_ptr = &r_info[r_idx];
-
- if ((r_ptr->flags7 & RF7_AQUATIC) && !(r_ptr->flags1 & RF1_UNIQUE) && my_strchr("Jjlw", r_ptr->d_char))
- return TRUE;
- else
- return FALSE;
-}
-
-
-/*!
* @brief アイテムの所持種類数が超えた場合にアイテムを床に落とす処理 / Hack -- Pack Overflow
* @return なし
*/
{
if (inventory[INVEN_PACK].k_idx)
{
- char o_name[MAX_NLEN];
+ GAME_TEXT o_name[MAX_NLEN];
object_type *o_ptr;
/* Is auto-destroy done? */
- notice_stuff();
+ update_creature(p_ptr);
if (!inventory[INVEN_PACK].k_idx) return;
/* Access the slot to be dropped */
/* Warning */
msg_print(_("ザックからアイテムがあふれた！", "Your pack overflows!"));
-
- /* Describe */
object_desc(o_name, o_ptr, 0);
msg_format(_("%s(%c)を落とした。", "You drop %s (%c)."), o_name, index_to_label(INVEN_PACK));
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();
}
}
if (!m_ptr->r_idx) continue;
- /* Hack -- Detect monster */
m_ptr->mflag2 |= (MFLAG2_MARK | MFLAG2_SHOW);
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
}
prt_time();
}
if (p_ptr->action == ACTION_FISH)
{
- /* Delay */
Term_xtra(TERM_XTRA_DELAY, 10);
if (one_in_(1000))
{
MONRACE_IDX r_idx;
bool success = FALSE;
- get_mon_num_prep(monster_tsuri,NULL);
+ get_mon_num_prep(monster_is_fishing_target,NULL);
r_idx = get_mon_num(dun_level ? dun_level : wilderness[p_ptr->wilderness_y][p_ptr->wilderness_x].level);
msg_print(NULL);
if (r_idx && one_in_(2))
x = p_ptr->x + ddx[p_ptr->fishing_dir];
if (place_monster_aux(0, y, x, r_idx, PM_NO_KAGE))
{
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
monster_desc(m_name, &m_list[cave[y][x].m_idx], 0);
msg_format(_("%sが釣れた！", "You have a good catch!"), m_name);
success = TRUE;
if (MON_CSLEEP(m_ptr))
{
- char m_name[80];
+ GAME_TEXT m_name[MAX_NLEN];
/* Recover fully */
(void)set_monster_csleep(p_ptr->riding, 0);
-
- /* Acquire the monster name */
monster_desc(m_name, m_ptr, 0);
msg_format(_("%^sを起こした。", "You have waked %s up."), m_name);
}
if (set_monster_stunned(p_ptr->riding,
(randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_STUNNED(m_ptr) - 1)))
{
- char m_name[80];
-
- /* Acquire the monster name */
+ GAME_TEXT m_name[MAX_NLEN];
monster_desc(m_name, m_ptr, 0);
-
- /* Dump a message */
msg_format(_("%^sを朦朧状態から立ち直らせた。", "%^s is no longer stunned."), m_name);
}
}
if (set_monster_confused(p_ptr->riding,
(randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_CONFUSED(m_ptr) - 1)))
{
- char m_name[80];
-
- /* Acquire the monster name */
+ GAME_TEXT m_name[MAX_NLEN];
monster_desc(m_name, m_ptr, 0);
-
- /* Dump a message */
msg_format(_("%^sを混乱状態から立ち直らせた。", "%^s is no longer confused."), m_name);
}
}
if(set_monster_monfear(p_ptr->riding,
(randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_MONFEAR(m_ptr) - 1)))
{
- char m_name[80];
-
- /* Acquire the monster name */
+ GAME_TEXT m_name[MAX_NLEN];
monster_desc(m_name, m_ptr, 0);
-
- /* Dump a message */
msg_format(_("%^sを恐怖から立ち直らせた。", "%^s is no longer fear."), m_name);
}
}
p_ptr->counter = FALSE;
now_damaged = FALSE;
- /* Handle "p_ptr->notice" */
- notice_stuff();
-
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
/* Place the cursor on the player */
resting--;
if (!resting) set_action(ACTION_NONE);
-
- /* Redraw the state */
p_ptr->redraw |= (PR_STATE);
}
/* Count this execution */
command_rep--;
- /* Redraw the state */
p_ptr->redraw |= (PR_STATE);
-
- /* Redraw stuff */
- redraw_stuff();
+ handle_stuff();
/* Hack -- Assume messages were seen */
msg_flag = FALSE;
/* Assume invisible */
m_ptr->ml = FALSE;
-
- /* Update the monster */
- update_mon(i, FALSE);
+ update_monster(i, FALSE);
if (p_ptr->health_who == i) p_ptr->redraw |= (PR_HEALTH);
if (p_ptr->riding == i) p_ptr->redraw |= (PR_UHEALTH);
if (world_player && (p_ptr->energy_need > - 1000))
{
- /* Redraw map */
- p_ptr->redraw |= (PR_MAP);
- /* Update monsters */
+ p_ptr->redraw |= (PR_MAP);
p_ptr->update |= (PU_MONSTERS);
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
/* Verify the panel */
verify_panel();
- /* Flush messages */
- msg_print(NULL);
+ msg_erase();
/* Enter "xtra" mode */
/* Redraw dungeon */
p_ptr->redraw |= (PR_WIPE | PR_BASIC | PR_EXTRA | PR_EQUIPPY);
- /* Redraw map */
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);
-
- /* Update monsters */
p_ptr->update |= (PU_MONSTERS | PU_DISTANCE | PU_FLOW);
/* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
character_xtra = FALSE;
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
- /* Combine / Reorder the pack */
- p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
- /* Handle "p_ptr->notice" */
- notice_stuff();
-
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
+ p_ptr->update |= (PU_COMBINE | PU_REORDER);
handle_stuff();
-
- /* Refresh */
Term_fresh();
if (quest_num && (is_fixed_quest_idx(quest_num) &&
/* Hack -- Compress the object list occasionally */
if (o_cnt + 32 < o_max) compact_objects(0);
-
/* Process the player */
process_player();
-
process_upkeep_with_speed();
- /* Handle "p_ptr->notice" */
- notice_stuff();
-
/* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
/* Process all of the monsters */
process_monsters();
- /* Handle "p_ptr->notice" */
- notice_stuff();
-
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
/* Hack -- Hilite the player */
/* Hack -- Notice death or departure */
if (!p_ptr->playing || p_ptr->is_dead) break;
-
/* Process the world */
process_world();
- /* Handle "p_ptr->notice" */
- notice_stuff();
-
- /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
handle_stuff();
/* Hack -- Hilite the player */
quit(0);
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
- update_stuff();
+ update_creature(p_ptr);
p_ptr->is_dead = TRUE;
Term_xtra(TERM_XTRA_REACT, 0);
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
-
p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
-
- window_stuff();
-
+ handle_stuff();
/* Set or clear "rogue_like_commands" if requested */
if (arg_force_original) rogue_like_commands = FALSE;
/* Process the level */
dungeon(load_game);
- /* 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 health bar */
health_track(0);
-
- /* Forget the lite */
forget_lite();
-
- /* Forget the view */
forget_view();
-
- /* Forget the view */
clear_mon_lite();
/* Handle "quit and save" */
/* Mega-Hack -- Allow player to cheat death */
if ((p_ptr->wizard || cheat_live) && !get_check(_("死にますか? ", "Die? ")))
{
- /* Mark social class, reset age, if needed */
- if (p_ptr->sc) p_ptr->sc = p_ptr->age = 0;
-
- /* Increase age */
- p_ptr->age++;
-
- /* Mark savefile */
- p_ptr->noscore |= 0x0001;
-
- msg_print(_("ウィザードモードに念を送り、死を欺いた。", "You invoke wizard mode and cheat death."));
- msg_print(NULL);
-
- (void)life_stream(FALSE, FALSE);
-
- if (p_ptr->pclass == CLASS_MAGIC_EATER)
- {
- int magic_idx;
- for (magic_idx = 0; magic_idx < EATER_EXT*2; magic_idx++)
- {
- p_ptr->magic_num1[magic_idx] = p_ptr->magic_num2[magic_idx]*EATER_CHARGE;
- }
- for (; magic_idx < EATER_EXT*3; magic_idx++)
- {
- p_ptr->magic_num1[magic_idx] = 0;
- }
- }
-
- /* Restore spell points */
- p_ptr->csp = p_ptr->msp;
- p_ptr->csp_frac = 0;
-
- /* Hack -- cancel recall */
- if (p_ptr->word_recall)
- {
- msg_print(_("張りつめた大気が流れ去った...", "A tension leaves the air around you..."));
- msg_print(NULL);
-
- /* Hack -- Prevent recall */
- p_ptr->word_recall = 0;
- p_ptr->redraw |= (PR_STATUS);
- }
-
- /* Hack -- cancel alter */
- if (p_ptr->alter_reality)
- {
- /* Hack -- Prevent alter */
- p_ptr->alter_reality = 0;
- p_ptr->redraw |= (PR_STATUS);
- }
-
- /* Note cause of death */
- (void)strcpy(p_ptr->died_from, _("死の欺き", "Cheating death"));
-
- /* Do not die */
- p_ptr->is_dead = FALSE;
-
- /* Hack -- Prevent starvation */
- (void)set_food(PY_FOOD_MAX - 1);
-
- dun_level = 0;
- p_ptr->inside_arena = FALSE;
- p_ptr->inside_battle = FALSE;
- leaving_quest = 0;
- p_ptr->inside_quest = 0;
- if (dungeon_type) p_ptr->recall_dungeon = dungeon_type;
- dungeon_type = 0;
- if (lite_town || vanilla_town)
- {
- p_ptr->wilderness_y = 1;
- p_ptr->wilderness_x = 1;
- if (vanilla_town)
- {
- p_ptr->oldpy = 10;
- p_ptr->oldpx = 34;
- }
- else
- {
- p_ptr->oldpy = 33;
- p_ptr->oldpx = 131;
- }
- }
- else
- {
- p_ptr->wilderness_y = 48;
- p_ptr->wilderness_x = 5;
- p_ptr->oldpy = 33;
- p_ptr->oldpx = 131;
- }
-
- /* Leaving */
- p_ptr->wild_mode = FALSE;
- p_ptr->leaving = TRUE;
-
- do_cmd_write_nikki(NIKKI_BUNSHOU, 1,
- _(" しかし、生き返った。",
- " but revived."));
-
- /* Prepare next floor */
- leave_floor();
- wipe_m_list();
+ cheat_death(p_ptr);
}
}
}
OSDN Git Service
