[Refactor] #40020 player-status.c からhorrir-descriptions.c/h を分離 / Separated horrir...

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index ead3ab0..6e1d23d 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -187,6 +187,7 @@
     <ClCompile Include="..\..\src\floor.c" />\r
     <ClCompile Include="..\..\src\geometry.c" />\r
     <ClCompile Include="..\..\src\history.c" />\r
+    <ClCompile Include="..\..\src\horror-descriptions.c" />\r
     <ClCompile Include="..\..\src\init.c" />\r
     <ClCompile Include="..\..\src\monster-dist-offsets.c" />\r
     <ClCompile Include="..\..\src\monster-process.c" />\r
@@ -313,6 +314,7 @@
     <ClInclude Include="..\..\src\combat\melee.h" />\r
     <ClInclude Include="..\..\src\combat\shoot.h" />\r
     <ClInclude Include="..\..\src\english.h" />\r
+    <ClInclude Include="..\..\src\horror-descriptions.h" />\r
     <ClInclude Include="..\..\src\monster-dist-offsets.h" />\r
     <ClInclude Include="..\..\src\object-flavor.h" />\r
     <ClInclude Include="..\..\src\player-inventory.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 9bf0f21..e8bcd53 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -403,6 +403,9 @@
     <ClCompile Include="..\..\src\monster-dist-offsets.c">
       <Filter>monster</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\horror-descriptions.c">
+      <Filter>player</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -788,6 +791,9 @@
     <ClInclude Include="..\..\src\monster-dist-offsets.h">
       <Filter>monster</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\horror-descriptions.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 94eb268..365aa77 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ hengband_SOURCES = \
        \
        creature.h creature.c \
        player-move.c player-move.h player-damage.c player-damage.h \
+       horror-descriptions.c horror-descriptions.h \
        player-status.c player-status.h player-effects.c player-effects.h \
        player-skill.c player-skill.h player-class.c player-class.h \
        player-race.c player-race.h player-personality.c player-personality.h \

