From 432bff4cc1fd59c17b34233593ae61c385b471d5 Mon Sep 17 00:00:00 2001 From: mogami Date: Mon, 20 May 2002 17:06:37 +0000 Subject: [PATCH] =?utf8?q?-=20=E3=82=B9=E3=82=BF=E3=83=BC=E3=83=80?= =?utf8?q?=E3=82=B9=E3=83=88=E3=81=A7project(-1,=20...)=E3=81=A7=E8=90=BD?= =?utf8?q?=E3=81=A1=E3=81=A6=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= =?utf8?q?=E3=80=82=20-=20table.c=E3=81=AE=E5=91=AA=E6=96=87=E5=90=8D?= =?utf8?q?=E8=8B=B1=E8=AA=9E=E7=89=88=E6=9B=B8=E3=81=84=E3=81=9F=E3=80=82?= =?utf8?q?=20-=20=E7=A0=B4=E9=82=AA=E3=81=AE=E8=8B=B1=E8=AA=9E=E5=90=8D?= =?utf8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88=E3=81=9ACrusade=E3=80=82=20?= =?utf8?q?-=20=E7=A5=9E=E3=81=AE=E6=80=92=E3=82=8A=E3=81=AE=E3=82=BF?= =?utf8?q?=E3=83=BC=E3=82=B2=E3=83=83=E3=83=88=E3=81=8C=E6=B0=B8=E4=B9=85?= =?utf8?q?=E5=B2=A9=E3=81=AE=E5=90=91=E3=81=93=E3=81=86=E3=81=AB=E6=8C=87?= =?utf8?q?=E5=AE=9A=E3=81=A7=E3=81=8D=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=80=82=20-=20=E3=82=AF=E3=83=A9=E3=82=B9=E3=83=91?= =?utf8?q?=E3=83=AF=E3=83=BC=E3=81=AE=E7=A8=AE=E9=A1=9E=E3=81=AE=E5=88=A4?= =?utf8?q?=E5=AE=9A=E3=81=8Crealm=3D=3DREALM=5FLIFE=E3=81=A0=E3=81=A3?= =?utf8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=81=20=20=20is=5Fgood=5Frealm()?= =?utf8?q?=E3=81=A8=E3=81=84=E3=81=86=E5=88=A4=E5=AE=9A=E3=83=9E=E3=82=AF?= =?utf8?q?=E3=83=AD=E3=82=92=E6=9B=B8=E3=81=84=E3=81=A6=E3=81=8A=E3=81=8D?= =?utf8?q?=E3=81=8B=E3=81=88=E3=80=82=20-=20=E3=83=91=E3=83=A9=E3=83=87?= =?utf8?q?=E3=82=A3=E3=83=B3=E3=81=8C=E9=AD=94=E6=B3=95=E6=9B=B8=E3=82=92?= =?utf8?q?=E5=A3=8A=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AE=E5=88=A4?= =?utf8?q?=E5=AE=9A=E3=82=82is=5Fgood=5Frealm()=E3=82=92=E6=B5=81=E7=94=A8?= =?utf8?q?=E3=81=97=E3=81=A6=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/birth.c | 4 ++-- src/cmd3.c | 6 ++--- src/cmd5.c | 19 ++++++++-------- src/defines.h | 1 + src/flavor.c | 4 ++-- src/melee1.c | 9 ++++++++ src/racial.c | 8 +++---- src/spells1.c | 11 ++++++++- src/spells2.c | 6 ++--- src/tables.c | 73 +++++++++++++++++++++++++++++------------------------------ src/wizard1.c | 2 +- src/wizard2.c | 2 +- 12 files changed, 82 insertions(+), 63 deletions(-) diff --git a/src/birth.c b/src/birth.c index 5c75d2d88..393fce3b9 100644 --- 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 c3a492661..8c1601288 100644 --- 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 deb3991d3..9a5d2e291 100644 --- 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 39a4cd200..a65ebf10d 100644 --- 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 56768b866..8e0664f62 100644 --- 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 c82786564..c1390f043 100644 --- 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 ff87b9243..478f7cc1b 100644 --- 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 447e73793..8a8124c91 100644 --- 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 7f6c2c336..396e11ab7 100644 --- 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 838988860..9fd7833f9 100644 --- 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 b9a4fb90f..862e57f7c 100644 --- 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 de66e6057..84bb2dbfd 100644 --- 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" }, -- 2.11.0