#include "core/player-update-types.h"
#include "core/stuff-handler.h"
#include "core/window-redrawer.h"
+#include "dungeon/dungeon.h"
#include "dungeon/quest.h"
#include "flavor/flavor-describer.h"
#include "flavor/object-flavor-types.h"
#include "object/object-flags.h"
#include "player-info/avatar.h"
#include "player/player-class.h"
-#include "player/player-personalities-types.h"
+#include "player/player-personality-types.h"
#include "player/player-race-types.h"
#include "player/player-status-flags.h"
#include "player/player-status-resist.h"
+#include "player/player-status.h"
#include "player/race-info-table.h"
#include "player/special-defense-types.h"
#include "racial/racial-android.h"
#include "status/element-resistance.h"
#include "system/building-type-definition.h"
#include "system/floor-type-definition.h"
+#include "system/monster-race-definition.h"
+#include "system/monster-type-definition.h"
+#include "system/object-type-definition.h"
+#include "system/player-type-definition.h"
#include "term/screen-processor.h"
#include "term/term-color-types.h"
#include "util/bit-flags-calculator.h"
* @return 修正HPダメージ量
* @details 酸オーラは存在しないが関数ポインタのために引数だけは用意している
*/
-HIT_POINT acid_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura)
+HIT_POINT acid_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, bool aura)
{
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
bool double_resist = is_oppose_acid(creature_ptr);
dam = (dam + 1) / 2;
}
- HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
+ HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str);
if (!aura && !(double_resist && has_resist_acid(creature_ptr)))
inventory_damage(creature_ptr, set_acid_destroy, inv);
* @param aura オーラよるダメージが原因ならばTRUE
* @return 修正HPダメージ量
*/
-HIT_POINT elec_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura)
+HIT_POINT elec_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, bool aura)
{
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
bool double_resist = is_oppose_elec(creature_ptr);
(void)do_dec_stat(creature_ptr, A_DEX);
}
- HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
+ HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str);
if (!aura && !(double_resist && has_resist_elec(creature_ptr)))
inventory_damage(creature_ptr, set_elec_destroy, inv);
* @param aura オーラよるダメージが原因ならばTRUE
* @return 修正HPダメージ量
*/
-HIT_POINT fire_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura)
+HIT_POINT fire_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, bool aura)
{
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
bool double_resist = is_oppose_fire(creature_ptr);
(void)do_dec_stat(creature_ptr, A_STR);
}
- HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
+ HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str);
if (!aura && !(double_resist && has_resist_fire(creature_ptr)))
inventory_damage(creature_ptr, set_fire_destroy, inv);
* @param aura オーラよるダメージが原因ならばTRUE
* @return 修正HPダメージ量
*/
-HIT_POINT cold_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, int monspell, bool aura)
+HIT_POINT cold_dam(player_type *creature_ptr, HIT_POINT dam, concptr kb_str, bool aura)
{
int inv = (dam < 30) ? 1 : (dam < 60) ? 2 : 3;
bool double_resist = is_oppose_cold(creature_ptr);
(void)do_dec_stat(creature_ptr, A_STR);
}
- HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str, monspell);
+ HIT_POINT get_damage = take_hit(creature_ptr, aura ? DAMAGE_NOESCAPE : DAMAGE_ATTACK, dam, kb_str);
if (!aura && !(double_resist && has_resist_cold(creature_ptr)))
inventory_damage(creature_ptr, set_cold_destroy, inv);
* the game when he dies, since the "You die." message is shown before
* setting the player to "dead".
*/
-int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concptr hit_from, int monspell)
+int take_hit(player_type *creature_ptr, int damage_type, HIT_POINT damage, concptr hit_from)
{
- (void)monspell; // unused
-
int old_chp = creature_ptr->chp;
char death_message[1024];
play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_GAMEOVER);
#ifdef WORLD_SCORE
- screen_dump = make_screen_dump(creature_ptr, process_autopick_file_command);
+ screen_dump = make_screen_dump(creature_ptr);
#endif
if (seppuku) {
strcpy(creature_ptr->died_from, hit_from);
current_world_ptr->total_winner = FALSE;
if (winning_seppuku) {
+ add_retired_class(creature_ptr->pclass);
exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 0, _("勝利の後切腹した。", "committed seppuku after the winning."));
} else {
char buf[20];
exe_write_diary(creature_ptr, DIARY_DESCRIPTION, 1, "\n\n\n\n");
flush();
if (get_check_strict(creature_ptr, _("画面を保存しますか？", "Dump the screen? "), CHECK_NO_HISTORY))
- do_cmd_save_screen(creature_ptr, process_autopick_file_command);
+ do_cmd_save_screen(creature_ptr);
flush();
if (creature_ptr->last_message)
term_putstr(w - 1, h - 1, 1, TERM_WHITE, " ");
flush();
#ifdef WORLD_SCORE
- screen_dump = make_screen_dump(creature_ptr, process_autopick_file_command);
+ screen_dump = make_screen_dump(creature_ptr);
#endif
(void)inkey();
} else
* @param aura_flag オーラフラグ配列
* @param dam_func ダメージ処理を行う関数の参照ポインタ
* @param message オーラダメージを受けた際のメッセージ
- * @return なし
*/
static void process_aura_damage(monster_type *m_ptr, player_type *touched_ptr, bool immune, int flags_offset, int r_flags_offset, u32b aura_flag,
- HIT_POINT (*dam_func)(player_type *creature_type, HIT_POINT dam, concptr kb_str, int monspell, bool aura), concptr message)
+ HIT_POINT (*dam_func)(player_type *creature_type, HIT_POINT dam, concptr kb_str, bool aura), concptr message)
{
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (!(atoffset(BIT_FLAGS, r_ptr, flags_offset) & aura_flag) || immune)
monster_desc(touched_ptr, mon_name, m_ptr, MD_WRONGDOER_NAME);
msg_print(message);
- dam_func(touched_ptr, aura_damage, mon_name, -1, TRUE);
+ dam_func(touched_ptr, aura_damage, mon_name, TRUE);
if (is_original_ap_and_seen(touched_ptr, m_ptr))
atoffset(BIT_FLAGS, r_ptr, r_flags_offset) |= aura_flag;
* @brief 敵オーラによるプレイヤーのダメージ処理
* @param m_ptr オーラを持つモンスターの構造体参照ポインタ
* @param touched_ptr オーラを持つ相手に振れたクリーチャーの参照ポインタ
- * @return なし
*/
void touch_zap_player(monster_type *m_ptr, player_type *touched_ptr)
{
OSDN Git Service
