[Refactor] #40647 Separated body-imptovement-info.c/h from self-info.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 0af76d4..6d40cdf 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -323,6 +323,7 @@
     <ClCompile Include="..\..\src\object-activation\activation-resistance.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-teleport.c" />\r
     <ClCompile Include="..\..\src\object-activation\activation-util.c" />\r
+    <ClCompile Include="..\..\src\player-info\body-improvement-info.c" />\r
     <ClCompile Include="..\..\src\player-info\class-ability-info.c" />\r
     <ClCompile Include="..\..\src\player-info\mutation-info.c" />\r
     <ClCompile Include="..\..\src\player-info\race-ability-info.c" />\r
@@ -964,6 +965,7 @@
     <ClInclude Include="..\..\src\object-activation\activation-teleport.h" />\r
     <ClInclude Include="..\..\src\object-activation\activation-util.h" />\r
     <ClInclude Include="..\..\src\player-info\base-status-types.h" />\r
+    <ClInclude Include="..\..\src\player-info\body-improvement-info.h" />\r
     <ClInclude Include="..\..\src\player-info\class-ability-info.h" />\r
     <ClInclude Include="..\..\src\player-info\mutation-info.h" />\r
     <ClInclude Include="..\..\src\player-info\race-ability-info.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index e383d2a..1bbdd4d 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2138,6 +2138,9 @@
     <ClCompile Include="..\..\src\player-info\mutation-info.c">
       <Filter>player-info</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\player-info\body-improvement-info.c">
+      <Filter>player-info</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\combat\shoot.h">
@@ -4630,6 +4633,9 @@
     <ClInclude Include="..\..\src\player-info\mutation-info.h">
       <Filter>player-info</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player-info\body-improvement-info.h">
+      <Filter>player-info</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 18b8231..421337b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -632,6 +632,7 @@ hengband_SOURCES = \
        \
        player-info/avatar.h player-info/avatar.c \
        player-info/base-status-types.h \
+       player-info/body-improvement-info.c player-info/body-improvement-info.h \
        player-info/class-ability-info.c player-info/class-ability-info.h \
        player-info/mutation-info.c player-info/mutation-info.h \
        player-info/race-ability-info.c player-info/race-ability-info.h \

