Changed Japanese translation for "New" to match what was suggested in hengbandforosx...

[hengbandforosx/hengbandosx.git] / src / monster2.c

diff --git a/src/monster2.c b/src/monster2.c
index 7c5bf06..a7d7976 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -30,152 +30,6 @@
 
 
 /*!
- * @var horror_desc
- * @brief ELDRITCH HORROR効果時のモンスターの形容メッセージ（通常時）
- */
-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効果時のモンスターの形容メッセージ(幻覚状態時)
- */
-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効果時の幻覚時間延長を示す錯乱表現
- */
-concptr funny_comments[MAX_SAN_COMMENT] =
-{
-#ifdef JP
-  /* nuke me */
-       "最高だぜ！",
-       "うひょー！",
-       "いかすぜ！",
-       "すんばらしい！",
-       "ぶっとびー！"
-#else
-       "Wow, cosmic, man!",
-       "Rad!",
-       "Groovy!",
-       "Cool!",
-       "Far out!"
-#endif
-
-};
-
-
-/*!
  * @brief モンスターの目標地点をセットする / Set the target of counter attack
  * @param m_ptr モンスターの参照ポインタ
  * @param y 目標y座標
@@ -1725,6 +1579,16 @@ void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode)
        }
 }
 
+/*!
+* @brief モンスターIDを取り、モンスター名をm_nameに代入する /
+* @param m_idx モンスターID
+* @param m_name モンスター名を入力する配列
+*/
+void monster_name(MONSTER_IDX m_idx, char* m_name)
+{
+       monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
+       monster_desc(m_name, m_ptr, 0x00);
+}
 
 
 /*!
@@ -2540,13 +2404,13 @@ static bool monster_hook_tanuki(MONRACE_IDX r_idx)
  * @param r_idx モンスター種族ID
  * @return モンスター種族の表層ID
  */
-static MONRACE_IDX initial_r_appearance(MONRACE_IDX r_idx)
+static MONRACE_IDX initial_r_appearance(MONRACE_IDX r_idx, BIT_FLAGS generate_mode)
 {
        int attempts = 1000;
        MONRACE_IDX ap_r_idx;
-       DEPTH min = MIN(current_floor_ptr->base_level-5, 50);
+       DEPTH min = MIN(current_floor_ptr->base_level - 5, 50);
 
-       if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN)
+       if (p_ptr->pseikaku == SEIKAKU_CHARGEMAN && !(generate_mode & (PM_MULTIPLY | PM_KAGE)))
        {
                if (current_floor_ptr->base_level == 0 || one_in_(5)) return MON_ALIEN_JURAL;
        }
@@ -2734,7 +2598,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
 
        /* Save the race */
        m_ptr->r_idx = r_idx;
-       m_ptr->ap_r_idx = initial_r_appearance(r_idx);
+       m_ptr->ap_r_idx = initial_r_appearance(r_idx, mode);
 
        /* No flags */
        m_ptr->mflag = 0;