diff --git a/src/horror-descriptions.c b/src/horror-descriptions.c
new file mode 100644 (file)
index 0000000..a3de967
--- /dev/null
+++ b/src/horror-descriptions.c
@@ -0,0 +1,143 @@
+#include "h-type.h"
+#include "horror-descriptions.h"
+
+/*!
+ * @var horror_desc
+ * @brief ELDRITCH HORROR\8cø\89Ê\8e\9e\82Ì\83\82\83\93\83X\83^\81[\82Ì\8c`\97e\83\81\83b\83Z\81[\83W\81i\92Ê\8fí\8e\9e\81j
+ */
+concptr horror_desc[MAX_SAN_HORROR] =
+{
+#ifdef JP
+       "\8aõ\82Ü\82í\82µ\82¢",
+       "\92ê\92m\82ê\82Ê",
+       "\82¼\82Á\82Æ\82·\82é",
+       "\94j\96Å\93I\82È",
+       "\96`\93À\93I\82È",
+
+       "\82¢\82â\82È",
+       "\8b°\82ë\82µ\82¢",
+       "\95s\8c\89\82È",
+       "\97e\8eÍ\82Ì\82È\82¢",
+       "\82¨\82¼\82Ü\82µ\82¢",
+
+       "\92n\8d\96\82Ì",
+       "\90g\82Ì\96Ñ\82à\82æ\82¾\82Â",
+       "\92n\8d\96\82Ì",
+       "\8aõ\82Ü\82í\82µ\82¢",
+       "\88«\96²\82Ì\82æ\82¤\82È",
+
+       "\8c\99\88«\82ð\8a´\82¶\82é",
+       "\94±\93\96\82½\82è\82È",
+       "\8b°\82¢",
+       "\95s\8fò\82È",
+       "\8c¾\82¤\82à\82¨\82¼\82Ü\82µ\82¢",
+#else
+       "abominable",
+       "abysmal",
+       "appalling",
+       "baleful",
+       "blasphemous",
+
+       "disgusting",
+       "dreadful",
+       "filthy",
+       "grisly",
+       "hideous",
+
+       "hellish",
+       "horrible",
+       "infernal",
+       "loathsome",
+       "nightmarish",
+
+       "repulsive",
+       "sacrilegious",
+       "terrible",
+       "unclean",
+       "unspeakable",
+#endif
+};
+
+/*!
+ * @var funny_desc
+ * @brief ELDRITCH HORROR\8cø\89Ê\8e\9e\82Ì\83\82\83\93\83X\83^\81[\82Ì\8c`\97e\83\81\83b\83Z\81[\83W(\8c¶\8ao\8fó\91Ô\8e\9e)
+ */
+concptr funny_desc[MAX_SAN_FUNNY] =
+{
+#ifdef JP
+       "\8aÔ\94²\82¯\82È",
+       "\8a\8a\8cm\82È",
+       "\82Î\82©\82ç\82µ\82¢",
+       "\96³\96¡\8a£\91\87\82È",
+       "\94n\8e­\82°\82½",
+
+       "\8fÎ\82¦\82é",
+       "\82Î\82©\82Î\82©\82µ\82¢",
+       "\82Ô\82Á\82Æ\82ñ\82¾",
+       "\82¢\82©\82µ\82½",
+       "\83|\83X\83g\83\82\83_\83\93\82È",
+
+       "\83t\83@\83\93\83^\83X\83e\83B\83b\83N\82È",
+       "\83_\83_\83C\83Y\83\80\93I\82È",
+       "\83L\83\85\83r\83Y\83\80\93I\82È",
+       "\89F\92\88\93I\82È",
+       "\91ì\89z\82µ\82½",
+
+       "\97\9d\89ð\95s\94\\82È",
+       "\82à\82Ì\82·\82²\82¢",
+       "\8bÁ\82­\82×\82«",
+       "\90M\82¶\82ç\82ê\82È\82¢",
+       "\83J\83I\83e\83B\83b\83N\82È",
+
+       "\96ì\90«\93I\82È",
+       "\94ñ\8fí\8e¯\82È",
+#else
+       "silly",
+       "hilarious",
+       "absurd",
+       "insipid",
+       "ridiculous",
+
+       "laughable",
+       "ludicrous",
+       "far-out",
+       "groovy",
+       "postmodern",
+
+       "fantastic",
+       "dadaistic",
+       "cubistic",
+       "cosmic",
+       "awesome",
+
+       "incomprehensible",
+       "fabulous",
+       "amazing",
+       "incredible",
+       "chaotic",
+
+       "wild",
+       "preposterous",
+#endif
+};
+
+/*!
+ * @var funny_comments
+ * @brief ELDRITCH HORROR\8cø\89Ê\8e\9e\82Ì\8c¶\8ao\8e\9e\8aÔ\89\84\92·\82ð\8e¦\82·\8dö\97\90\95\\8c»
+ */
+concptr funny_comments[MAX_SAN_COMMENT] =
+{
+#ifdef JP
+         "\8dÅ\8d\82\82¾\82º\81I",
+         "\82¤\82Ð\82å\81[\81I",
+         "\82¢\82©\82·\82º\81I",
+         "\82·\82ñ\82Î\82ç\82µ\82¢\81I",
+         "\82Ô\82Á\82Æ\82Ñ\81[\81I"
+  #else
+         "Wow, cosmic, man!",
+         "Rad!",
+         "Groovy!",
+         "Cool!",
+         "Far out!"
+  #endif
+};

diff --git a/src/horror-descriptions.h b/src/horror-descriptions.h
new file mode 100644 (file)
index 0000000..ef9be76
--- /dev/null
+++ b/src/horror-descriptions.h
@@ -0,0 +1,10 @@
+#pragma once
+
+/* ELDRITCH_HORROR\82É\82æ\82ésanity blast\8f\88\97\9d\82É\8aÖ\82·\82é\83\81\83b\83Z\81[\83W\82Ì\8dÅ\91å\90\94 / Number of entries in the sanity-blast descriptions */
+#define MAX_SAN_HORROR 20 /*!< \8b°\82ë\82µ\82¢\91Î\8fÛ\82Ì\8c`\97e\90\94(\90³\8fí\8e\9e) */
+#define MAX_SAN_FUNNY 22  /*!< \8b°\82ë\82µ\82¢\91Î\8fÛ\82Ì\8c`\97e\90\94(\8c¶\8ao\8e\9e) */
+#define MAX_SAN_COMMENT 5 /*!< \8b°\82ë\82µ\82¢\91Î\8fÛ\82ð\8c©\82½\82Æ\82«\82Ì\90â\8b©\83\81\83b\83Z\81[\83W\90\94(\8c¶\8ao\8e\9e) */
+
+concptr horror_desc[MAX_SAN_HORROR];
+concptr funny_desc[MAX_SAN_FUNNY];
+concptr funny_comments[MAX_SAN_COMMENT];