diff --git a/src/player-info/body-improvement-info.c b/src/player-info/body-improvement-info.c
new file mode 100644 (file)
index 0000000..3e6eb58
--- /dev/null
+++ b/src/player-info/body-improvement-info.c
@@ -0,0 +1,107 @@
+#include "player-info/body-improvement-info.h"
+#include "player-info/self-info-util.h"
+
+/* todo \95À\82Ñ\8f\87\82Ì\93s\8d\87\82Å\98A\94Ô\82ð\95t\82¯\82é\81B\82Ü\82Æ\82ß\82Ä\82à\97Ç\82¢\82È\82ç\82Ü\82Æ\82ß\82Ä\82µ\82Ü\82¤\97\\92è */
+void set_body_improvement_info_1(player_type *creature_ptr, self_info_type *si_ptr)
+{
+    if (is_blessed(creature_ptr))
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8d\82\8c\89\82³\82ð\8a´\82¶\82Ä\82¢\82é\81B", "You feel rightous.");
+
+    if (is_hero(creature_ptr))
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\83q\81[\83\8d\81[\8bC\95ª\82¾\81B", "You feel heroic.");
+
+    if (creature_ptr->shero)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\90í\93¬\8b¶\82¾\81B", "You are in a battle rage.");
+
+    if (creature_ptr->protevil)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8e×\88«\82È\82é\91¶\8dÝ\82©\82ç\8eç\82ç\82ê\82Ä\82¢\82é\81B", "You are protected from evil.");
+
+    if (creature_ptr->shield)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\90_\94é\82Ì\83V\81[\83\8b\83h\82Å\8eç\82ç\82ê\82Ä\82¢\82é\81B", "You are protected by a mystic shield.");
+
+    if (is_invuln(creature_ptr))
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8c»\8dÝ\8f\9d\82Â\82©\82È\82¢\81B", "You are temporarily invulnerable.");
+
+    if (creature_ptr->wraith_form)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\88ê\8e\9e\93I\82É\97H\91Ì\89»\82µ\82Ä\82¢\82é\81B", "You are temporarily incorporeal.");
+}
+
+/* todo \95À\82Ñ\8f\87\82Ì\93s\8d\87\82Å\98A\94Ô\82ð\95t\82¯\82é\81B\82Ü\82Æ\82ß\82Ä\82à\97Ç\82¢\82È\82ç\82Ü\82Æ\82ß\82Ä\82µ\82Ü\82¤\97\\92è */
+void set_body_improvement_info_2(player_type *creature_ptr, self_info_type *si_ptr)
+{
+    if (creature_ptr->new_spells)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8eô\95¶\82â\8bF\82è\82ð\8aw\82Ô\82±\82Æ\82ª\82Å\82«\82é\81B", "You can learn some spells/prayers.");
+
+    if (creature_ptr->word_recall)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\82·\82®\82É\8bA\8aÒ\82·\82é\82¾\82ë\82¤\81B", "You will soon be recalled.");
+
+    if (creature_ptr->alter_reality)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\82·\82®\82É\82±\82Ì\90¢\8aE\82ð\97£\82ê\82é\82¾\82ë\82¤\81B", "You will soon be altered.");
+
+    if (creature_ptr->see_infra)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Ì\93µ\82Í\90Ô\8aO\90ü\82É\95q\8a´\82Å\82 \82é\81B", "Your eyes are sensitive to infrared light.");
+
+    if (creature_ptr->see_inv)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\93§\96¾\82È\83\82\83\93\83X\83^\81[\82ð\8c©\82é\82±\82Æ\82ª\82Å\82«\82é\81B", "You can see invisible creatures.");
+
+    if (creature_ptr->levitation)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\94ò\82Ô\82±\82Æ\82ª\82Å\82«\82é\81B", "You can fly.");
+
+    if (creature_ptr->free_act)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\96\83á\83\92m\82ç\82¸\82Ì\8cø\89Ê\82ð\8e\9d\82Á\82Ä\82¢\82é\81B", "You have free action.");
+
+    if (creature_ptr->regenerate)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\91f\91\81\82­\91Ì\97Í\82ð\89ñ\95\9c\82·\82é\81B", "You regenerate quickly.");
+
+    if (creature_ptr->slow_digest)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\90H\97~\82ª\8f­\82È\82¢\81B", "Your appetite is small.");
+}
+
+/* todo \95À\82Ñ\8f\87\82Ì\93s\8d\87\82Å\98A\94Ô\82ð\95t\82¯\82é\81B\82Ü\82Æ\82ß\82Ä\82à\97Ç\82¢\82È\82ç\82Ü\82Æ\82ß\82Ä\82µ\82Ü\82¤\97\\92è */
+void set_body_improvement_info_3(player_type *creature_ptr, self_info_type *si_ptr)
+{
+    if (creature_ptr->hold_exp)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8e©\8cÈ\82Ì\8co\8c±\92l\82ð\82µ\82Á\82©\82è\82Æ\88Û\8e\9d\82·\82é\81B", "You have a firm hold on your experience.");
+
+    if (creature_ptr->reflect)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\96î\82Ì\8eô\95¶\82ð\94½\8eË\82·\82é\81B", "You reflect bolt spells.");
+
+    if (creature_ptr->sh_fire)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\89\8a\82Ì\83I\81[\83\89\82É\95ï\82Ü\82ê\82Ä\82¢\82é\81B", "You are surrounded with a fiery aura.");
+
+    if (creature_ptr->sh_elec)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\93d\8bC\82É\95ï\82Ü\82ê\82Ä\82¢\82é\81B", "You are surrounded with electricity.");
+
+    if (creature_ptr->sh_cold)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\97â\8bC\82Ì\83I\81[\83\89\82É\95ï\82Ü\82ê\82Ä\82¢\82é\81B", "You are surrounded with an aura of coldness.");
+
+    if (creature_ptr->tim_sh_holy)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\90¹\82È\82é\83I\81[\83\89\82É\95ï\82Ü\82ê\82Ä\82¢\82é\81B", "You are surrounded with a holy aura.");
+
+    if (creature_ptr->tim_sh_touki)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\93¬\8bC\82Ì\83I\81[\83\89\82É\95ï\82Ü\82ê\82Ä\82¢\82é\81B", "You are surrounded with an energy aura.");
+
+    if (creature_ptr->anti_magic)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\94½\96\82\96@\83V\81[\83\8b\83h\82É\95ï\82Ü\82ê\82Ä\82¢\82é\81B", "You are surrounded by an anti-magic shell.");
+
+    if (creature_ptr->anti_tele)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\83e\83\8c\83|\81[\83g\82Å\82«\82È\82¢\81B", "You cannot teleport.");
+
+    if (creature_ptr->lite)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Ì\90g\91Ì\82Í\8cõ\82Á\82Ä\82¢\82é\81B", "You are carrying a permanent light.");
+
+    if (creature_ptr->warning)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8ds\93®\82Ì\91O\82É\8aë\8c¯\82ð\8e@\92m\82·\82é\82±\82Æ\82ª\82Å\82«\82é\81B", "You will be warned before dangerous actions.");
+
+    if (creature_ptr->dec_mana)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8f­\82È\82¢\8fÁ\94ï\96\82\97Í\82Å\96\82\96@\82ð\8f¥\82¦\82é\82±\82Æ\82ª\82Å\82«\82é\81B", "You can cast spells with fewer mana points.");
+
+    if (creature_ptr->easy_spell)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\92á\82¢\8e¸\94s\97¦\82Å\96\82\96@\82ð\8f¥\82¦\82é\82±\82Æ\82ª\82Å\82«\82é\81B", "Fail rate of your magic is decreased.");
+
+    if (creature_ptr->heavy_spell)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8d\82\82¢\8e¸\94s\97¦\82Å\96\82\96@\82ð\8f¥\82¦\82È\82¯\82ê\82Î\82¢\82¯\82È\82¢\81B", "Fail rate of your magic is increased.");
+
+    if (creature_ptr->mighty_throw)
+        si_ptr->info[si_ptr->line++] = _("\82 \82È\82½\82Í\8b­\82­\95¨\82ð\93\8a\82°\82é\81B", "You can throw objects powerfully.");
+}

diff --git a/src/player-info/body-improvement-info.h b/src/player-info/body-improvement-info.h
new file mode 100644 (file)
index 0000000..43170e3
--- /dev/null
+++ b/src/player-info/body-improvement-info.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "system/angband.h"
+
+typedef struct self_info_type self_info_type;
+void set_body_improvement_info_1(player_type *creature_ptr, self_info_type *si_ptr);
+void set_body_improvement_info_2(player_type *creature_ptr, self_info_type *si_ptr);
+void set_body_improvement_info_3(player_type *creature_ptr, self_info_type *si_ptr);

diff --git a/src/player-info/self-info.c b/src/player-info/self-info.c
index b62ab27..ae0efc0 100644 (file)
--- a/src/player-info/self-info.c
+++ b/src/player-info/self-info.c
@@ -18,6 +18,7 @@
 #include "object-enchant/trc-types.h"
 #include "object/object-flags.h"
 #include "player-info/avatar.h"
+#include "player-info/body-improvement-info.h"
 #include "player-info/class-ability-info.h"
 #include "player-info/mutation-info.h"
 #include "player-info/race-ability-info.h"
@@ -250,31 +251,6 @@ void set_curse_info(player_type *creature_ptr, self_info_type *si_ptr)
         si_ptr->info[si_ptr->line++] = _("あなたは魔力を吸われている。", "You occasionally lose spell points for no reason.");
 }
 
-/* todo 並び順の都合で連番を付ける。まとめても良いならまとめてしまう予定 */
-void set_body_improvement_info_1(player_type *creature_ptr, self_info_type *si_ptr)
-{
-    if (is_blessed(creature_ptr))
-        si_ptr->info[si_ptr->line++] = _("あなたは高潔さを感じている。", "You feel rightous.");
-
-    if (is_hero(creature_ptr))
-        si_ptr->info[si_ptr->line++] = _("あなたはヒーロー気分だ。", "You feel heroic.");
-
-    if (creature_ptr->shero)
-        si_ptr->info[si_ptr->line++] = _("あなたは戦闘狂だ。", "You are in a battle rage.");
-
-    if (creature_ptr->protevil)
-        si_ptr->info[si_ptr->line++] = _("あなたは邪悪なる存在から守られている。", "You are protected from evil.");
-
-    if (creature_ptr->shield)
-        si_ptr->info[si_ptr->line++] = _("あなたは神秘のシールドで守られている。", "You are protected by a mystic shield.");
-
-    if (is_invuln(creature_ptr))
-        si_ptr->info[si_ptr->line++] = _("あなたは現在傷つかない。", "You are temporarily invulnerable.");
-
-    if (creature_ptr->wraith_form)
-        si_ptr->info[si_ptr->line++] = _("あなたは一時的に幽体化している。", "You are temporarily incorporeal.");
-}
-
 void set_special_attack_info(player_type *creature_ptr, self_info_type *si_ptr)
 {
     if (creature_ptr->special_attack & ATTACK_CONFUSE)
@@ -296,37 +272,6 @@ void set_special_attack_info(player_type *creature_ptr, self_info_type *si_ptr)
         si_ptr->info[si_ptr->line++] = _("あなたの手は毒に覆われている。", "You can strike the enemy with poison.");
 }
 
-/* todo 並び順の都合で連番を付ける。まとめても良いならまとめてしまう予定 */
-void set_body_improvement_info_2(player_type *creature_ptr, self_info_type *si_ptr)
-{
-    if (creature_ptr->new_spells)
-        si_ptr->info[si_ptr->line++] = _("あなたは呪文や祈りを学ぶことができる。", "You can learn some spells/prayers.");
-
-    if (creature_ptr->word_recall)
-        si_ptr->info[si_ptr->line++] = _("あなたはすぐに帰還するだろう。", "You will soon be recalled.");
-
-    if (creature_ptr->alter_reality)
-        si_ptr->info[si_ptr->line++] = _("あなたはすぐにこの世界を離れるだろう。", "You will soon be altered.");
-
-    if (creature_ptr->see_infra)
-        si_ptr->info[si_ptr->line++] = _("あなたの瞳は赤外線に敏感である。", "Your eyes are sensitive to infrared light.");
-
-    if (creature_ptr->see_inv)
-        si_ptr->info[si_ptr->line++] = _("あなたは透明なモンスターを見ることができる。", "You can see invisible creatures.");
-
-    if (creature_ptr->levitation)
-        si_ptr->info[si_ptr->line++] = _("あなたは飛ぶことができる。", "You can fly.");
-
-    if (creature_ptr->free_act)
-        si_ptr->info[si_ptr->line++] = _("あなたは麻痺知らずの効果を持っている。", "You have free action.");
-
-    if (creature_ptr->regenerate)
-        si_ptr->info[si_ptr->line++] = _("あなたは素早く体力を回復する。", "You regenerate quickly.");
-
-    if (creature_ptr->slow_digest)
-        si_ptr->info[si_ptr->line++] = _("あなたは食欲が少ない。", "Your appetite is small.");
-}
-
 void set_esp_info(player_type *creature_ptr, self_info_type *si_ptr)
 {
     if (creature_ptr->telepathy)
@@ -369,54 +314,6 @@ void set_esp_info(player_type *creature_ptr, self_info_type *si_ptr)
         si_ptr->info[si_ptr->line++] = _("あなたは特別な強敵の存在を感じる能力を持っている。", "You sense unique monsters.");
 }
 
-void set_body_improvement_info_3(player_type *creature_ptr, self_info_type *si_ptr)
-{
-    if (creature_ptr->hold_exp)
-        si_ptr->info[si_ptr->line++] = _("あなたは自己の経験値をしっかりと維持する。", "You have a firm hold on your experience.");
-
-    if (creature_ptr->reflect)
-        si_ptr->info[si_ptr->line++] = _("あなたは矢の呪文を反射する。", "You reflect bolt spells.");
-
-    if (creature_ptr->sh_fire)
-        si_ptr->info[si_ptr->line++] = _("あなたは炎のオーラに包まれている。", "You are surrounded with a fiery aura.");
-
-    if (creature_ptr->sh_elec)
-        si_ptr->info[si_ptr->line++] = _("あなたは電気に包まれている。", "You are surrounded with electricity.");
-
-    if (creature_ptr->sh_cold)
-        si_ptr->info[si_ptr->line++] = _("あなたは冷気のオーラに包まれている。", "You are surrounded with an aura of coldness.");
-
-    if (creature_ptr->tim_sh_holy)
-        si_ptr->info[si_ptr->line++] = _("あなたは聖なるオーラに包まれている。", "You are surrounded with a holy aura.");
-
-    if (creature_ptr->tim_sh_touki)
-        si_ptr->info[si_ptr->line++] = _("あなたは闘気のオーラに包まれている。", "You are surrounded with an energy aura.");
-
-    if (creature_ptr->anti_magic)
-        si_ptr->info[si_ptr->line++] = _("あなたは反魔法シールドに包まれている。", "You are surrounded by an anti-magic shell.");
-
-    if (creature_ptr->anti_tele)
-        si_ptr->info[si_ptr->line++] = _("あなたはテレポートできない。", "You cannot teleport.");
-
-    if (creature_ptr->lite)
-        si_ptr->info[si_ptr->line++] = _("あなたの身体は光っている。", "You are carrying a permanent light.");
-
-    if (creature_ptr->warning)
-        si_ptr->info[si_ptr->line++] = _("あなたは行動の前に危険を察知することができる。", "You will be warned before dangerous actions.");
-
-    if (creature_ptr->dec_mana)
-        si_ptr->info[si_ptr->line++] = _("あなたは少ない消費魔力で魔法を唱えることができる。", "You can cast spells with fewer mana points.");
-
-    if (creature_ptr->easy_spell)
-        si_ptr->info[si_ptr->line++] = _("あなたは低い失敗率で魔法を唱えることができる。", "Fail rate of your magic is decreased.");
-
-    if (creature_ptr->heavy_spell)
-        si_ptr->info[si_ptr->line++] = _("あなたは高い失敗率で魔法を唱えなければいけない。", "Fail rate of your magic is increased.");
-
-    if (creature_ptr->mighty_throw)
-        si_ptr->info[si_ptr->line++] = _("あなたは強く物を投げる。", "You can throw objects powerfully.");
-}
-
 /*!
  * @brief 自己分析処理(Nethackからのアイデア) / self-knowledge... idea from nethack.
  * @return なし