- スターダストでproject(-1, ...)で落ちてたので修正。

- table.cの呪文名英語版書いた。
- 破邪の英語名とりあえずCrusade。
- 神の怒りのターゲットが永久岩の向こうに指定できたのを修正。
- クラスパワーの種類の判定がrealm==REALM_LIFEだったので、
  is_good_realm()という判定マクロを書いておきかえ。
- パラディンが魔法書を壊したときの判定もis_good_realm()を流用して修正。

diff --git a/src/birth.c b/src/birth.c
index 5c75d2d..393fce3 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -2056,11 +2056,11 @@ static byte choose_realm(s32b choices, int *count)
        {
                if (p_ptr->pclass == CLASS_PRIEST)
                {
-                       if ((p_ptr->realm1 == REALM_LIFE) || (p_ptr->realm1 == REALM_HAJA))
+                       if (is_good_realm(p_ptr->realm1))
                        {
                                choices &= ~(CH_DEATH | CH_DAEMON);
                        }
-                       else if ((p_ptr->realm1 == REALM_DEATH) || (p_ptr->realm1 == REALM_DAEMON))
+                       else
                        {
                                choices &= ~(CH_LIFE | CH_HAJA);
                        }

diff --git a/src/cmd3.c b/src/cmd3.c
index c3a4926..8c16012 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -1069,13 +1069,13 @@ void do_cmd_destroy(void)
                }
                else if (p_ptr->pclass == CLASS_PALADIN)
                {
-                       if (p_ptr->realm1 == REALM_LIFE)
+                       if (is_good_realm(p_ptr->realm1))
                        {
-                               if (q_ptr->tval != TV_LIFE_BOOK) gain_expr = TRUE;
+                               if (!is_good_realm(tval2realm(q_ptr->tval))) gain_expr = TRUE;
                        }
                        else
                        {
-                               if (q_ptr->tval == TV_LIFE_BOOK) gain_expr = TRUE;
+                               if (is_good_realm(tval2realm(q_ptr->tval))) gain_expr = TRUE;
                        }
                }
 

diff --git a/src/cmd5.c b/src/cmd5.c
index deb3991..9a5d2e2 100644 (file)
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -361,11 +361,11 @@ static bool item_tester_learn_spell(object_type *o_ptr)
 
        if (p_ptr->pclass == CLASS_PRIEST)
        {
-               if ((p_ptr->realm1 == REALM_LIFE) || (p_ptr->realm1 == REALM_HAJA))
+               if (is_good_realm(p_ptr->realm1))
                {
                        choices &= ~(CH_DEATH | CH_DAEMON);
                }
-               else if ((p_ptr->realm1 == REALM_DEATH) || (p_ptr->realm1 == REALM_DAEMON))
+               else
                {
                        choices &= ~(CH_LIFE | CH_HAJA);
                }
@@ -4160,13 +4160,7 @@ msg_print("
                        ty = py;
 
                        /* Hack -- Use an actual "target" */
-                       if ((dir == 5) && target_okay())
-                       {
-                               tx = target_col;
-                               ty = target_row;
-                       }
-                       else
-                       {
+                       if (dir != 5) {
                                while(1)
                                {
                                        tx += ddx[dir];
@@ -4174,6 +4168,13 @@ msg_print("
                                        if (!cave_floor_bold(ty,tx) || !player_has_los_bold(ty, tx) || cave[ty][tx].m_idx) break;
                                }
                        }
+                       else if (target_okay() &&
+                                in_disintegration_range(py, px, target_row, target_col))
+                       {
+                               tx = target_col;
+                               ty = target_row;
+                       }
+
 
                        for (i = 0; i < b; i++)
                        {

diff --git a/src/defines.h b/src/defines.h
index 39a4cd2..a65ebf1 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -696,6 +696,7 @@
 #define is_magic(A) ((A) < MAX_MAGIC + 1 ? TRUE : FALSE)
 #define tval2realm(A) ((A) - TV_LIFE_BOOK + 1)
 #define technic2magic(A)      (is_magic(A) ? (A) : (A) - MIN_TECHNIC + MAX_MAGIC)
+#define is_good_realm(REALM)   ((REALM) == REALM_LIFE || (REALM) == REALM_HAJA)
 
 /*
  * Magic-books for the realms

diff --git a/src/flavor.c b/src/flavor.c
index 56768b8..8e0664f 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -1586,9 +1586,9 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
                                basenm = "& Ç˼٤ÎËâË¡½ñ#";
 #else
                        if (mp_ptr->spell_book == TV_LIFE_BOOK)
-                               basenm = "& Book~ of nanka Magic #";
+                               basenm = "& Book~ of Crusade Magic #";
                        else
-                               basenm = "& nanka Spellbook~ #";
+                               basenm = "& Crusade Spellbook~ #";
 #endif
 
                        break;

diff --git a/src/melee1.c b/src/melee1.c
index c827865..c1390f0 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -2280,7 +2280,16 @@ msg_format("%^s
 
        if (p_ptr->tim_eyeeye && get_damage > 0 && !death)
        {
+#ifdef JP
                msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", m_name);
+#else
+               char m_name_self[80];
+               
+               /* hisself */
+               monster_desc(m_name_self, m_ptr, 0x23);
+
+               msg_format("The attack of %s has wounded %s!", m_name, m_name_self);
+#endif
                project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL | PROJECT_NO_REF, -1);
                set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE);
        }

diff --git a/src/racial.c b/src/racial.c
index ff87b92..478f7cc 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -869,7 +869,7 @@ msg_print("
                }
                case CLASS_PRIEST:
                {
-                       if (p_ptr->realm1 == REALM_LIFE)
+                       if (is_good_realm(p_ptr->realm1))
                        {
                                if (racial_aux(35, 70, A_WIS, 50))
                                {
@@ -936,7 +936,7 @@ msg_print("Ũ
                }
                case CLASS_PALADIN:
                {
-                       if (p_ptr->realm1 == REALM_LIFE)
+                       if (is_good_realm(p_ptr->realm1))
                        {
                                if (racial_aux(30, 30, A_WIS, 20))
                                {
@@ -2403,7 +2403,7 @@ strcpy(power_desc[num].name, "
        }
        case CLASS_PRIEST:
        {
-               if (p_ptr->realm1 == REALM_LIFE)
+               if (is_good_realm(p_ptr->realm1))
                {
 #ifdef JP
 strcpy(power_desc[num].name, "Éð´ï½ËÊ¡");
@@ -2461,7 +2461,7 @@ strcpy(power_desc[num].name, "
        }
        case CLASS_PALADIN:
        {
-               if (p_ptr->realm1 == REALM_LIFE)
+               if (is_good_realm(p_ptr->realm1))
                {
 #ifdef JP
 strcpy(power_desc[num].name, "¥Û¡¼¥ê¡¼¡¦¥é¥ó¥¹");

diff --git a/src/spells1.c b/src/spells1.c
index 447e737..8a8124c 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -7391,7 +7391,16 @@ if (fuzzy) msg_print("
 
        if (p_ptr->tim_eyeeye && get_damage > 0 && !death)
        {
-               msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", who_name);
+#ifdef JP
+               msg_format("¹¶·â¤¬%s¼«¿È¤ò½ý¤Ä¤±¤¿¡ª", m_name);
+#else
+               char m_name_self[80];
+               
+               /* hisself */
+               monster_desc(m_name_self, m_ptr, 0x23);
+
+               msg_format("The attack of %s has wounded %s!", m_name, m_name_self);
+#endif
                project(0, 0, m_ptr->fy, m_ptr->fx, get_damage, GF_MISSILE, PROJECT_KILL | PROJECT_NO_REF, -1);
                set_tim_eyeeye(p_ptr->tim_eyeeye-5, TRUE);
        }

diff --git a/src/spells2.c b/src/spells2.c
index 7f6c2c3..396e11a 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -598,7 +598,7 @@ info[i++] = "
                        }
                        break;
                case CLASS_PRIEST:
-                       if (p_ptr->realm1 == REALM_LIFE)
+                       if (is_good_realm(p_ptr->realm1))
                        {
                                if (plev > 34)
                                {
@@ -642,7 +642,7 @@ info[i++] = "
                        }
                        break;
                case CLASS_PALADIN:
-                       if (p_ptr->realm1 == REALM_LIFE)
+                       if (is_good_realm(p_ptr->realm1))
                        {
                                if (plev > 29)
                                {
@@ -6329,7 +6329,7 @@ bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev)
                }
 
                /* Analyze the "dir" and the "target". */
-               if (!project(-1, 0, y, x, damroll(dd, ds), typ, flg, -1))
+               if (!project(0, 0, y, x, damroll(dd, ds), typ, flg, -1))
                {
                        result = FALSE;
                }

diff --git a/src/tables.c b/src/tables.c
index 8389888..9fd7833 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -5011,47 +5011,46 @@ cptr spell_names[VALID_REALM][32] =
                "Polymorph Demonlord",
        },
 
-       /*** nanka Spells ***/
+       /*** Crusade Spells ***/
 
        {
-               /* Common nanka Spellbooks */
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
+               /* Common Crusade Spellbooks */
+               "Zap",
+               "Detect Evil",
+               "Bless",
+               "Remove Fear",
+               "Scare Monster",
+               "Sanctuary",
+               "Portal",
+               "Star Dust",
 
-               /* Rare nanka Spellbooks */
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
-               "",
+               "Purify",
+               "Scatter Evil",
+               "Exorcism",
+               "Holy Orb",
+               "Sense Unseen",
+               "Protection from Evil",
+               "Judgment Thunder",
+               "Warding True",
 
+               /* Rare Crusade Spellbooks */
+               "Unbarring Ways",
+               "Remove Curse",
+               "Holy Aura",
+               "Dispel Undead & Demons",
+               "Dispel Evil",
+               "Holy Blade",
+               "Star Burst",
+               "Summon Angel",
+
+               "Heroism",
+               "Dispel Curse",
+               "Banish Evil",
+               "Armageddon",
+               "An Eye for an Eye",
+               "Wrath of the God",
+               "Divine Intervention",
+               "Crusade",
        },
 
        /*** Music Spells ***/

diff --git a/src/wizard1.c b/src/wizard1.c
index b9a4fb9..862e57f 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -193,7 +193,7 @@ static grouper group_item[] =
        { TV_ARCANE_BOOK,   "Books (Arcane)" },
        { TV_ENCHANT_BOOK,  "Books (Craft)" },
        { TV_DAEMON_BOOK,   "Books (Daemon)" },
-       { TV_HAJA_BOOK,     "Books (nanka)" },
+       { TV_HAJA_BOOK,     "Books (Crusade)" },
        { TV_MUSIC_BOOK,    "Song Books" },
        { TV_HISSATSU_BOOK, "Books (Kendo)" },
 #endif

diff --git a/src/wizard2.c b/src/wizard2.c
index de66e60..84bb2db 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -642,7 +642,7 @@ static tval_desc tvals[] =
        { TV_ARCANE_BOOK,       "Arcane Spellbook"     },
        { TV_ENCHANT_BOOK,      "Craft Spellbook"},
        { TV_DAEMON_BOOK,       "Daemon Spellbook"},
-       { TV_HAJA_BOOK,         "nanka Spellbook"},
+       { TV_HAJA_BOOK,         "Crusade Spellbook"},
        { TV_MUSIC_BOOK,        "Music Spellbook"      },
        { TV_HISSATSU_BOOK,     "Book of Kendo" },
        { TV_PARCHEMENT,        "Parchement" },