バージョン番号を1.0.10に上げる

コーンのジャガーノートの強さ変更
木は多くの属性の攻撃で壊れる
連続魔の変更

diff --git a/configure.in b/configure.in
index 123c33a..d615c71 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(src/main.c)
 
 AM_CONFIG_HEADER(src/autoconf.h)
 
-AM_INIT_AUTOMAKE(hengband, 1.0.9)
+AM_INIT_AUTOMAKE(hengband, 1.0.10)
 
 AC_ARG_WITH(setgid,
 [  --with-setgid=NAME      install hengband as group NAME],

diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info_j.txt
index 4e86a55..5d7cb6b 100644 (file)
--- a/lib/edit/r_info_j.txt
+++ b/lib/edit/r_info_j.txt
@@ -12349,15 +12349,15 @@ D:
 N:672:<¥³¡¼¥ó>¤Î¥¸¥ã¥¬¡¼¥Î¡¼¥È
 E:Juggernaut of Khorne
 G:g:D
-I:125:90d19:12:90:10
+I:120:90d19:12:90:10
 W:43:3:0:2500:0:0
-B:BUTT:HURT:6d6
-B:CRUSH:HURT:8d6
-B:CRUSH:HURT:8d6
-B:BUTT:HURT:6d6
+B:BUTT:HURT:8d6
+B:CRUSH:HURT:10d6
+B:CRUSH:HURT:10d6
+B:BUTT:HURT:8d6
 F:BASH_DOOR | REFLECTING | KILL_ITEM |
 F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | DEMON |
-F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | EVIL
+F:NO_CONF | NO_SLEEP | NO_FEAR | NONLIVING | EVIL | RIDING
 D:$A great, vicious beast whose flesh is made of steel and whose 
 D:$blood is fire. It charges at you ignoring everything else.
 D:µðÂç¤Ê°­°Õ¤ËËþ¤Á¤¿½Ã¤Ç¡¢ÆùÂΤÏÅ´¡¢·ì¤Ï±ê¤Ç¤Ç¤­¤Æ¤¤¤ë¡£

diff --git a/lib/file/news.txt b/lib/file/news.txt
index aaf8f7d..3f4761c 100644 (file)
--- a/lib/file/news.txt
+++ b/lib/file/news.txt
@@ -1,6 +1,6 @@
 
                   ***************************************
-                  **   Hengband 1.0.9 English version  **
+                  **  Hengband 1.0.10 English version  **
                   ***************************************
 
           Based on Moria:    Copyright (c) 1985 Robert Alan Koeneke

diff --git a/lib/file/news_j.txt b/lib/file/news_j.txt
index 2c6be9c..662f2e4 100644 (file)
--- a/lib/file/news_j.txt
+++ b/lib/file/news_j.txt
@@ -1,6 +1,6 @@
 
                   ***************************************
-                  **          ÊѶòÈÚÅÜ  1.0.9          **
+                  **          ÊѶòÈÚÅÜ  1.0.10         **
                   ***************************************
 
           Based on Moria:    Copyright (c) 1985 Robert Alan Koeneke

diff --git a/lib/help/jversion.txt b/lib/help/jversion.txt
index 51c89ec..fac6c98 100644 (file)
--- a/lib/help/jversion.txt
+++ b/lib/help/jversion.txt
@@ -6,9 +6,38 @@
 ¥Ð¡¼¥¸¥ç¥óÍúÎò
 --------------
 
+2001/03/06 Ver. 1.0.10
+  ¿·¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È&¿·¥¨¥´&¿·Êõʪ¸ËÄɲÃ
+  Îýµ¤½Ñ»Õ¤ÏÁǼê¤Î¤È¤­µ¤¤òÎý¤ë¤È¹¶·âÎϤ⥢¥Ã¥×
+  Í©Îî¤Î·Ð¸³¥Ú¥Ê¥ë¥Æ¥£¥¢¥Ã¥×
+  ¥é¥ó¥À¥àÄɲÃǽÎϤǥƥì¥Ñ¥·¡¼¤ÏÇѻߤ·Âå¤ï¤ê¤Ë·Ù¹ðÄɲÃ
+  ¥â¥ó¥¹¥¿¡¼¤ÎAI²þÎÉ
+  º®Æ٤Υµ¡¼¥Ú¥ó¥È¤Ï¥À¥ó¥¸¥ç¥ó¤Î¼ç¾¤´­¤Î¼öʸ¤ò»È¤¦
+  ¥¯¥í¡¼¥óÃϹö¤Î¥æ¥Ë¡¼¥¯Ã£¤òÁ´¤Æ(clone)¤Ë(¥¢¥¤¥Æ¥à¤ÏÍ)
+  Èô¤ÓÆ»¶ñ¤Î½Ð¸½³¬Êѹ¹
+  Îô²½¹¶·â¤Ç¤Þ¤ì(1/13)¤Ëpval¤¬²¼¤¬¤ë
+  ÅêÚ³¤Ç¥¢¥¤¥Æ¥à¤Î¥À¥á¡¼¥¸½¤Àµ¤ÏÀäÂÐÃͤò¼è¤Ã¤Æ²ò¼á¤¹¤ë
+  ¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î̾Á°¤òÂçÉý¤ËÀ°Íý³È½¼
+  Ǧ¼Ô¤Î¤È¤­Å´¤¯¤µ¤Ó¤Ë(1ȯ¤Î¥À¥á¡¼¥¸/1¥¿¡¼¥ó¤Î¥À¥á¡¼¥¸)ɽ¼¨
+  ÌðÅù¤Î¥¢¥¤¥Æ¥à¤Î«¤ò¼«Æ°Åª¤Ë99ËܤޤǤ¦¤Þ¤¯µÍ¤á¤Æ»ý¤Ä
+  MP¤¬Â­¤ê¤Ê¤¤¤È¤­¤Î³Îǧ¤ÈŨ¤Î¥Æ¥ì¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤¤¤¯³Îǧ¤ò[(O)k/(C)ancel]¤Çʹ¤¯
+  ¥Ú¥Ã¥È¤òÏ¢¤ì¤Æ¤¤¤ë»þ¤Ï¹­°è¥Þ¥Ã¥×¤Ë½Ð¤ë»þ¤Ë³Îǧ¤ò¼è¤ë
+  ¥Ú¥Ã¥È¤Î²òÊü¤Î»ÅÍÍÊѹ¹('All'¤òÇѻߤ·¤Æ'Unnamed'¤òƳÆþ)
+  ²èÌÌɽ¼¨ÀßÄê(%¥³¥Þ¥ó¥É)¤Ç^N ^A ^C¤ò²¡¤¹¤È¿ôÃÍÆþÎϤÇchar¤äattr¤òÊѹ¹¤Ç¤­¤ë
+  ¥¦¥£¥ó¥É¥¦¤Î¿ô¤Î¥Ç¥Õ¥©¥ë¥È¤ò3¤Ë(¥Ç¥Õ¥©¥ë¥È¤Ï¥á¥Ã¥»¡¼¥¸ÍúÎò¤È»ý¤Áʪ)
+  make install¤ÇÀµ¤·¤¤¾ì½ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë
+  Mac¤ÎMPW¤Ç¥³¥ó¥Ñ¥¤¥ë²Äǽ¤Ë¤·¤¿
+  16x16¥¿¥¤¥ë¤Î¥µ¥Ý¡¼¥È³«»Ï
+  X11¤Ç¤Ï¡¢Äɲ媥ץ·¥ç¥ó -a ¤È -o ¤Ç16x16¤«8x8¤Î¥¿¥¤¥ë¤òÁªÂò
+  8x8¥¿¥¤¥ë¤Ç¡¢¸÷¸»¤È»ë³¦¤ÎÈϰϤòÌÀ¤ë¤¯É½¼¨¥¿¥¤¥ë¤Î½Å¤Í¹ç¤»É½¼¨¤Ë¤âÂбþ
+  ¥¿¥¤¥ëɽ¼¨¤Ç¤â¥¹¥¯¥ê¡¼¥ó¥·¥ç¥Ã¥È¤òÁ÷¿®¤Ç¤­¤ë
+  ½é¿´¼Ô¥¬¥¤¥É(lib/help/tang.txt)¤òÊѶòÈÚÅÜÂбþ¤Ë¤·¤¿
+  ¸¸³Ð¾õÂ֤λà°ø¤ÏÉáÄ̤Ëɽ¼¨
+  ¥Ð¥°½¤Àµ
+
 2001/01/27 Ver. 1.0.9
   ¿·¥¢¥¤¥Æ¥àÄɲÃ
-  ¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼¤Ï¤¿¤Þ¤Ë*¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼*¤Ë¤Ê¤ë(¥È¥í¥ëÅù¤â)¡£
+  ¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼¤Ï¤¿¤Þ¤Ë*¥ª¡¼¥¯¥¹¥ì¥¤¥ä¡¼*¤Ë¤Ê¤ë(¥È¥í¥ëÅù¤â)
   ¥é¥ó¥À¥à¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È̾¤ÎÄɲÃ/ºï½ü
   ¥­¥ã¥é¥¯¥¿ºîÀ®ÉôʬÊѹ¹
   ¥¹¥Æ¡¼¥¿¥¹²èÌÌÊѹ¹

diff --git a/src/cmd1.c b/src/cmd1.c
index 3b77d2a..1bdbb7e 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -2438,6 +2438,7 @@ static void py_attack_aux(int y, int x, bool *fear, bool *mdeath, s16b hand, int
        bool            stab_fleeing = FALSE;
        bool            fuiuchi = FALSE;
        bool            do_quake = FALSE;
+       bool            weak = FALSE;
        bool            drain_msg = TRUE;
        int             drain_result = 0, drain_heal = 0;
        bool            can_drain = FALSE;
@@ -3231,11 +3232,7 @@ msg_format("
                                }
                                m_ptr->maxhp -= (k+7)/8;
                                if (m_ptr->hp > m_ptr->maxhp) m_ptr->hp = m_ptr->maxhp;
-#ifdef JP
-                               msg_format("%s¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£", m_name);
-#else
-                               msg_format("%^s seems weakened.", m_name);
-#endif
+                               weak = TRUE;
                        }
                        can_drain = FALSE;
                        drain_result = 0;
@@ -3362,6 +3359,7 @@ msg_format("
                                                r_ptr = &r_info[m_ptr->r_idx];
 
                                                *fear = FALSE;
+                                               weak = FALSE;
                                        }
                                        else
                                        {
@@ -3533,6 +3531,14 @@ msg_format("
        }
 
 
+       if (weak && !(*mdeath))
+       {
+#ifdef JP
+               msg_format("%s¤Ï¼å¤¯¤Ê¤Ã¤¿¤è¤¦¤À¡£", m_name);
+#else
+               msg_format("%^s seems weakened.", m_name);
+#endif
+       }
        if (drain_left != MAX_VAMPIRIC_DRAIN)
        {
                if (one_in_(4))

diff --git a/src/defines.h b/src/defines.h
index bebc5db..c7fae8d 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -51,7 +51,7 @@
 #define FAKE_VERSION   0
 #define FAKE_VER_MAJOR 11
 #define FAKE_VER_MINOR 0
-#define FAKE_VER_PATCH 9
+#define FAKE_VER_PATCH 10
 
 #define ANGBAND_2_8_1
 #define ZANGBAND

diff --git a/src/racial.c b/src/racial.c
index e639431..b372317 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -1199,7 +1199,7 @@ msg_print("
                }
                case CLASS_RED_MAGE:
                {
-                       if (racial_aux(48, 60, A_INT, 25))
+                       if (racial_aux(48, 20, A_INT, 0))
                        {
                                handle_stuff();
                                do_cmd_cast();
@@ -2660,8 +2660,8 @@ strcpy(power_desc[num].name, "Ϣ³
 #endif
 
                power_desc[num].level = 48;
-               power_desc[num].cost = 60;
-               power_desc[num].fail = 100 - racial_chance(48, A_INT, 25);
+               power_desc[num].cost = 20;
+               power_desc[num].fail = 100 - racial_chance(48, A_INT, 0);
                power_desc[num++].number = -3;
                break;
        }

diff --git a/src/spells1.c b/src/spells1.c
index f81e6f3..66de972 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -599,6 +599,84 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
        dam = (dam + r) / (r + 1);
 
 
+       if (c_ptr->feat == FEAT_TREES)
+       {
+               cptr message;
+               switch (typ)
+               {
+               case GF_POIS:
+               case GF_NUKE:
+               case GF_DEATH_RAY:
+#ifdef JP
+                       message = "¸Ï¤ì¤¿";break;
+#else
+                       message = "nanka.";break;
+#endif
+               case GF_TIME:
+#ifdef JP
+                       message = "½Ì¤ó¤À";break;
+#else
+                       message = "nanka.";break;
+#endif
+               case GF_ACID:
+#ifdef JP
+                       message = "ÍϤ±¤¿";break;
+#else
+                       message = "melted.";break;
+#endif
+               case GF_COLD:
+               case GF_ICE:
+#ifdef JP
+                       message = "Åà¤ê¡¢ºÕ¤±»¶¤Ã¤¿";break;
+#else
+                       message = "nanka.";break;
+#endif
+               case GF_FIRE:
+               case GF_ELEC:
+               case GF_PLASMA:
+#ifdef JP
+                       message = "dz¤¨¤¿";break;
+#else
+                       message = "burns up!";break;
+#endif
+               case GF_METEOR:
+               case GF_CHAOS:
+               case GF_MANA:
+               case GF_SEEKER:
+               case GF_SUPER_RAY:
+               case GF_SHARDS:
+               case GF_ROCKET:
+               case GF_SOUND:
+               case GF_DISENCHANT:
+               case GF_FORCE:
+               case GF_GRAVITY:
+#ifdef JP
+                       message = "Ê´ºÕ¤µ¤ì¤¿";break;
+#else
+                       message = "was crushed.";break;
+#endif
+               default:
+                       message = NULL;break;
+               }
+               if (message)
+               {
+#ifdef JP
+                       msg_format("ÌÚ¤Ï%s¡£", message);
+#else
+                       msg_format("A tree %s", message);
+#endif
+                       c_ptr->feat = (one_in_(3) ? FEAT_DEEP_GRASS : FEAT_GRASS);
+                       c_ptr->info &= ~(CAVE_MASK);
+                       c_ptr->info |= CAVE_FLOOR;
+
+                       /* Observe */
+                       if (c_ptr->info & (CAVE_MARK)) obvious = TRUE;
+
+                       /* Update some things */
+                       p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
+               }
+       }
+
        /* Analyze the type */
        switch (typ)
        {
@@ -613,9 +691,6 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                case GF_BRAIN_SMASH:
                case GF_DRAIN_MANA:
                case GF_PSY_SPEAR:
-               case GF_ELEC:
-               case GF_COLD:
-               case GF_ICE:
                case GF_FORCE:
                case GF_HOLY_FIRE:
                case GF_HELL_FIRE:
@@ -626,11 +701,10 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                case GF_DOMINATION:
                case GF_IDENTIFY:
                case GF_ATTACK:
-               {
-                       break;
-               }
-
                case GF_ACID:
+               case GF_ELEC:
+               case GF_COLD:
+               case GF_ICE:
                case GF_FIRE:
                case GF_PLASMA:
                case GF_METEOR:
@@ -639,56 +713,6 @@ static bool project_f(int who, int r, int y, int x, int dam, int typ)
                case GF_SEEKER:
                case GF_SUPER_RAY:
                {
-                       cptr message;
-                       if (c_ptr->feat == FEAT_TREES)
-                       {
-                               switch (typ)
-                               {
-                               case GF_ACID:
-#ifdef JP
-                                       message = "ÍϤ±¤¿";break;
-#else
-                                       message = "melted.";break;
-#endif
-                               case GF_FIRE: 
-                               case GF_PLASMA:
-#ifdef JP
-                                       message = "dz¤¨¤¿";break;
-#else
-                                       message = "burns up!";break;
-#endif
-                               case GF_METEOR:
-                               case GF_CHAOS:
-                               case GF_MANA: 
-                               case GF_SEEKER: 
-                               case GF_SUPER_RAY:
-#ifdef JP
-                                       message = "Ê´ºÕ¤µ¤ì¤¿";break;
-#else
-                                       message = "was crushed.";break;
-#endif
-                               default:
-#ifdef JP
-                                       message = "dz¤¨¤¿";break;
-#else
-                                       message = "burns up!";break;
-#endif
-                               }
-#ifdef JP
-                               msg_format("ÌÚ¤Ï%s¡£", message);
-#else
-                               msg_format("A tree %s", message);
-#endif
-                               c_ptr->feat = (one_in_(3) ? FEAT_DEEP_GRASS : FEAT_GRASS);
-                               c_ptr->info &= ~(CAVE_MASK);
-                               c_ptr->info |= CAVE_FLOOR;
-
-                               /* Observe */
-                               if (c_ptr->info & (CAVE_MARK)) obvious = TRUE;
-
-                               /* Update some things */
-                               p_ptr->update |= (PU_VIEW | PU_LITE | PU_MONSTERS | PU_MON_LITE);
-                       }
                        break;
                }
 

diff --git a/src/tables.c b/src/tables.c
index 17c16e0..f30a1c1 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -5908,7 +5908,7 @@ monster_power monster_powers[MAX_MONSPELLS] =
 { 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
 { 40,  35,  85,    0,  40, A_INT,  "ËâÎϾõî"},
 { 35,  30,  80,  800,  70, A_STR,  "¥í¥±¥Ã¥È"},
-{  5,   2,  20,   18,  15, A_DEX,  "¼Í·â"},
+{  5,   1,  20,   18,  15, A_DEX,  "¼Í·â"},
 { 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
 { 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},
 { 10,   4,  35,   89,  40, A_INT,  "²¿¤«"},