diff --git a/src/player-status.c b/src/player-status.c
index 44c5ac6..ce0e8d2 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -42,6 +42,8 @@
 #include "files.h"
 #include "cmd-magiceat.h"
 
+#include "horror-descriptions.h"
+
 /*!
  * @brief 能力値テーブル / Abbreviations of healthy stats
  */
@@ -66,152 +68,6 @@ const concptr stat_names_reduced[6] =
 #endif
 };
 
-/* ELDRITCH_HORRORによるsanity blast処理に関するメッセージの最大数 / Number of entries in the sanity-blast descriptions */
-#define MAX_SAN_HORROR 20 /*!< 恐ろしい対象の形容数(正常時) */
-#define MAX_SAN_FUNNY 22  /*!< 恐ろしい対象の形容数(幻覚時) */
-#define MAX_SAN_COMMENT 5 /*!< 恐ろしい対象を見たときの絶叫メッセージ数(幻覚時) */
-
-/*!
- * @var horror_desc
- * @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ（通常時）
- */
-static concptr horror_desc[MAX_SAN_HORROR] =
-{
-#ifdef JP
-       "忌まわしい",
-       "底知れぬ",
-       "ぞっとする",
-       "破滅的な",
-       "冒涜的な",
-
-       "いやな",
-       "恐ろしい",
-       "不潔な",
-       "容赦のない",
-       "おぞましい",
-
-       "地獄の",
-       "身の毛もよだつ",
-       "地獄の",
-       "忌まわしい",
-       "悪夢のような",
-
-       "嫌悪を感じる",
-       "罰当たりな",
-       "恐い",
-       "不浄な",
-       "言うもおぞましい",
-#else
-       "abominable",
-       "abysmal",
-       "appalling",
-       "baleful",
-       "blasphemous",
-
-       "disgusting",
-       "dreadful",
-       "filthy",
-       "grisly",
-       "hideous",
-
-       "hellish",
-       "horrible",
-       "infernal",
-       "loathsome",
-       "nightmarish",
-
-       "repulsive",
-       "sacrilegious",
-       "terrible",
-       "unclean",
-       "unspeakable",
-#endif
-};
-
-/*!
- * @var funny_desc
- * @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ(幻覚状態時)
- */
-static concptr funny_desc[MAX_SAN_FUNNY] =
-{
-#ifdef JP
-       "間抜けな",
-       "滑稽な",
-       "ばからしい",
-       "無味乾燥な",
-       "馬鹿げた",
-
-       "笑える",
-       "ばかばかしい",
-       "ぶっとんだ",
-       "いかした",
-       "ポストモダンな",
-
-       "ファンタスティックな",
-       "ダダイズム的な",
-       "キュビズム的な",
-       "宇宙的な",
-       "卓越した",
-
-       "理解不能な",
-       "ものすごい",
-       "驚くべき",
-       "信じられない",
-       "カオティックな",
-
-       "野性的な",
-       "非常識な",
-#else
-       "silly",
-       "hilarious",
-       "absurd",
-       "insipid",
-       "ridiculous",
-
-       "laughable",
-       "ludicrous",
-       "far-out",
-       "groovy",
-       "postmodern",
-
-       "fantastic",
-       "dadaistic",
-       "cubistic",
-       "cosmic",
-       "awesome",
-
-       "incomprehensible",
-       "fabulous",
-       "amazing",
-       "incredible",
-       "chaotic",
-
-       "wild",
-       "preposterous",
-#endif
-};
-
-/*!
- * @var funny_comments
- * @brief ELDRITCH HORROR効果時の幻覚時間延長を示す錯乱表現
- */
-static concptr funny_comments[MAX_SAN_COMMENT] =
-{
-#ifdef JP
-         "最高だぜ！",
-         "うひょー！",
-         "いかすぜ！",
-         "すんばらしい！",
-         "ぶっとびー！"
-  #else
-         "Wow, cosmic, man!",
-         "Rad!",
-         "Groovy!",
-         "Cool!",
-         "Far out!"
-  #endif
-};
-
 /*!
  * @brief 基本必要経験値テーブル /
  * Base experience levels, may be adjusted up for race and/or class