#include "angband.h"
#include "core.h"
#include "util.h"
-#include "term.h"
+#include "main/music-definitions-table.h"
+#include "gameterm.h"
#include "avatar.h"
-#include "cmd-dump.h"
+#include "market/building.h"
+#include "io/write-diary.h"
+#include "cmd/cmd-dump.h"
+#include "market/arena-info-table.h"
#include "realm-song.h"
#include "floor.h"
#include "artifact.h"
#include "player-status.h"
#include "player-effects.h"
#include "player-class.h"
+#include "player-race.h"
#include "monster-spell.h"
#include "world.h"
#include "view-mainwindow.h"
/* Some casualities */
if (!amt) continue;
- object_desc(o_name, o_ptr, OD_OMIT_PREFIX);
+ object_desc(player_ptr, o_name, o_ptr, OD_OMIT_PREFIX);
msg_format(_("%s(%c)が%s壊れてしまった！", "%sour %s (%c) %s destroyed!"),
#ifdef JP
#endif
#ifdef JP
- 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))
{
/* Potions smash open */
if (object_is_potion(o_ptr))
{
- (void)potion_smash_effect(0, player_ptr->y, player_ptr->x, o_ptr->k_idx);
+ (void)potion_smash_effect(player_ptr, 0, player_ptr->y, player_ptr->x, o_ptr->k_idx);
}
/* Reduce the charges of rods/wands */
reduce_charges(o_ptr, amt);
/* Destroy "amt" items */
- inven_item_increase(i, -amt);
- inven_item_optimize(i);
+ inven_item_increase(player_ptr, i, -amt);
+ inven_item_optimize(player_ptr, i);
}
}
case 7: o_ptr = &creature_ptr->inventory_list[INVEN_FEET]; break;
}
- if (!o_ptr->k_idx) return (FALSE);
- if (!object_is_armour(o_ptr)) return (FALSE);
+ if (!o_ptr->k_idx) return FALSE;
+ if (!object_is_armour(o_ptr)) return FALSE;
- object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ object_desc(creature_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
object_flags(o_ptr, flgs);
/* No damage left to be done */
if (o_ptr->ac + o_ptr->to_a <= 0)
{
- msg_format(_("%sは既にボロボロだ！", "Your %s is already crumble!"), o_name);
- return (FALSE);
+ msg_format(_("%sは既にボロボロだ！", "Your %s is already fully corroded!"), o_name);
+ return FALSE;
}
/* Object resists */
if (have_flag(flgs, TR_IGNORE_ACID))
{
msg_format(_("しかし%sには効果がなかった！", "Your %s is unaffected!"), o_name);
- return (TRUE);
+ return TRUE;
}
msg_format(_("%sが酸で腐食した！", "Your %s is corroded!"), o_name);
calc_android_exp(creature_ptr);
/* Item was damaged */
- return (TRUE);
+ return TRUE;
}
{
HIT_POINT get_damage;
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
- bool double_resist = IS_OPPOSE_ACID();
+ bool double_resist = is_oppose_acid(creature_ptr);
/* Total Immunity */
if (creature_ptr->immune_acid || (dam <= 0))
{
- learn_spell(monspell);
+ learn_spell(creature_ptr, monspell);
return 0;
}
{
HIT_POINT get_damage;
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
- bool double_resist = IS_OPPOSE_ELEC();
+ bool double_resist = is_oppose_elec(creature_ptr);
/* Total immunity */
if (creature_ptr->immune_elec || (dam <= 0))
{
- learn_spell(monspell);
+ learn_spell(creature_ptr, monspell);
return 0;
}
{
HIT_POINT get_damage;
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
- bool double_resist = IS_OPPOSE_FIRE();
+ bool double_resist = is_oppose_fire(creature_ptr);
/* Totally immune */
if (creature_ptr->immune_fire || (dam <= 0))
{
- learn_spell(monspell);
+ learn_spell(creature_ptr, monspell);
return 0;
}
{
HIT_POINT get_damage;
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
- bool double_resist = IS_OPPOSE_COLD();
+ bool double_resist = is_oppose_cold(creature_ptr);
/* Total immunity */
if (creature_ptr->immune_cold || (dam <= 0))
{
- learn_spell(monspell);
+ learn_spell(creature_ptr, monspell);
return 0;
}
}
}
- if (monspell >= 0) learn_spell(monspell);
+ if (monspell >= 0) learn_spell(creature_ptr, monspell);
/* Mega-Hack -- Apply "invulnerability" */
if ((damage_type != DAMAGE_USELIFE) && (damage_type != DAMAGE_LOSELIFE))
}
else if (damage_type == DAMAGE_ATTACK)
{
- msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, you are unharmed!"));
+ msg_print(_("攻撃は幻影に命中し、あなたには届かなかった。", "The attack hits Shadow, but you are unharmed!"));
return 0;
}
}
{
bool android = (creature_ptr->prace == RACE_ANDROID ? TRUE : FALSE);
-#ifdef JP /* 死んだ時に強制終了して死を回避できなくしてみた by Habu */
+#ifdef JP
+ /* 死んだ時に強制終了して死を回避できなくしてみた by Habu */
if (!cheat_save)
- if (!save_player()) msg_print("セーブ失敗！");
+ if (!save_player(creature_ptr)) msg_print("セーブ失敗！");
#endif
sound(SOUND_DEATH);
chg_virtue(creature_ptr, V_SACRIFICE, 10);
- handle_stuff();
+ handle_stuff(creature_ptr);
creature_ptr->leaving = TRUE;
/* Note death */
concptr m_name = r_name + r_info[arena_info[creature_ptr->arena_number].r_idx].name;
msg_format(_("あなたは%sの前に敗れ去った。", "You are beaten by %s."), m_name);
msg_print(NULL);
- if (record_arena) exe_write_diary(creature_ptr, NIKKI_ARENA, -1 - creature_ptr->arena_number, m_name);
+ if (record_arena) exe_write_diary(creature_ptr, DIARY_ARENA, -1 - creature_ptr->arena_number, m_name);
}
else
{
- QUEST_IDX q_idx = quest_number(creature_ptr->current_floor_ptr->dun_level);
+ QUEST_IDX q_idx = quest_number(creature_ptr, creature_ptr->current_floor_ptr->dun_level);
bool seppuku = streq(hit_from, "Seppuku");
bool winning_seppuku = current_world_ptr->total_winner && seppuku;
if (winning_seppuku)
{
- exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, _("勝利の後切腹した。", "did Seppuku after the winning."));
+ exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "committed seppuku after the winning."));
}
else
{
sprintf(buf, _("%d階", "level %d"), (int)creature_ptr->current_floor_ptr->dun_level);
sprintf(tmp, _("%sで%sに殺された。", "killed by %s %s."), buf, creature_ptr->died_from);
- exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, tmp);
+ exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, tmp);
}
- exe_write_diary(creature_ptr, NIKKI_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------"));
- exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 1, "\n\n\n\n");
+ exe_write_diary(creature_ptr, DIARY_GAMESTART, 1, _("-------- ゲームオーバー --------", "-------- Game Over --------"));
+ exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n");
flush();
return damage;
}
- handle_stuff();
+ handle_stuff(creature_ptr);
/* Hitpoint warning */
if (creature_ptr->chp < warning)
if (creature_ptr->image && damage_type == DAMAGE_ATTACK)
hit_from = _("何か", "something");
- sprintf(tmp, _("%sによってピンチに陥った。", "A critical situation because of %s."), hit_from);
- exe_write_diary(creature_ptr, NIKKI_BUNSHOU, 0, tmp);
+ sprintf(tmp, _("%sによってピンチに陥った。", "was in a critical situation because of %s."), hit_from);
+ exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, tmp);
}
if (auto_more)
OSDN Git Service
