From 6979d14960946dcacc5c343c0b21164d49a2f715 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 8 Aug 2020 13:47:29 +0900 Subject: [PATCH] [Refactor] #39010 Separated throw-util.c/h from cmd-throw.c --- Hengband/Hengband/Hengband.vcxproj | 2 + Hengband/Hengband/Hengband.vcxproj.filters | 6 + src/Makefile.am | 1 + src/action/throw-util.c | 14 ++ src/action/throw-util.h | 36 ++++ src/cmd-item/cmd-throw.c | 336 ++++++++++++++--------------- 6 files changed, 216 insertions(+), 179 deletions(-) create mode 100644 src/action/throw-util.c create mode 100644 src/action/throw-util.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 68a8a3982..254322132 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -725,11 +725,13 @@ + + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 15225dd02..c0eae422d 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -2003,6 +2003,9 @@ racial + + action + @@ -4357,6 +4360,9 @@ racial + + action + diff --git a/src/Makefile.am b/src/Makefile.am index 0e1cc1c3a..a37d947ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ hengband_SOURCES = \ action/open-close-execution.c action/open-close-execution.h \ action/racial-execution.c action/racial-execution.h \ action/run-execution.c action/run-execution.h \ + action/throw-util.c action/throw-util.h \ action/travel-execution.c action/travel-execution.h \ action/tunnel-execution.c action/tunnel-execution.h \ action/weapon-shield.c action/weapon-shield.h \ diff --git a/src/action/throw-util.c b/src/action/throw-util.c new file mode 100644 index 000000000..c020821bc --- /dev/null +++ b/src/action/throw-util.c @@ -0,0 +1,14 @@ +#include "action/throw-util.h" + +it_type *initialize_it_type(it_type *item_throw_ptr, object_type *q_ptr, const int delay_factor_val) +{ + item_throw_ptr->q_ptr = q_ptr; + item_throw_ptr->hit_body = FALSE; + item_throw_ptr->hit_wall = FALSE; + item_throw_ptr->equiped_item = FALSE; + item_throw_ptr->return_when_thrown = FALSE; + item_throw_ptr->msec = delay_factor_val * delay_factor_val * delay_factor_val; + item_throw_ptr->come_back = FALSE; + item_throw_ptr->do_drop = TRUE; + return item_throw_ptr; +} diff --git a/src/action/throw-util.h b/src/action/throw-util.h new file mode 100644 index 000000000..b3128ecff --- /dev/null +++ b/src/action/throw-util.h @@ -0,0 +1,36 @@ +#pragma once + +#include "system/angband.h" +#include "system/object-type-definition.h" + +// Item Throw. +typedef struct it_type { + OBJECT_IDX item; + POSITION y; + POSITION x; + POSITION ty; + POSITION tx; + POSITION prev_y; + POSITION prev_x; + POSITION ny[19]; + POSITION nx[19]; + int chance; + int tdam; + int tdis; + int cur_dis; + int visible; + PERCENTAGE corruption_possibility; + object_type *q_ptr; + object_type *o_ptr; + bool hit_body; + bool hit_wall; + bool equiped_item; + bool return_when_thrown; + GAME_TEXT o_name[MAX_NLEN]; + int msec; + BIT_FLAGS obj_flags[TR_FLAG_SIZE]; + bool come_back; + bool do_drop; +} it_type; + +it_type *initialize_it_type(it_type *item_throw_ptr, object_type *q_ptr, const int delay_factor_val); diff --git a/src/cmd-item/cmd-throw.c b/src/cmd-item/cmd-throw.c index b1b375c1f..5623ec2c7 100644 --- a/src/cmd-item/cmd-throw.c +++ b/src/cmd-item/cmd-throw.c @@ -1,4 +1,5 @@ #include "cmd-item/cmd-throw.h" +#include "action/throw-util.h" #include "action/weapon-shield.h" #include "art-definition/art-weapon-types.h" #include "combat/attack-power-table.h" @@ -76,133 +77,110 @@ */ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_IDX shuriken) { - OBJECT_IDX item; - POSITION y; - POSITION x; - POSITION ty; - POSITION tx; - POSITION prev_y; - POSITION prev_x; - POSITION ny[19]; - POSITION nx[19]; - int chance; - int tdam; - int tdis; - int cur_dis; - int visible; - PERCENTAGE corruption_possibility; - object_type forge; - object_type *q_ptr = &forge; - object_type *o_ptr; - bool hit_body = FALSE; - bool hit_wall = FALSE; - bool equiped_item = FALSE; - bool return_when_thrown = FALSE; - GAME_TEXT o_name[MAX_NLEN]; - int msec = delay_factor * delay_factor * delay_factor; - BIT_FLAGS obj_flags[TR_FLAG_SIZE]; - bool come_back = FALSE; - bool do_drop = TRUE; if (creature_ptr->wild_mode) return FALSE; if (creature_ptr->special_defense & KATA_MUSOU) set_action(creature_ptr, ACTION_NONE); + it_type tmp_it; + object_type tmp_object; + it_type *it_ptr = initialize_it_type(&tmp_it, &tmp_object, delay_factor); + concptr q, s; if (shuriken >= 0) { - item = shuriken; - o_ptr = &creature_ptr->inventory_list[item]; + it_ptr->item = shuriken; + it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; } else if (boomerang) { if (has_melee_weapon(creature_ptr, INVEN_RARM) && has_melee_weapon(creature_ptr, INVEN_LARM)) { item_tester_hook = item_tester_hook_boomerang; - q = _("どの武器を投げますか? ", "Throw which item? "); + q = _("どの武器を投げますか? ", "Throw which it_ptr->item? "); s = _("投げる武器がない。", "You have nothing to throw."); - o_ptr = choose_object(creature_ptr, &item, q, s, USE_EQUIP, 0); - if (!o_ptr) { + it_ptr->o_ptr = choose_object(creature_ptr, &it_ptr->item, q, s, USE_EQUIP, 0); + if (!it_ptr->o_ptr) { flush(); return FALSE; } } else if (has_melee_weapon(creature_ptr, INVEN_LARM)) { - item = INVEN_LARM; - o_ptr = &creature_ptr->inventory_list[item]; + it_ptr->item = INVEN_LARM; + it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; } else { - item = INVEN_RARM; - o_ptr = &creature_ptr->inventory_list[item]; + it_ptr->item = INVEN_RARM; + it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; } } else { - q = _("どのアイテムを投げますか? ", "Throw which item? "); + q = _("どのアイテムを投げますか? ", "Throw which it_ptr->item? "); s = _("投げるアイテムがない。", "You have nothing to throw."); - o_ptr = choose_object(creature_ptr, &item, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP, 0); - if (!o_ptr) { + it_ptr->o_ptr = choose_object(creature_ptr, &it_ptr->item, q, s, USE_INVEN | USE_FLOOR | USE_EQUIP, 0); + if (!it_ptr->o_ptr) { flush(); return FALSE; } } - if (object_is_cursed(o_ptr) && (item >= INVEN_RARM)) { + if (object_is_cursed(it_ptr->o_ptr) && (it_ptr->item >= INVEN_RARM)) { msg_print(_("ふーむ、どうやら呪われているようだ。", "Hmmm, it seems to be cursed.")); return FALSE; } - if (creature_ptr->current_floor_ptr->inside_arena && !boomerang && (o_ptr->tval != TV_SPIKE)) { + if (creature_ptr->current_floor_ptr->inside_arena && !boomerang && (it_ptr->o_ptr->tval != TV_SPIKE)) { msg_print(_("アリーナではアイテムを使えない！", "You're in the arena now. This is hand-to-hand!")); msg_print(NULL); return FALSE; } - object_copy(q_ptr, o_ptr); - object_flags(creature_ptr, q_ptr, obj_flags); - torch_flags(q_ptr, obj_flags); - distribute_charges(o_ptr, q_ptr, 1); - q_ptr->number = 1; - describe_flavor(creature_ptr, o_name, q_ptr, OD_OMIT_PREFIX); + object_copy(it_ptr->q_ptr, it_ptr->o_ptr); + object_flags(creature_ptr, it_ptr->q_ptr, it_ptr->obj_flags); + torch_flags(it_ptr->q_ptr, it_ptr->obj_flags); + distribute_charges(it_ptr->o_ptr, it_ptr->q_ptr, 1); + it_ptr->q_ptr->number = 1; + describe_flavor(creature_ptr, it_ptr->o_name, it_ptr->q_ptr, OD_OMIT_PREFIX); if (creature_ptr->mighty_throw) mult += 3; int mul = 10 + 2 * (mult - 1); - int div = ((q_ptr->weight > 10) ? q_ptr->weight : 10); - if ((have_flag(obj_flags, TR_THROW)) || boomerang) + int div = ((it_ptr->q_ptr->weight > 10) ? it_ptr->q_ptr->weight : 10); + if ((have_flag(it_ptr->obj_flags, TR_THROW)) || boomerang) div /= 2; - tdis = (adj_str_blow[creature_ptr->stat_ind[A_STR]] + 20) * mul / div; - if (tdis > mul) - tdis = mul; + it_ptr->tdis = (adj_str_blow[creature_ptr->stat_ind[A_STR]] + 20) * mul / div; + if (it_ptr->tdis > mul) + it_ptr->tdis = mul; if (shuriken >= 0) { - ty = randint0(101) - 50 + creature_ptr->y; - tx = randint0(101) - 50 + creature_ptr->x; + it_ptr->ty = randint0(101) - 50 + creature_ptr->y; + it_ptr->tx = randint0(101) - 50 + creature_ptr->x; } else { - project_length = tdis + 1; + project_length = it_ptr->tdis + 1; DIRECTION dir; if (!get_aim_dir(creature_ptr, &dir)) return FALSE; - tx = creature_ptr->x + 99 * ddx[dir]; - ty = creature_ptr->y + 99 * ddy[dir]; + it_ptr->tx = creature_ptr->x + 99 * ddx[dir]; + it_ptr->ty = creature_ptr->y + 99 * ddy[dir]; if ((dir == 5) && target_okay(creature_ptr)) { - tx = target_col; - ty = target_row; + it_ptr->tx = target_col; + it_ptr->ty = target_row; } project_length = 0; /* reset to default */ } - if ((q_ptr->name1 == ART_MJOLLNIR) || (q_ptr->name1 == ART_AEGISFANG) || boomerang) - return_when_thrown = TRUE; + if ((it_ptr->q_ptr->name1 == ART_MJOLLNIR) || (it_ptr->q_ptr->name1 == ART_AEGISFANG) || boomerang) + it_ptr->return_when_thrown = TRUE; - if (item >= 0) { - inven_item_increase(creature_ptr, item, -1); - if (!return_when_thrown) - inven_item_describe(creature_ptr, item); - inven_item_optimize(creature_ptr, item); + if (it_ptr->item >= 0) { + inven_item_increase(creature_ptr, it_ptr->item, -1); + if (!it_ptr->return_when_thrown) + inven_item_describe(creature_ptr, it_ptr->item); + inven_item_optimize(creature_ptr, it_ptr->item); } else { - floor_item_increase(creature_ptr->current_floor_ptr, 0 - item, -1); - floor_item_optimize(creature_ptr, 0 - item); + floor_item_increase(creature_ptr->current_floor_ptr, 0 - it_ptr->item, -1); + floor_item_optimize(creature_ptr, 0 - it_ptr->item); } - if (item >= INVEN_RARM) { - equiped_item = TRUE; + if (it_ptr->item >= INVEN_RARM) { + it_ptr->equiped_item = TRUE; creature_ptr->redraw |= PR_EQUIPPY; } @@ -210,68 +188,68 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID if ((creature_ptr->pclass == CLASS_ROGUE) || (creature_ptr->pclass == CLASS_NINJA)) creature_ptr->energy_use -= creature_ptr->lev; - y = creature_ptr->y; - x = creature_ptr->x; + it_ptr->y = creature_ptr->y; + it_ptr->x = creature_ptr->x; handle_stuff(creature_ptr); - if ((creature_ptr->pclass == CLASS_NINJA) && ((q_ptr->tval == TV_SPIKE) || ((have_flag(obj_flags, TR_THROW)) && (q_ptr->tval == TV_SWORD)))) + if ((creature_ptr->pclass == CLASS_NINJA) && ((it_ptr->q_ptr->tval == TV_SPIKE) || ((have_flag(it_ptr->obj_flags, TR_THROW)) && (it_ptr->q_ptr->tval == TV_SWORD)))) shuriken = TRUE; else shuriken = FALSE; - if (have_flag(obj_flags, TR_THROW)) - chance = ((creature_ptr->skill_tht) + ((creature_ptr->to_h_b + q_ptr->to_h) * BTH_PLUS_ADJ)); + if (have_flag(it_ptr->obj_flags, TR_THROW)) + it_ptr->chance = ((creature_ptr->skill_tht) + ((creature_ptr->to_h_b + it_ptr->q_ptr->to_h) * BTH_PLUS_ADJ)); else - chance = (creature_ptr->skill_tht + (creature_ptr->to_h_b * BTH_PLUS_ADJ)); + it_ptr->chance = (creature_ptr->skill_tht + (creature_ptr->to_h_b * BTH_PLUS_ADJ)); if (shuriken) - chance *= 2; + it_ptr->chance *= 2; - prev_y = y; - prev_x = x; - for (cur_dis = 0; cur_dis <= tdis;) { - if ((y == ty) && (x == tx)) + it_ptr->prev_y = it_ptr->y; + it_ptr->prev_x = it_ptr->x; + for (it_ptr->cur_dis = 0; it_ptr->cur_dis <= it_ptr->tdis;) { + if ((it_ptr->y == it_ptr->ty) && (it_ptr->x == it_ptr->tx)) break; - ny[cur_dis] = y; - nx[cur_dis] = x; - mmove2(&ny[cur_dis], &nx[cur_dis], creature_ptr->y, creature_ptr->x, ty, tx); - if (!cave_have_flag_bold(creature_ptr->current_floor_ptr, ny[cur_dis], nx[cur_dis], FF_PROJECT)) { - hit_wall = TRUE; - if ((q_ptr->tval == TV_FIGURINE) || object_is_potion(q_ptr) || !creature_ptr->current_floor_ptr->grid_array[ny[cur_dis]][nx[cur_dis]].m_idx) + it_ptr->ny[it_ptr->cur_dis] = it_ptr->y; + it_ptr->nx[it_ptr->cur_dis] = it_ptr->x; + mmove2(&it_ptr->ny[it_ptr->cur_dis], &it_ptr->nx[it_ptr->cur_dis], creature_ptr->y, creature_ptr->x, it_ptr->ty, it_ptr->tx); + if (!cave_have_flag_bold(creature_ptr->current_floor_ptr, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis], FF_PROJECT)) { + it_ptr->hit_wall = TRUE; + if ((it_ptr->q_ptr->tval == TV_FIGURINE) || object_is_potion(it_ptr->q_ptr) || !creature_ptr->current_floor_ptr->grid_array[it_ptr->ny[it_ptr->cur_dis]][it_ptr->nx[it_ptr->cur_dis]].m_idx) break; } - if (panel_contains(ny[cur_dis], nx[cur_dis]) && player_can_see_bold(creature_ptr, ny[cur_dis], nx[cur_dis])) { - SYMBOL_CODE c = object_char(q_ptr); - TERM_COLOR a = object_attr(q_ptr); - print_rel(creature_ptr, c, a, ny[cur_dis], nx[cur_dis]); - move_cursor_relative(ny[cur_dis], nx[cur_dis]); + if (panel_contains(it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis]) && player_can_see_bold(creature_ptr, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis])) { + SYMBOL_CODE c = object_char(it_ptr->q_ptr); + TERM_COLOR a = object_attr(it_ptr->q_ptr); + print_rel(creature_ptr, c, a, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis]); + move_cursor_relative(it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis]); term_fresh(); - term_xtra(TERM_XTRA_DELAY, msec); - lite_spot(creature_ptr, ny[cur_dis], nx[cur_dis]); + term_xtra(TERM_XTRA_DELAY, it_ptr->msec); + lite_spot(creature_ptr, it_ptr->ny[it_ptr->cur_dis], it_ptr->nx[it_ptr->cur_dis]); term_fresh(); } else { - term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, it_ptr->msec); } - prev_y = y; - prev_x = x; - x = nx[cur_dis]; - y = ny[cur_dis]; - cur_dis++; - if (creature_ptr->current_floor_ptr->grid_array[y][x].m_idx) { - grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x]; + it_ptr->prev_y = it_ptr->y; + it_ptr->prev_x = it_ptr->x; + it_ptr->x = it_ptr->nx[it_ptr->cur_dis]; + it_ptr->y = it_ptr->ny[it_ptr->cur_dis]; + it_ptr->cur_dis++; + if (creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx) { + grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x]; monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[g_ptr->m_idx]; GAME_TEXT m_name[MAX_NLEN]; monster_name(creature_ptr, g_ptr->m_idx, m_name); - visible = m_ptr->ml; - hit_body = TRUE; - if (test_hit_fire(creature_ptr, chance - cur_dis, m_ptr, m_ptr->ml, o_name)) { + it_ptr->visible = m_ptr->ml; + it_ptr->hit_body = TRUE; + if (test_hit_fire(creature_ptr, it_ptr->chance - it_ptr->cur_dis, m_ptr, m_ptr->ml, it_ptr->o_name)) { bool fear = FALSE; - if (!visible) { - msg_format(_("%sが敵を捕捉した。", "The %s finds a mark."), o_name); + if (!it_ptr->visible) { + msg_format(_("%sが敵を捕捉した。", "The %s finds a mark."), it_ptr->o_name); } else { - msg_format(_("%sが%sに命中した。", "The %s hits %s."), o_name, m_name); + msg_format(_("%sが%sに命中した。", "The %s hits %s."), it_ptr->o_name, m_name); if (m_ptr->ml) { if (!creature_ptr->image) monster_race_track(creature_ptr, m_ptr->ap_r_idx); @@ -279,42 +257,42 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID } } - int dd = q_ptr->dd; - int ds = q_ptr->ds; - torch_dice(q_ptr, &dd, &ds); - tdam = damroll(dd, ds); - tdam = calc_attack_damage_with_slay(creature_ptr, q_ptr, tdam, m_ptr, 0, TRUE); - tdam = critical_shot(creature_ptr, q_ptr->weight, q_ptr->to_h, 0, tdam); - if (q_ptr->to_d > 0) - tdam += q_ptr->to_d; + int dd = it_ptr->q_ptr->dd; + int ds = it_ptr->q_ptr->ds; + torch_dice(it_ptr->q_ptr, &dd, &ds); + it_ptr->tdam = damroll(dd, ds); + it_ptr->tdam = calc_attack_damage_with_slay(creature_ptr, it_ptr->q_ptr, it_ptr->tdam, m_ptr, 0, TRUE); + it_ptr->tdam = critical_shot(creature_ptr, it_ptr->q_ptr->weight, it_ptr->q_ptr->to_h, 0, it_ptr->tdam); + if (it_ptr->q_ptr->to_d > 0) + it_ptr->tdam += it_ptr->q_ptr->to_d; else - tdam += -q_ptr->to_d; + it_ptr->tdam += -it_ptr->q_ptr->to_d; if (boomerang) { - tdam *= (mult + creature_ptr->num_blow[item - INVEN_RARM]); - tdam += creature_ptr->to_d_m; - } else if (have_flag(obj_flags, TR_THROW)) { - tdam *= (3 + mult); - tdam += creature_ptr->to_d_m; + it_ptr->tdam *= (mult + creature_ptr->num_blow[it_ptr->item - INVEN_RARM]); + it_ptr->tdam += creature_ptr->to_d_m; + } else if (have_flag(it_ptr->obj_flags, TR_THROW)) { + it_ptr->tdam *= (3 + mult); + it_ptr->tdam += creature_ptr->to_d_m; } else { - tdam *= mult; + it_ptr->tdam *= mult; } if (shuriken) - tdam += ((creature_ptr->lev + 30) * (creature_ptr->lev + 30) - 900) / 55; + it_ptr->tdam += ((creature_ptr->lev + 30) * (creature_ptr->lev + 30) - 900) / 55; - if (tdam < 0) - tdam = 0; + if (it_ptr->tdam < 0) + it_ptr->tdam = 0; - tdam = mon_damage_mod(creature_ptr, m_ptr, tdam, FALSE); - msg_format_wizard(creature_ptr, CHEAT_MONSTER, _("%dのダメージを与えた。(残りHP %d/%d(%d))", "You do %d damage. (left HP %d/%d(%d))"), tdam, - m_ptr->hp - tdam, m_ptr->maxhp, m_ptr->max_maxhp); + it_ptr->tdam = mon_damage_mod(creature_ptr, m_ptr, it_ptr->tdam, FALSE); + msg_format_wizard(creature_ptr, CHEAT_MONSTER, _("%dのダメージを与えた。(残りHP %d/%d(%d))", "You do %d damage. (left HP %d/%d(%d))"), it_ptr->tdam, + m_ptr->hp - it_ptr->tdam, m_ptr->maxhp, m_ptr->max_maxhp); - if (mon_take_hit(creature_ptr, g_ptr->m_idx, tdam, &fear, extract_note_dies(real_r_idx(m_ptr)))) { + if (mon_take_hit(creature_ptr, g_ptr->m_idx, it_ptr->tdam, &fear, extract_note_dies(real_r_idx(m_ptr)))) { /* Dead monster */ } else { - message_pain(creature_ptr, g_ptr->m_idx, tdam); - if ((tdam > 0) && !object_is_potion(q_ptr)) + message_pain(creature_ptr, g_ptr->m_idx, it_ptr->tdam); + if ((it_ptr->tdam > 0) && !object_is_potion(it_ptr->q_ptr)) anger_monster(creature_ptr, m_ptr); if (fear && m_ptr->ml) { @@ -328,104 +306,104 @@ bool do_cmd_throw(player_type *creature_ptr, int mult, bool boomerang, OBJECT_ID } } - if (hit_body) - torch_lost_fuel(q_ptr); + if (it_ptr->hit_body) + torch_lost_fuel(it_ptr->q_ptr); - corruption_possibility = (hit_body ? breakage_chance(creature_ptr, q_ptr, creature_ptr->pclass == CLASS_ARCHER, 0) : 0); + it_ptr->corruption_possibility = (it_ptr->hit_body ? breakage_chance(creature_ptr, it_ptr->q_ptr, creature_ptr->pclass == CLASS_ARCHER, 0) : 0); - if ((q_ptr->tval == TV_FIGURINE) && !(creature_ptr->current_floor_ptr->inside_arena)) { - corruption_possibility = 100; - if (!(summon_named_creature(creature_ptr, 0, y, x, q_ptr->pval, !(object_is_cursed(q_ptr)) ? PM_FORCE_PET : 0L))) + if ((it_ptr->q_ptr->tval == TV_FIGURINE) && !(creature_ptr->current_floor_ptr->inside_arena)) { + it_ptr->corruption_possibility = 100; + if (!(summon_named_creature(creature_ptr, 0, it_ptr->y, it_ptr->x, it_ptr->q_ptr->pval, !(object_is_cursed(it_ptr->q_ptr)) ? PM_FORCE_PET : 0L))) msg_print(_("人形は捻じ曲がり砕け散ってしまった！", "The Figurine writhes and then shatters.")); - else if (object_is_cursed(q_ptr)) + else if (object_is_cursed(it_ptr->q_ptr)) msg_print(_("これはあまり良くない気がする。", "You have a bad feeling about this.")); } - if (object_is_potion(q_ptr)) { - if (hit_body || hit_wall || (randint1(100) < corruption_possibility)) { - msg_format(_("%sは砕け散った！", "The %s shatters!"), o_name); - if (potion_smash_effect(creature_ptr, 0, y, x, q_ptr->k_idx)) { - monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[y][x].m_idx]; - if (creature_ptr->current_floor_ptr->grid_array[y][x].m_idx && is_friendly(m_ptr) && !monster_invulner_remaining(m_ptr)) { + if (object_is_potion(it_ptr->q_ptr)) { + if (it_ptr->hit_body || it_ptr->hit_wall || (randint1(100) < it_ptr->corruption_possibility)) { + msg_format(_("%sは砕け散った！", "The %s shatters!"), it_ptr->o_name); + if (potion_smash_effect(creature_ptr, 0, it_ptr->y, it_ptr->x, it_ptr->q_ptr->k_idx)) { + monster_type *m_ptr = &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx]; + if (creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx && is_friendly(m_ptr) && !monster_invulner_remaining(m_ptr)) { GAME_TEXT m_name[MAX_NLEN]; monster_desc(creature_ptr, m_name, m_ptr, 0); msg_format(_("%sは怒った！", "%^s gets angry!"), m_name); - set_hostile(creature_ptr, &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[y][x].m_idx]); + set_hostile(creature_ptr, &creature_ptr->current_floor_ptr->m_list[creature_ptr->current_floor_ptr->grid_array[it_ptr->y][it_ptr->x].m_idx]); } } - do_drop = FALSE; + it_ptr->do_drop = FALSE; } else { - corruption_possibility = 0; + it_ptr->corruption_possibility = 0; } } - if (return_when_thrown) { + if (it_ptr->return_when_thrown) { int back_chance = randint1(30) + 20 + ((int)(adj_dex_th[creature_ptr->stat_ind[A_DEX]]) - 128); char o2_name[MAX_NLEN]; - bool super_boomerang = (((q_ptr->name1 == ART_MJOLLNIR) || (q_ptr->name1 == ART_AEGISFANG)) && boomerang); - corruption_possibility = -1; + bool super_boomerang = (((it_ptr->q_ptr->name1 == ART_MJOLLNIR) || (it_ptr->q_ptr->name1 == ART_AEGISFANG)) && boomerang); + it_ptr->corruption_possibility = -1; if (boomerang) back_chance += 4 + randint1(5); if (super_boomerang) back_chance += 100; - describe_flavor(creature_ptr, o2_name, q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); + describe_flavor(creature_ptr, o2_name, it_ptr->q_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); if ((back_chance > 30) && (!one_in_(100) || super_boomerang)) { - for (int i = cur_dis - 1; i > 0; i--) { - if (panel_contains(ny[i], nx[i]) && player_can_see_bold(creature_ptr, ny[i], nx[i])) { - SYMBOL_CODE c = object_char(q_ptr); - byte a = object_attr(q_ptr); - print_rel(creature_ptr, c, a, ny[i], nx[i]); - move_cursor_relative(ny[i], nx[i]); + for (int i = it_ptr->cur_dis - 1; i > 0; i--) { + if (panel_contains(it_ptr->ny[i], it_ptr->nx[i]) && player_can_see_bold(creature_ptr, it_ptr->ny[i], it_ptr->nx[i])) { + SYMBOL_CODE c = object_char(it_ptr->q_ptr); + byte a = object_attr(it_ptr->q_ptr); + print_rel(creature_ptr, c, a, it_ptr->ny[i], it_ptr->nx[i]); + move_cursor_relative(it_ptr->ny[i], it_ptr->nx[i]); term_fresh(); - term_xtra(TERM_XTRA_DELAY, msec); - lite_spot(creature_ptr, ny[i], nx[i]); + term_xtra(TERM_XTRA_DELAY, it_ptr->msec); + lite_spot(creature_ptr, it_ptr->ny[i], it_ptr->nx[i]); term_fresh(); } else { - term_xtra(TERM_XTRA_DELAY, msec); + term_xtra(TERM_XTRA_DELAY, it_ptr->msec); } } - if ((back_chance > 37) && !creature_ptr->blind && (item >= 0)) { + if ((back_chance > 37) && !creature_ptr->blind && (it_ptr->item >= 0)) { msg_format(_("%sが手元に返ってきた。", "%s comes back to you."), o2_name); - come_back = TRUE; + it_ptr->come_back = TRUE; } else { - if (item >= 0) { + if (it_ptr->item >= 0) { msg_format(_("%sを受け損ねた！", "%s comes back, but you can't catch!"), o2_name); } else { msg_format(_("%sが返ってきた。", "%s comes back."), o2_name); } - y = creature_ptr->y; - x = creature_ptr->x; + it_ptr->y = creature_ptr->y; + it_ptr->x = creature_ptr->x; } } else { msg_format(_("%sが返ってこなかった！", "%s doesn't come back!"), o2_name); } } - if (come_back) { - if (item == INVEN_RARM || item == INVEN_LARM) { - o_ptr = &creature_ptr->inventory_list[item]; - object_copy(o_ptr, q_ptr); - creature_ptr->total_weight += q_ptr->weight; + if (it_ptr->come_back) { + if (it_ptr->item == INVEN_RARM || it_ptr->item == INVEN_LARM) { + it_ptr->o_ptr = &creature_ptr->inventory_list[it_ptr->item]; + object_copy(it_ptr->o_ptr, it_ptr->q_ptr); + creature_ptr->total_weight += it_ptr->q_ptr->weight; creature_ptr->equip_cnt++; creature_ptr->update |= PU_BONUS | PU_TORCH | PU_MANA; creature_ptr->window |= PW_EQUIP; } else { - store_item_to_inventory(creature_ptr, q_ptr); + store_item_to_inventory(creature_ptr, it_ptr->q_ptr); } - do_drop = FALSE; - } else if (equiped_item) { - verify_equip_slot(creature_ptr, item); + it_ptr->do_drop = FALSE; + } else if (it_ptr->equiped_item) { + verify_equip_slot(creature_ptr, it_ptr->item); calc_android_exp(creature_ptr); } - if (do_drop) { - if (cave_have_flag_bold(creature_ptr->current_floor_ptr, y, x, FF_PROJECT)) { - (void)drop_near(creature_ptr, q_ptr, corruption_possibility, y, x); + if (it_ptr->do_drop) { + if (cave_have_flag_bold(creature_ptr->current_floor_ptr, it_ptr->y, it_ptr->x, FF_PROJECT)) { + (void)drop_near(creature_ptr, it_ptr->q_ptr, it_ptr->corruption_possibility, it_ptr->y, it_ptr->x); } else { - (void)drop_near(creature_ptr, q_ptr, corruption_possibility, prev_y, prev_x); + (void)drop_near(creature_ptr, it_ptr->q_ptr, it_ptr->corruption_possibility, it_ptr->prev_y, it_ptr->prev_x); } } -- 2.11.0