OSDN Git Service

[Refactor] #37353 プレイヤーの食事処理を cmd-eat.c/h に分離。 / Separate player's eat command to...
authorDeskull <deskull@users.sourceforge.jp>
Fri, 7 Sep 2018 11:54:16 +0000 (20:54 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Fri, 7 Sep 2018 11:56:47 +0000 (20:56 +0900)
Hengband_vcs2015/Hengband/Hengband.vcxproj
Hengband_vcs2015/Hengband/Hengband.vcxproj.filters
doxygen/Hengband.doxyfile
src/cmd-eat.c [new file with mode: 0644]
src/cmd-eat.h [new file with mode: 0644]
src/cmd6.c
src/externs.h

index a5e0eae..0bae6d8 100644 (file)
     <ClCompile Include="..\..\src\bldg.c" />\r
     <ClCompile Include="..\..\src\cave.c" />\r
     <ClCompile Include="..\..\src\chuukei.c" />\r
+    <ClCompile Include="..\..\src\cmd-eat.c" />\r
     <ClCompile Include="..\..\src\cmd1.c" />\r
     <ClCompile Include="..\..\src\cmd2.c" />\r
     <ClCompile Include="..\..\src\cmd3.c" />\r
     <ClCompile Include="..\..\src\rooms.c" />\r
     <ClCompile Include="..\..\src\save.c" />\r
     <ClCompile Include="..\..\src\scores.c" />\r
+    <ClCompile Include="..\..\src\selfinfo.c" />\r
     <ClCompile Include="..\..\src\snipe.c" />\r
     <ClCompile Include="..\..\src\spells1.c" />\r
     <ClCompile Include="..\..\src\spells2.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h" />\r
+    <ClInclude Include="..\..\src\cmd-eat.h" />\r
     <ClInclude Include="..\..\src\defines.h" />\r
     <ClInclude Include="..\..\src\externs.h" />\r
     <ClInclude Include="..\..\src\generate.h" />\r
     <ClInclude Include="..\..\src\mindtips.h" />\r
     <ClInclude Include="..\..\src\readdib.h" />\r
     <ClInclude Include="..\..\src\rooms.h" />\r
+    <ClInclude Include="..\..\src\selfinfo.h" />\r
     <ClInclude Include="..\..\src\streams.h" />\r
     <ClInclude Include="..\..\src\types.h" />\r
     <ClInclude Include="..\..\src\z-config.h" />\r
index 124fc3b..eba75ee 100644 (file)
     <ClCompile Include="..\..\src\snipe.c">\r
       <Filter>Source</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\selfinfo.c">\r
+      <Filter>Source</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\cmd-eat.c">\r
+      <Filter>Source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\angband.h">\r
     <ClInclude Include="..\..\src\z-virt.h">\r
       <Filter>Header</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\selfinfo.h">\r
+      <Filter>Header</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\cmd-eat.h">\r
+      <Filter>Header</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ResourceCompile Include="..\..\src\angband.rc" />\r
index e918902..a1943c5 100644 (file)
@@ -2077,7 +2077,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
diff --git a/src/cmd-eat.c b/src/cmd-eat.c
new file mode 100644 (file)
index 0000000..565b161
--- /dev/null
@@ -0,0 +1,576 @@
+/*!\r
+ * @file cmd-eat.c\r
+ * @brief \83v\83\8c\83C\83\84\81[\82Ì\90H\8e\96\82É\8aÖ\82·\82é\83R\83}\83\93\83h\8eÀ\91\95\r
+ * @date 2014/01/27\r
+ * @details\r
+ * cmd6.c\82æ\82è\95ª\97£\81B\r
+ */\r
+\r
+\r
+#include "angband.h"\r
+\r
+/*!\r
+ * @brief \90H\97¿\82ð\90H\82×\82é\83R\83}\83\93\83h\82Ì\83T\83u\83\8b\81[\83`\83\93\r
+ * @param item \90H\82×\82é\83I\83u\83W\83F\83N\83g\82Ì\8f\8a\8e\9d\95iID\r
+ * @return \82È\82µ\r
+ */\r
+void do_cmd_eat_food_aux(int item)\r
+{\r
+       int ident, lev;\r
+       object_type *o_ptr;\r
+\r
+       if (music_singing_any()) stop_singing();\r
+       if (hex_spelling_any()) stop_hex_spell_all();\r
+\r
+       /* Get the item (in the pack) */\r
+       if (item >= 0)\r
+       {\r
+               o_ptr = &inventory[item];\r
+       }\r
+\r
+       /* Get the item (on the floor) */\r
+       else\r
+       {\r
+               o_ptr = &o_list[0 - item];\r
+       }\r
+\r
+       /* Sound */\r
+       sound(SOUND_EAT);\r
+\r
+       /* Take a turn */\r
+       p_ptr->energy_use = 100;\r
+\r
+       /* Identity not known yet */\r
+       ident = FALSE;\r
+\r
+       /* Object level */\r
+       lev = k_info[o_ptr->k_idx].level;\r
+\r
+       if (o_ptr->tval == TV_FOOD)\r
+       {\r
+               /* Analyze the food */\r
+               switch (o_ptr->sval)\r
+               {\r
+               case SV_FOOD_POISON:\r
+               {\r
+                       if (!(p_ptr->resist_pois || IS_OPPOSE_POIS()))\r
+                       {\r
+                               if (set_poisoned(p_ptr->poisoned + randint0(10) + 10))\r
+                               {\r
+                                       ident = TRUE;\r
+                               }\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_BLINDNESS:\r
+               {\r
+                       if (!p_ptr->resist_blind)\r
+                       {\r
+                               if (set_blind(p_ptr->blind + randint0(200) + 200))\r
+                               {\r
+                                       ident = TRUE;\r
+                               }\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_PARANOIA:\r
+               {\r
+                       if (!p_ptr->resist_fear)\r
+                       {\r
+                               if (set_afraid(p_ptr->afraid + randint0(10) + 10))\r
+                               {\r
+                                       ident = TRUE;\r
+                               }\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_CONFUSION:\r
+               {\r
+                       if (!p_ptr->resist_conf)\r
+                       {\r
+                               if (set_confused(p_ptr->confused + randint0(10) + 10))\r
+                               {\r
+                                       ident = TRUE;\r
+                               }\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_HALLUCINATION:\r
+               {\r
+                       if (!p_ptr->resist_chaos)\r
+                       {\r
+                               if (set_image(p_ptr->image + randint0(250) + 250))\r
+                               {\r
+                                       ident = TRUE;\r
+                               }\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_PARALYSIS:\r
+               {\r
+                       if (!p_ptr->free_act)\r
+                       {\r
+                               if (set_paralyzed(p_ptr->paralyzed + randint0(10) + 10))\r
+                               {\r
+                                       ident = TRUE;\r
+                               }\r
+                       }\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_WEAKNESS:\r
+               {\r
+                       take_hit(DAMAGE_NOESCAPE, damroll(6, 6), _("\93Å\93ü\82è\90H\97¿", "poisonous food"), -1);\r
+                       (void)do_dec_stat(A_STR);\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_SICKNESS:\r
+               {\r
+                       take_hit(DAMAGE_NOESCAPE, damroll(6, 6), _("\93Å\93ü\82è\90H\97¿", "poisonous food"), -1);\r
+                       (void)do_dec_stat(A_CON);\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_STUPIDITY:\r
+               {\r
+                       take_hit(DAMAGE_NOESCAPE, damroll(8, 8), _("\93Å\93ü\82è\90H\97¿", "poisonous food"), -1);\r
+                       (void)do_dec_stat(A_INT);\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_NAIVETY:\r
+               {\r
+                       take_hit(DAMAGE_NOESCAPE, damroll(8, 8), _("\93Å\93ü\82è\90H\97¿", "poisonous food"), -1);\r
+                       (void)do_dec_stat(A_WIS);\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_UNHEALTH:\r
+               {\r
+                       take_hit(DAMAGE_NOESCAPE, damroll(10, 10), _("\93Å\93ü\82è\90H\97¿", "poisonous food"), -1);\r
+                       (void)do_dec_stat(A_CON);\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_DISEASE:\r
+               {\r
+                       take_hit(DAMAGE_NOESCAPE, damroll(10, 10), _("\93Å\93ü\82è\90H\97¿", "poisonous food"), -1);\r
+                       (void)do_dec_stat(A_STR);\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_CURE_POISON:\r
+               {\r
+                       if (set_poisoned(0)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_CURE_BLINDNESS:\r
+               {\r
+                       if (set_blind(0)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_CURE_PARANOIA:\r
+               {\r
+                       if (set_afraid(0)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_CURE_CONFUSION:\r
+               {\r
+                       if (set_confused(0)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_CURE_SERIOUS:\r
+               {\r
+                       if (hp_player(damroll(4, 8))) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_RESTORE_STR:\r
+               {\r
+                       if (do_res_stat(A_STR)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_RESTORE_CON:\r
+               {\r
+                       if (do_res_stat(A_CON)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_RESTORING:\r
+               {\r
+                       if (do_res_stat(A_STR)) ident = TRUE;\r
+                       if (do_res_stat(A_INT)) ident = TRUE;\r
+                       if (do_res_stat(A_WIS)) ident = TRUE;\r
+                       if (do_res_stat(A_DEX)) ident = TRUE;\r
+                       if (do_res_stat(A_CON)) ident = TRUE;\r
+                       if (do_res_stat(A_CHR)) ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+\r
+#ifdef JP\r
+               /* \82»\82ê\82¼\82ê\82Ì\90H\82×\95¨\82Ì\8a´\91z\82ð\83I\83\8a\83W\83i\83\8b\82æ\82è\8d×\82©\82­\95\\8c» */\r
+               case SV_FOOD_BISCUIT:\r
+               {\r
+                       msg_print("\8aÃ\82­\82Ä\83T\83N\83T\83N\82µ\82Ä\82Æ\82Ä\82à\82¨\82¢\82µ\82¢\81B");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_JERKY:\r
+               {\r
+                       msg_print("\8e\95\82²\82½\82¦\82ª\82 \82Á\82Ä\82¨\82¢\82µ\82¢\81B");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_SLIME_MOLD:\r
+               {\r
+                       msg_print("\82±\82ê\82Í\82È\82ñ\82Æ\82à\8c`\97e\82µ\82ª\82½\82¢\96¡\82¾\81B");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_RATION:\r
+               {\r
+                       msg_print("\82±\82ê\82Í\82¨\82¢\82µ\82¢\81B");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+#else\r
+               case SV_FOOD_RATION:\r
+               case SV_FOOD_BISCUIT:\r
+               case SV_FOOD_JERKY:\r
+               case SV_FOOD_SLIME_MOLD:\r
+               {\r
+                       msg_print("That tastes good.");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+#endif\r
+\r
+\r
+               case SV_FOOD_WAYBREAD:\r
+               {\r
+                       msg_print(_("\82±\82ê\82Í\82Ð\82\82å\82¤\82É\94ü\96¡\82¾\81B", "That tastes good."));\r
+                       (void)set_poisoned(0);\r
+                       (void)hp_player(damroll(4, 8));\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+#ifdef JP\r
+               case SV_FOOD_PINT_OF_ALE:\r
+               {\r
+                       msg_print("\82Ì\82Ç\82²\82µ\91u\82â\82©\82¾\81B");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+\r
+               case SV_FOOD_PINT_OF_WINE:\r
+               {\r
+                       msg_print("That tastes good.");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+#else\r
+               case SV_FOOD_PINT_OF_ALE:\r
+               case SV_FOOD_PINT_OF_WINE:\r
+               {\r
+                       msg_print("That tastes good.");\r
+                       ident = TRUE;\r
+                       break;\r
+               }\r
+#endif\r
+\r
+               }\r
+       }\r
+\r
+       /* Combine / Reorder the pack (later) */\r
+       p_ptr->notice |= (PN_COMBINE | PN_REORDER);\r
+\r
+       if (!(object_is_aware(o_ptr)))\r
+       {\r
+               chg_virtue(V_KNOWLEDGE, -1);\r
+               chg_virtue(V_PATIENCE, -1);\r
+               chg_virtue(V_CHANCE, 1);\r
+       }\r
+\r
+       /* We have tried it */\r
+       if (o_ptr->tval == TV_FOOD) object_tried(o_ptr);\r
+\r
+       /* The player is now aware of the object */\r
+       if (ident && !object_is_aware(o_ptr))\r
+       {\r
+               object_aware(o_ptr);\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
+\r
+       /* Food can feed the player */\r
+       if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))\r
+       {\r
+               /* Reduced nutritional benefit */\r
+               (void)set_food(p_ptr->food + (o_ptr->pval / 10));\r
+               msg_print(_("\82 \82È\82½\82Ì\82æ\82¤\82È\8eÒ\82É\82Æ\82Á\82Ä\90H\97Æ\82È\82Ç\8bÍ\82©\82È\89h\97{\82É\82µ\82©\82È\82ç\82È\82¢\81B",\r
+                       "Mere victuals hold scant sustenance for a being such as yourself."));\r
+\r
+               if (p_ptr->food < PY_FOOD_ALERT)   /* Hungry */\r
+                       msg_print(_("\82 \82È\82½\82Ì\8bQ\82¦\82Í\90V\91N\82È\8c\8c\82É\82æ\82Á\82Ä\82Ì\82Ý\96\9e\82½\82³\82ê\82é\81I",\r
+                               "Your hunger can only be satisfied with fresh blood!"));\r
+       }\r
+       else if ((prace_is_(RACE_SKELETON) ||\r
+               prace_is_(RACE_GOLEM) ||\r
+               prace_is_(RACE_ZOMBIE) ||\r
+               prace_is_(RACE_SPECTRE)) &&\r
+               (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND))\r
+       {\r
+               cptr staff;\r
+\r
+               if (o_ptr->tval == TV_STAFF &&\r
+                       (item < 0) && (o_ptr->number > 1))\r
+               {\r
+                       msg_print(_("\82Ü\82¸\82Í\8fñ\82ð\8fE\82í\82È\82¯\82ê\82Î\81B", "You must first pick up the staffs."));\r
+                       return;\r
+               }\r
+               staff = (o_ptr->tval == TV_STAFF) ? _("\8fñ", "staff") : _("\96\82\96@\96_", "wand");\r
+\r
+               /* "Eat" charges */\r
+               if (o_ptr->pval == 0)\r
+               {\r
+                       msg_format(_("\82±\82Ì%s\82É\82Í\82à\82¤\96\82\97Í\82ª\8ec\82Á\82Ä\82¢\82È\82¢\81B", "The %s has no charges left."), staff);\r
+                       o_ptr->ident |= (IDENT_EMPTY);\r
+\r
+                       /* Combine / Reorder the pack (later) */\r
+                       p_ptr->notice |= (PN_COMBINE | PN_REORDER);\r
+                       p_ptr->window |= (PW_INVEN);\r
+\r
+                       return;\r
+               }\r
+               msg_format(_("\82 \82È\82½\82Í%s\82Ì\96\82\97Í\82ð\83G\83l\83\8b\83M\81[\8c¹\82Æ\82µ\82Ä\8bz\8eû\82µ\82½\81B", "You absorb mana of the %s as your energy."), staff);\r
+\r
+               /* Use a single charge */\r
+               o_ptr->pval--;\r
+\r
+               /* Eat a charge */\r
+               set_food(p_ptr->food + 5000);\r
+\r
+               /* XXX Hack -- unstack if necessary */\r
+               if (o_ptr->tval == TV_STAFF &&\r
+                       (item >= 0) && (o_ptr->number > 1))\r
+               {\r
+                       object_type forge;\r
+                       object_type *q_ptr;\r
+\r
+                       /* Get local object */\r
+                       q_ptr = &forge;\r
+\r
+                       /* Obtain a local object */\r
+                       object_copy(q_ptr, o_ptr);\r
+\r
+                       /* Modify quantity */\r
+                       q_ptr->number = 1;\r
+\r
+                       /* Restore the charges */\r
+                       o_ptr->pval++;\r
+\r
+                       /* Unstack the used item */\r
+                       o_ptr->number--;\r
+                       p_ptr->total_weight -= q_ptr->weight;\r
+                       item = inven_carry(q_ptr);\r
+\r
+                       /* Message */\r
+                       msg_format(_("\8fñ\82ð\82Ü\82Æ\82ß\82È\82¨\82µ\82½\81B", "You unstack your staff."));\r
+               }\r
+\r
+               /* Describe charges in the pack */\r
+               if (item >= 0)\r
+               {\r
+                       inven_item_charges(item);\r
+               }\r
+\r
+               /* Describe charges on the floor */\r
+               else\r
+               {\r
+                       floor_item_charges(0 - item);\r
+               }\r
+\r
+               /* Window stuff */\r
+               p_ptr->window |= (PW_INVEN | PW_EQUIP);\r
+\r
+               /* Don't eat a staff/wand itself */\r
+               return;\r
+       }\r
+       else if ((prace_is_(RACE_DEMON) ||\r
+               (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)) &&\r
+               (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_CORPSE &&\r
+                       my_strchr("pht", r_info[o_ptr->pval].d_char)))\r
+       {\r
+               /* Drain vitality of humanoids */\r
+               char o_name[MAX_NLEN];\r
+               object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));\r
+               msg_format(_("%s\82Í\94R\82¦\8fã\82è\8aD\82É\82È\82Á\82½\81B\90¸\97Í\82ð\8bz\8eû\82µ\82½\8bC\82ª\82·\82é\81B", "%^s is burnt to ashes.  You absorb its vitality!"), o_name);\r
+               (void)set_food(PY_FOOD_MAX - 1);\r
+       }\r
+       else if (prace_is_(RACE_SKELETON))\r
+       {\r
+#if 0\r
+               if (o_ptr->tval == TV_SKELETON ||\r
+                       (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))\r
+               {\r
+                       msg_print(_("\82 \82È\82½\82Í\8d\9c\82Å\8e©\95ª\82Ì\91Ì\82ð\95â\82Á\82½\81B", "Your body absorbs the bone."));\r
+                       set_food(p_ptr->food + 5000);\r
+               }\r
+               else\r
+#endif\r
+\r
+                       if (!((o_ptr->sval == SV_FOOD_WAYBREAD) ||\r
+                               (o_ptr->sval < SV_FOOD_BISCUIT)))\r
+                       {\r
+                               object_type forge;\r
+                               object_type *q_ptr = &forge;\r
+\r
+                               msg_print(_("\90H\82×\95¨\82ª\83A\83S\82ð\91f\92Ê\82è\82µ\82Ä\97\8e\82¿\82½\81I", "The food falls through your jaws!"));\r
+\r
+                               /* Create the item */\r
+                               object_prep(q_ptr, lookup_kind(o_ptr->tval, o_ptr->sval));\r
+\r
+                               /* Drop the object from heaven */\r
+                               (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);\r
+                       }\r
+                       else\r
+                       {\r
+                               msg_print(_("\90H\82×\95¨\82ª\83A\83S\82ð\91f\92Ê\82è\82µ\82Ä\97\8e\82¿\81A\8fÁ\82¦\82½\81I", "The food falls through your jaws and vanishes!"));\r
+                       }\r
+       }\r
+       else if (prace_is_(RACE_GOLEM) ||\r
+               prace_is_(RACE_ZOMBIE) ||\r
+               prace_is_(RACE_ENT) ||\r
+               prace_is_(RACE_DEMON) ||\r
+               prace_is_(RACE_ANDROID) ||\r
+               prace_is_(RACE_SPECTRE) ||\r
+               (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))\r
+       {\r
+               msg_print(_("\90\8eÒ\82Ì\90H\95¨\82Í\82 \82È\82½\82É\82Æ\82Á\82Ä\82Ù\82Æ\82ñ\82Ç\89h\97{\82É\82È\82ç\82È\82¢\81B", "The food of mortals is poor sustenance for you."));\r
+               set_food(p_ptr->food + ((o_ptr->pval) / 20));\r
+       }\r
+       else if (o_ptr->tval == TV_FOOD && o_ptr->sval == SV_FOOD_WAYBREAD)\r
+       {\r
+               /* Waybread is always fully satisfying. */\r
+               set_food(MAX(p_ptr->food, PY_FOOD_MAX - 1));\r
+       }\r
+       else\r
+       {\r
+               /* Food can feed the player */\r
+               (void)set_food(p_ptr->food + o_ptr->pval);\r
+       }\r
+\r
+       /* Destroy a food in the pack */\r
+       if (item >= 0)\r
+       {\r
+               inven_item_increase(item, -1);\r
+               inven_item_describe(item);\r
+               inven_item_optimize(item);\r
+       }\r
+\r
+       /* Destroy a food on the floor */\r
+       else\r
+       {\r
+               floor_item_increase(0 - item, -1);\r
+               floor_item_describe(0 - item);\r
+               floor_item_optimize(0 - item);\r
+       }\r
+}\r
+\r
+\r
+/*!\r
+ * @brief \83I\83u\83W\83F\83N\83g\82ð\83v\83\8c\83C\83\84\81[\82ª\90H\82×\82é\82±\82Æ\82ª\82Å\82«\82é\82©\82ð\94»\92è\82·\82é /\r
+ * Hook to determine if an object is eatable\r
+ * @param o_ptr \94»\92è\82µ\82½\82¢\83I\83u\83W\83F\83N\83g\82Ì\8d\\91¢\91Ì\8eQ\8fÆ\83|\83C\83\93\83^\r
+ * @return \90H\82×\82é\82±\82Æ\82ª\89Â\94\\82È\82ç\82ÎTRUE\82ð\95Ô\82·\r
+ */\r
+static bool item_tester_hook_eatable(object_type *o_ptr)\r
+{\r
+       if (o_ptr->tval == TV_FOOD) return TRUE;\r
+\r
+#if 0\r
+       if (prace_is_(RACE_SKELETON))\r
+       {\r
+               if (o_ptr->tval == TV_SKELETON ||\r
+                       (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))\r
+                       return TRUE;\r
+       }\r
+       else\r
+#endif\r
+\r
+               if (prace_is_(RACE_SKELETON) ||\r
+                       prace_is_(RACE_GOLEM) ||\r
+                       prace_is_(RACE_ZOMBIE) ||\r
+                       prace_is_(RACE_SPECTRE))\r
+               {\r
+                       if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)\r
+                               return TRUE;\r
+               }\r
+               else if (prace_is_(RACE_DEMON) ||\r
+                       (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))\r
+               {\r
+                       if (o_ptr->tval == TV_CORPSE &&\r
+                               o_ptr->sval == SV_CORPSE &&\r
+                               my_strchr("pht", r_info[o_ptr->pval].d_char))\r
+                               return TRUE;\r
+               }\r
+\r
+       /* Assume not */\r
+       return (FALSE);\r
+}\r
+\r
+\r
+/*!\r
+ * @brief \90H\97¿\82ð\90H\82×\82é\83R\83}\83\93\83h\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93 /\r
+ * Eat some food (from the pack or floor)\r
+ * @return \82È\82µ\r
+ */\r
+void do_cmd_eat_food(void)\r
+{\r
+       OBJECT_IDX item;\r
+       cptr        q, s;\r
+\r
+\r
+       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
+       {\r
+               set_action(ACTION_NONE);\r
+       }\r
+\r
+       /* Restrict choices to food */\r
+       item_tester_hook = item_tester_hook_eatable;\r
+\r
+       /* Get an item */\r
+       q = _("\82Ç\82ê\82ð\90H\82×\82Ü\82·\82©? ", "Eat which item? ");\r
+       s = _("\90H\82×\95¨\82ª\82È\82¢\81B", "You have nothing to eat.");\r
+\r
+       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
+\r
+       /* Eat the object */\r
+       do_cmd_eat_food_aux(item);\r
+}\r
+\r
diff --git a/src/cmd-eat.h b/src/cmd-eat.h
new file mode 100644 (file)
index 0000000..6037960
--- /dev/null
@@ -0,0 +1,3 @@
+\r
+extern void do_cmd_eat_food(void);\r
+extern void do_cmd_eat_food_aux(int item);\r
index 42e656c..c0441d8 100644 (file)
 
 #include "angband.h"
 #include "selfinfo.h"
+#include "cmd-eat.h"
 
 
-/*!
- * @brief 食料を食べるコマンドのサブルーチン
- * @param item 食べるオブジェクトの所持品ID
- * @return なし
- */
-static void do_cmd_eat_food_aux(int item)
-{
-       int ident, lev;
-       object_type *o_ptr;
-
-       if (music_singing_any()) stop_singing();
-       if (hex_spelling_any()) stop_hex_spell_all();
-
-       /* Get the item (in the pack) */
-       if (item >= 0)
-       {
-               o_ptr = &inventory[item];
-       }
-
-       /* Get the item (on the floor) */
-       else
-       {
-               o_ptr = &o_list[0 - item];
-       }
-
-       /* Sound */
-       sound(SOUND_EAT);
-
-       /* Take a turn */
-       p_ptr->energy_use = 100;
-
-       /* Identity not known yet */
-       ident = FALSE;
-
-       /* Object level */
-       lev = k_info[o_ptr->k_idx].level;
-
-       if (o_ptr->tval == TV_FOOD)
-       {
-               /* Analyze the food */
-               switch (o_ptr->sval)
-               {
-                       case SV_FOOD_POISON:
-                       {
-                               if (!(p_ptr->resist_pois || IS_OPPOSE_POIS()))
-                               {
-                                       if (set_poisoned(p_ptr->poisoned + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_BLINDNESS:
-                       {
-                               if (!p_ptr->resist_blind)
-                               {
-                                       if (set_blind(p_ptr->blind + randint0(200) + 200))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_PARANOIA:
-                       {
-                               if (!p_ptr->resist_fear)
-                               {
-                                       if (set_afraid(p_ptr->afraid + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_CONFUSION:
-                       {
-                               if (!p_ptr->resist_conf)
-                               {
-                                       if (set_confused(p_ptr->confused + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_HALLUCINATION:
-                       {
-                               if (!p_ptr->resist_chaos)
-                               {
-                                       if (set_image(p_ptr->image + randint0(250) + 250))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_PARALYSIS:
-                       {
-                               if (!p_ptr->free_act)
-                               {
-                                       if (set_paralyzed(p_ptr->paralyzed + randint0(10) + 10))
-                                       {
-                                               ident = TRUE;
-                                       }
-                               }
-                               break;
-                       }
-
-                       case SV_FOOD_WEAKNESS:
-                       {
-                               take_hit(DAMAGE_NOESCAPE, damroll(6, 6), _("毒入り食料", "poisonous food"), -1);
-                               (void)do_dec_stat(A_STR);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_SICKNESS:
-                       {
-                               take_hit(DAMAGE_NOESCAPE, damroll(6, 6), _("毒入り食料", "poisonous food"), -1);
-                               (void)do_dec_stat(A_CON);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_STUPIDITY:
-                       {
-                               take_hit(DAMAGE_NOESCAPE, damroll(8, 8), _("毒入り食料", "poisonous food"), -1);
-                               (void)do_dec_stat(A_INT);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_NAIVETY:
-                       {
-                               take_hit(DAMAGE_NOESCAPE, damroll(8, 8), _("毒入り食料", "poisonous food"), -1);
-                               (void)do_dec_stat(A_WIS);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_UNHEALTH:
-                       {
-                               take_hit(DAMAGE_NOESCAPE, damroll(10, 10), _("毒入り食料", "poisonous food"), -1);
-                               (void)do_dec_stat(A_CON);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_DISEASE:
-                       {
-                               take_hit(DAMAGE_NOESCAPE, damroll(10, 10), _("毒入り食料", "poisonous food"), -1);
-                               (void)do_dec_stat(A_STR);
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_POISON:
-                       {
-                               if (set_poisoned(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_BLINDNESS:
-                       {
-                               if (set_blind(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_PARANOIA:
-                       {
-                               if (set_afraid(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_CONFUSION:
-                       {
-                               if (set_confused(0)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_CURE_SERIOUS:
-                       {
-                               if (hp_player(damroll(4, 8))) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RESTORE_STR:
-                       {
-                               if (do_res_stat(A_STR)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RESTORE_CON:
-                       {
-                               if (do_res_stat(A_CON)) ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RESTORING:
-                       {
-                               if (do_res_stat(A_STR)) ident = TRUE;
-                               if (do_res_stat(A_INT)) ident = TRUE;
-                               if (do_res_stat(A_WIS)) ident = TRUE;
-                               if (do_res_stat(A_DEX)) ident = TRUE;
-                               if (do_res_stat(A_CON)) ident = TRUE;
-                               if (do_res_stat(A_CHR)) ident = TRUE;
-                               break;
-                       }
-
-
-#ifdef JP
-                       /* それぞれの食べ物の感想をオリジナルより細かく表現 */
-                       case SV_FOOD_BISCUIT:
-                       {
-                               msg_print("甘くてサクサクしてとてもおいしい。");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_JERKY:
-                       {
-                               msg_print("歯ごたえがあっておいしい。");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_SLIME_MOLD:
-                       {
-                               msg_print("これはなんとも形容しがたい味だ。");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_RATION:
-                       {
-                               msg_print("これはおいしい。");
-                               ident = TRUE;
-                               break;
-                       }
-#else
-                       case SV_FOOD_RATION:
-                       case SV_FOOD_BISCUIT:
-                       case SV_FOOD_JERKY:
-                       case SV_FOOD_SLIME_MOLD:
-                       {
-                               msg_print("That tastes good.");
-                               ident = TRUE;
-                               break;
-                       }
-#endif
-
-
-                       case SV_FOOD_WAYBREAD:
-                       {
-                               msg_print(_("これはひじょうに美味だ。", "That tastes good."));
-                               (void)set_poisoned(0);
-                               (void)hp_player(damroll(4, 8));
-                               ident = TRUE;
-                               break;
-                       }
-
-#ifdef JP
-                       case SV_FOOD_PINT_OF_ALE:
-                       {
-                               msg_print("のどごし爽やかだ。");
-                               ident = TRUE;
-                               break;
-                       }
-
-                       case SV_FOOD_PINT_OF_WINE:
-                       {
-                               msg_print("That tastes good.");
-                               ident = TRUE;
-                               break;
-                       }
-#else
-                       case SV_FOOD_PINT_OF_ALE:
-                       case SV_FOOD_PINT_OF_WINE:
-                       {
-                               msg_print("That tastes good.");
-                               ident = TRUE;
-                               break;
-                       }
-#endif
-
-               }
-       }
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-       if (!(object_is_aware(o_ptr)))
-       {
-               chg_virtue(V_KNOWLEDGE, -1);
-               chg_virtue(V_PATIENCE, -1);
-               chg_virtue(V_CHANCE, 1);
-       }
-
-       /* We have tried it */
-       if (o_ptr->tval == TV_FOOD) object_tried(o_ptr);
-
-       /* The player is now aware of the object */
-       if (ident && !object_is_aware(o_ptr))
-       {
-               object_aware(o_ptr);
-               gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);
-       }
-
-       /* Window stuff */
-       p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-
-       /* Food can feed the player */
-       if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
-       {
-               /* Reduced nutritional benefit */
-               (void)set_food(p_ptr->food + (o_ptr->pval / 10));
-               msg_print(_("あなたのような者にとって食糧など僅かな栄養にしかならない。", 
-                                       "Mere victuals hold scant sustenance for a being such as yourself."));
-
-               if (p_ptr->food < PY_FOOD_ALERT)   /* Hungry */
-               msg_print(_("あなたの飢えは新鮮な血によってのみ満たされる!", 
-                                       "Your hunger can only be satisfied with fresh blood!"));
-       }
-       else if ((prace_is_(RACE_SKELETON) ||
-                 prace_is_(RACE_GOLEM) ||
-                 prace_is_(RACE_ZOMBIE) ||
-                 prace_is_(RACE_SPECTRE)) &&
-                (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND))
-       {
-               cptr staff;
-
-               if (o_ptr->tval == TV_STAFF &&
-                   (item < 0) && (o_ptr->number > 1))
-               {
-                       msg_print(_("まずは杖を拾わなければ。", "You must first pick up the staffs."));
-                       return;
-               }
-               staff = (o_ptr->tval == TV_STAFF) ? _("杖", "staff") : _("魔法棒", "wand");
-
-               /* "Eat" charges */
-               if (o_ptr->pval == 0)
-               {
-                       msg_format(_("この%sにはもう魔力が残っていない。", "The %s has no charges left."), staff);
-                       o_ptr->ident |= (IDENT_EMPTY);
-
-                       /* Combine / Reorder the pack (later) */
-                       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-                       p_ptr->window |= (PW_INVEN);
-
-                       return;
-               }
-               msg_format(_("あなたは%sの魔力をエネルギー源として吸収した。", "You absorb mana of the %s as your energy."), staff);
-
-               /* Use a single charge */
-               o_ptr->pval--;
-
-               /* Eat a charge */
-               set_food(p_ptr->food + 5000);
-
-               /* XXX Hack -- unstack if necessary */
-               if (o_ptr->tval == TV_STAFF &&
-                   (item >= 0) && (o_ptr->number > 1))
-               {
-                       object_type forge;
-                       object_type *q_ptr;
-
-                       /* Get local object */
-                       q_ptr = &forge;
-
-                       /* Obtain a local object */
-                       object_copy(q_ptr, o_ptr);
-
-                       /* Modify quantity */
-                       q_ptr->number = 1;
-
-                       /* Restore the charges */
-                       o_ptr->pval++;
-
-                       /* Unstack the used item */
-                       o_ptr->number--;
-                       p_ptr->total_weight -= q_ptr->weight;
-                       item = inven_carry(q_ptr);
-
-                       /* Message */
-                       msg_format(_("杖をまとめなおした。", "You unstack your staff."));
-               }
-
-               /* Describe charges in the pack */
-               if (item >= 0)
-               {
-                       inven_item_charges(item);
-               }
-
-               /* Describe charges on the floor */
-               else
-               {
-                       floor_item_charges(0 - item);
-               }
-
-               /* Window stuff */
-               p_ptr->window |= (PW_INVEN | PW_EQUIP);
-
-               /* Don't eat a staff/wand itself */
-               return;
-       }
-       else if ((prace_is_(RACE_DEMON) ||
-                (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON)) &&
-                (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_CORPSE &&
-                 my_strchr("pht", r_info[o_ptr->pval].d_char)))
-       {
-               /* Drain vitality of humanoids */
-               char o_name[MAX_NLEN];
-               object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
-               msg_format(_("%sは燃え上り灰になった。精力を吸収した気がする。", "%^s is burnt to ashes.  You absorb its vitality!"), o_name);
-               (void)set_food(PY_FOOD_MAX - 1);
-       }
-       else if (prace_is_(RACE_SKELETON))
-       {
-#if 0
-               if (o_ptr->tval == TV_SKELETON ||
-                   (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))
-               {
-                       msg_print(_("あなたは骨で自分の体を補った。", "Your body absorbs the bone."));
-                       set_food(p_ptr->food + 5000);
-               }
-               else 
-#endif
-
-               if (!((o_ptr->sval == SV_FOOD_WAYBREAD) ||
-                     (o_ptr->sval < SV_FOOD_BISCUIT)))
-               {
-                       object_type forge;
-                       object_type *q_ptr = &forge;
-                       
-                       msg_print(_("食べ物がアゴを素通りして落ちた!", "The food falls through your jaws!"));
-
-                       /* Create the item */
-                       object_prep(q_ptr, lookup_kind(o_ptr->tval, o_ptr->sval));
-
-                       /* Drop the object from heaven */
-                       (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
-               }
-               else
-               {
-                       msg_print(_("食べ物がアゴを素通りして落ち、消えた!", "The food falls through your jaws and vanishes!"));
-               }
-       }
-       else if (prace_is_(RACE_GOLEM) ||
-                prace_is_(RACE_ZOMBIE) ||
-                prace_is_(RACE_ENT) ||
-                prace_is_(RACE_DEMON) ||
-                prace_is_(RACE_ANDROID) ||
-                prace_is_(RACE_SPECTRE) ||
-                (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_NONLIVING))
-       {
-               msg_print(_("生者の食物はあなたにとってほとんど栄養にならない。", "The food of mortals is poor sustenance for you."));
-               set_food(p_ptr->food + ((o_ptr->pval) / 20));
-       }
-       else if (o_ptr->tval == TV_FOOD && o_ptr->sval == SV_FOOD_WAYBREAD)
-       {
-               /* Waybread is always fully satisfying. */
-               set_food(MAX(p_ptr->food, PY_FOOD_MAX - 1));
-       }
-       else
-       {
-               /* Food can feed the player */
-               (void)set_food(p_ptr->food + o_ptr->pval);
-       }
-
-       /* Destroy a food in the pack */
-       if (item >= 0)
-       {
-               inven_item_increase(item, -1);
-               inven_item_describe(item);
-               inven_item_optimize(item);
-       }
-
-       /* Destroy a food on the floor */
-       else
-       {
-               floor_item_increase(0 - item, -1);
-               floor_item_describe(0 - item);
-               floor_item_optimize(0 - item);
-       }
-}
-
-
-/*!
- * @brief オブジェクトをプレイヤーが食べることができるかを判定する /
- * Hook to determine if an object is eatable
- * @param o_ptr 判定したいオブジェクトの構造体参照ポインタ
- * @return 食べることが可能ならばTRUEを返す
- */
-static bool item_tester_hook_eatable(object_type *o_ptr)
-{
-       if (o_ptr->tval==TV_FOOD) return TRUE;
-
-#if 0
-       if (prace_is_(RACE_SKELETON))
-       {
-               if (o_ptr->tval == TV_SKELETON ||
-                   (o_ptr->tval == TV_CORPSE && o_ptr->sval == SV_SKELETON))
-                       return TRUE;
-       }
-       else 
-#endif
-
-       if (prace_is_(RACE_SKELETON) ||
-           prace_is_(RACE_GOLEM) ||
-           prace_is_(RACE_ZOMBIE) ||
-           prace_is_(RACE_SPECTRE))
-       {
-               if (o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND)
-                       return TRUE;
-       }
-       else if (prace_is_(RACE_DEMON) ||
-                (mimic_info[p_ptr->mimic_form].MIMIC_FLAGS & MIMIC_IS_DEMON))
-       {
-               if (o_ptr->tval == TV_CORPSE &&
-                   o_ptr->sval == SV_CORPSE &&
-                   my_strchr("pht", r_info[o_ptr->pval].d_char))
-                       return TRUE;
-       }
-
-       /* Assume not */
-       return (FALSE);
-}
-
-
-/*!
- * @brief 食料を食べるコマンドのメインルーチン /
- * Eat some food (from the pack or floor)
- * @return なし
- */
-void do_cmd_eat_food(void)
-{
-       OBJECT_IDX item;
-       cptr        q, s;
-
-
-       if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
-       {
-               set_action(ACTION_NONE);
-       }
-
-       /* Restrict choices to food */
-       item_tester_hook = item_tester_hook_eatable;
-
-       /* Get an item */
-       q = _("どれを食べますか? ", "Eat which item? ");
-       s = _("食べ物がない。", "You have nothing to eat.");
-
-       if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
-
-       /* Eat the object */
-       do_cmd_eat_food_aux(item);
-}
-
 
 /*!
  * @brief 薬を飲むコマンドのサブルーチン /
index a5a139f..edc9336 100644 (file)
@@ -804,7 +804,6 @@ extern void do_cmd_pet_dismiss(void);
 extern void do_cmd_pet(void);
 
 /* cmd6.c */
-extern void do_cmd_eat_food(void);
 extern void do_cmd_quaff_potion(void);
 extern void do_cmd_read_scroll(void);
 extern void do_cmd_aim_wand(void);