#include "cmd-pet.h"
#include "floor-events.h"
#include "object-curse.h"
+#include "store.h"
+#include "monsterrace-hook.h"
static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ（広域マップ1マス毎に20回処理を基本とする）*/
*/
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 */
{
/* Combine pack */
p_ptr->notice |= (PN_COMBINE);
-
p_ptr->window |= (PW_INVEN);
p_ptr->window |= (PW_EQUIP);
wild_regen = 20;
{
const magic_type *s_ptr;
int spell;
- s32b need_mana;
+ MANA_POINT need_mana;
u32b need_mana_frac;
/* Music singed by player */
(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)
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;
/* 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);
/* 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);
if (o_ptr->name1 == ART_JUDGE)
{
-#ifdef JP
- if (object_is_known(o_ptr))
- msg_print("『審判の宝石』はあなたの体力を吸収した！");
- 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!");
+ 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);
}
}
}
/* 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;
/* 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));
/* 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))
{
/* Count this execution */
command_rep--;
- /* Redraw the state */
p_ptr->redraw |= (PR_STATE);
-
- /* Redraw stuff */
redraw_stuff();
/* Hack -- Assume messages were seen */
/* 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 */
/* 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);
OSDN Git Service
