* cmd6.cより分離。\r
*/\r
\r
-\r
#include "angband.h"\r
#include "selfinfo.h"\r
+#include "object-hook.h"\r
\r
/*!\r
* @brief 薬を飲むコマンドのサブルーチン /\r
* @param item 飲む薬オブジェクトの所持品ID\r
* @return なし\r
*/\r
-void do_cmd_quaff_potion_aux(int item)\r
+void do_cmd_quaff_potion_aux(INVENTORY_IDX item)\r
{\r
- int ident, lev;\r
+ bool ident;\r
+ DEPTH lev;\r
object_type *o_ptr;\r
object_type forge;\r
object_type *q_ptr;\r
\r
\r
- /* Take a turn */\r
- p_ptr->energy_use = 100;\r
-\r
if (world_player)\r
{\r
if (flush_failure) flush();\r
floor_item_optimize(0 - item);\r
}\r
\r
- /* Sound */\r
sound(SOUND_QUAFF);\r
\r
\r
break;\r
\r
case SV_POTION_HEROISM:\r
- if (set_afraid(0)) ident = TRUE;\r
- if (set_hero(p_ptr->hero + randint1(25) + 25, FALSE)) ident = TRUE;\r
- if (hp_player(10)) ident = TRUE;\r
+ ident = heroism(25);\r
break;\r
\r
case SV_POTION_BESERK_STRENGTH:\r
- if (set_afraid(0)) ident = TRUE;\r
- if (set_shero(p_ptr->shero + randint1(25) + 25, FALSE)) ident = TRUE;\r
- if (hp_player(30)) ident = TRUE;\r
+ ident = berserk(randint1(25) + 25);\r
break;\r
\r
case SV_POTION_CURE_LIGHT:\r
- if (hp_player(damroll(2, 8))) ident = TRUE;\r
- if (set_blind(0)) ident = TRUE;\r
- if (set_cut(p_ptr->cut - 10)) ident = TRUE;\r
- if (set_shero(0,TRUE)) ident = TRUE;\r
+ ident = cure_light_wounds(2, 8);\r
break;\r
\r
case SV_POTION_CURE_SERIOUS:\r
- if (hp_player(damroll(4, 8))) ident = TRUE;\r
- if (set_blind(0)) ident = TRUE;\r
- if (set_confused(0)) ident = TRUE;\r
- if (set_cut((p_ptr->cut / 2) - 50)) ident = TRUE;\r
- if (set_shero(0,TRUE)) ident = TRUE;\r
+ ident = cure_serious_wounds(4, 8);\r
break;\r
\r
case SV_POTION_CURE_CRITICAL:\r
- if (hp_player(damroll(6, 8))) ident = TRUE;\r
- if (set_blind(0)) ident = TRUE;\r
- if (set_confused(0)) ident = TRUE;\r
- if (set_poisoned(0)) ident = TRUE;\r
- if (set_stun(0)) ident = TRUE;\r
- if (set_cut(0)) ident = TRUE;\r
- if (set_shero(0,TRUE)) ident = TRUE;\r
+ ident = cure_critical_wounds(damroll(6, 8));\r
break;\r
\r
case SV_POTION_HEALING:\r
- if (hp_player(300)) ident = TRUE;\r
- if (set_blind(0)) ident = TRUE;\r
- if (set_confused(0)) ident = TRUE;\r
- if (set_poisoned(0)) ident = TRUE;\r
- if (set_stun(0)) ident = TRUE;\r
- if (set_cut(0)) ident = TRUE;\r
- if (set_shero(0,TRUE)) ident = TRUE;\r
+ ident = cure_critical_wounds(300);\r
break;\r
\r
case SV_POTION_STAR_HEALING:\r
- if (hp_player(1200)) ident = TRUE;\r
- if (set_blind(0)) ident = TRUE;\r
- if (set_confused(0)) ident = TRUE;\r
- if (set_poisoned(0)) ident = TRUE;\r
- if (set_stun(0)) ident = TRUE;\r
- if (set_cut(0)) ident = TRUE;\r
- if (set_shero(0,TRUE)) ident = TRUE;\r
+ ident = cure_critical_wounds(1200);\r
break;\r
\r
case SV_POTION_LIFE:\r
- chg_virtue(V_VITALITY, 1);\r
- chg_virtue(V_UNLIFE, -5);\r
- msg_print(_("体中に生命力が満ちあふれてきた！", "You feel life flow through your body!"));\r
- restore_level();\r
- (void)set_poisoned(0);\r
- (void)set_blind(0);\r
- (void)set_confused(0);\r
- (void)set_image(0);\r
- (void)set_stun(0);\r
- (void)set_cut(0);\r
- (void)do_res_stat(A_STR);\r
- (void)do_res_stat(A_CON);\r
- (void)do_res_stat(A_DEX);\r
- (void)do_res_stat(A_WIS);\r
- (void)do_res_stat(A_INT);\r
- (void)do_res_stat(A_CHR);\r
- (void)set_shero(0,TRUE);\r
- update_stuff();\r
- hp_player(5000);\r
- ident = TRUE;\r
+ ident = life_stream(TRUE, TRUE);\r
break;\r
\r
case SV_POTION_RESTORE_MANA:\r
- if (p_ptr->pclass == CLASS_MAGIC_EATER)\r
- {\r
- int i;\r
- for (i = 0; i < EATER_EXT*2; i++)\r
- {\r
- p_ptr->magic_num1[i] += (p_ptr->magic_num2[i] < 10) ? EATER_CHARGE * 3 : p_ptr->magic_num2[i]*EATER_CHARGE/3;\r
- if (p_ptr->magic_num1[i] > p_ptr->magic_num2[i]*EATER_CHARGE) p_ptr->magic_num1[i] = p_ptr->magic_num2[i]*EATER_CHARGE;\r
- }\r
- for (; i < EATER_EXT*3; i++)\r
- {\r
- KIND_OBJECT_IDX k_idx = lookup_kind(TV_ROD, i-EATER_EXT*2);\r
- p_ptr->magic_num1[i] -= ((p_ptr->magic_num2[i] < 10) ? EATER_ROD_CHARGE*3 : p_ptr->magic_num2[i]*EATER_ROD_CHARGE/3)*k_info[k_idx].pval;\r
- if (p_ptr->magic_num1[i] < 0) p_ptr->magic_num1[i] = 0;\r
- }\r
- msg_print(_("頭がハッキリとした。", "You feel your head clear."));\r
- p_ptr->window |= (PW_PLAYER);\r
- ident = TRUE;\r
- }\r
- else if (p_ptr->csp < p_ptr->msp)\r
- {\r
- p_ptr->csp = p_ptr->msp;\r
- p_ptr->csp_frac = 0;\r
- msg_print(_("頭がハッキリとした。", "You feel your head clear."));\r
-\r
- p_ptr->redraw |= (PR_MANA);\r
- p_ptr->window |= (PW_PLAYER);\r
- p_ptr->window |= (PW_SPELL);\r
- ident = TRUE;\r
- }\r
- if (set_shero(0,TRUE)) ident = TRUE;\r
+ ident = restore_mana(TRUE);\r
break;\r
\r
case SV_POTION_RESTORE_EXP:\r
break;\r
\r
case SV_POTION_CURING:\r
- if (hp_player(50)) ident = TRUE;\r
- if (set_blind(0)) ident = TRUE;\r
- if (set_poisoned(0)) ident = TRUE;\r
- if (set_confused(0)) ident = TRUE;\r
- if (set_stun(0)) ident = TRUE;\r
- if (set_cut(0)) ident = TRUE;\r
- if (set_image(0)) ident = TRUE;\r
+ if (true_healing(50)) ident = TRUE;\r
break;\r
\r
case SV_POTION_INVULNERABILITY:\r
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);\r
}\r
\r
- /* Window stuff */\r
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);\r
\r
/* Potions can feed the player */\r
}\r
\r
\r
-/*!\r
- * @brief オブジェクトをプレイヤーが飲むことができるかを判定する /\r
- * Hook to determine if an object can be quaffed\r
- * @param o_ptr 判定したいオブジェクトの構造体参照ポインタ\r
- * @return 飲むことが可能ならばTRUEを返す\r
- */\r
-static bool item_tester_hook_quaff(object_type *o_ptr)\r
-{\r
- if (o_ptr->tval == TV_POTION) return TRUE;\r
-\r
- if (prace_is_(RACE_ANDROID))\r
- {\r
- if (o_ptr->tval == TV_FLASK && o_ptr->sval == SV_FLASK_OIL)\r
- return TRUE;\r
- }\r
- return FALSE;\r
-}\r
-\r
\r
/*!\r
* @brief 薬を飲むコマンドのメインルーチン /\r
/* Restrict choices to potions */\r
item_tester_hook = item_tester_hook_quaff;\r
\r
- /* Get an item */\r
q = _("どの薬を飲みますか? ", "Quaff which potion? ");\r
s = _("飲める薬がない。", "You have no potions to quaff.");\r
\r
OSDN Git Service
