From 6f043f91429d641411879406c014eca7961eaee7 Mon Sep 17 00:00:00 2001 From: mogami Date: Mon, 27 May 2002 15:27:44 +0000 Subject: [PATCH] =?utf8?q?haja=20->=20crusade=20=EF=BD=B8=EF=BD=A1?= =?utf8?q?=EF=BD=BA=EE=96=A6=EF=BE=96=EF=BD=B4=EF=BD=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/edit/m_info_j.txt | 54 +++++++++++++++++++++++++-------------------------- src/avatar.c | 4 ++-- src/birth.c | 6 +++--- src/cmd3.c | 2 +- src/cmd5.c | 16 +++++++-------- src/defines.h | 8 ++++---- src/flavor.c | 6 +++--- src/init2.c | 8 ++++---- src/object2.c | 2 +- src/spells2.c | 2 +- src/spells3.c | 6 +++--- src/store.c | 4 ++-- src/tables.c | 16 +++++++-------- src/wizard1.c | 4 ++-- src/wizard2.c | 2 +- src/xtra2.c | 4 ++-- 16 files changed, 72 insertions(+), 72 deletions(-) diff --git a/lib/edit/m_info_j.txt b/lib/edit/m_info_j.txt index 299994b0f..d00f456a5 100644 --- a/lib/edit/m_info_j.txt +++ b/lib/edit/m_info_j.txt @@ -34,7 +34,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -356,7 +356,7 @@ T:45:58:85:200 T:47:85:80:200 T:49:80:85:250 -# Haja +# Crusade R:9:1 T:1:1:20:4 #0 T:2:1:15:4 @@ -710,7 +710,7 @@ T:47:60:90:150 T:49:95:80:200 T:50:80:85:250 -# Haja +# Crusade R:9:1 T:1:1:20:4 #0 T:1:1:10:4 @@ -936,7 +936,7 @@ T:99:0:0:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -1194,7 +1194,7 @@ T:99:0:0:0 T:99:0:0:0 T:99:0:0:0 -# Haja +# Crusade R:9:0 @@ -1260,7 +1260,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:1 T:1:1:20:4 #0 T:3:1:30:4 @@ -1614,7 +1614,7 @@ T:49:60:80:200 T:50:105:80:200 T:50:80:85:250 -# Haja +# Crusade R:9:1 T:2:1:20:4 #0 T:4:2:30:4 @@ -1744,7 +1744,7 @@ T:45:58:80:200 T:48:105:80:200 T:49:80:85:250 -# Haja +# Crusade R:9:0 @@ -1906,7 +1906,7 @@ T:50:100:90:250 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -1940,7 +1940,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -2262,7 +2262,7 @@ T:40:53:70:200 T:43:75:70:200 T:46:70:75:250 -# Haja +# Crusade R:9:1 T:1:1:15:4 #0 T:1:1:10:4 @@ -2360,7 +2360,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -2394,7 +2394,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -2460,7 +2460,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -2782,7 +2782,7 @@ T:45:58:85:200 T:47:85:80:200 T:49:80:85:250 -# Haja +# Crusade R:9:1 T:1:1:20:4 #0 T:2:1:15:4 @@ -2847,7 +2847,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -2881,7 +2881,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -2915,7 +2915,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3237,7 +3237,7 @@ T:99:0:0:0 T:99:0:0:0 T:99:0:0:0 -# Haja +# Crusade R:9:1 T:2:1:20:4 #0 T:3:3:30:4 @@ -3303,7 +3303,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3465,7 +3465,7 @@ T:50:75:90:250 # Deamon R:8:0 -# Haja +# Crusade R:9:1 T:1:1:20:4 #0 T:3:1:30:4 @@ -3531,7 +3531,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3565,7 +3565,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3599,7 +3599,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3633,7 +3633,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3667,7 +3667,7 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 @@ -3701,5 +3701,5 @@ R:7:0 # Deamon R:8:0 -# Haja +# Crusade R:9:0 diff --git a/src/avatar.c b/src/avatar.c index cca9ec31e..f33ff631c 100644 --- a/src/avatar.c +++ b/src/avatar.c @@ -445,7 +445,7 @@ void get_virtues() p_ptr->vir_types[i++] = V_FAITH; else p_ptr->vir_types[i++] = V_JUSTICE; break; - case REALM_HAJA: + case REALM_CRUSADE: if (virtue_number(V_JUSTICE)) p_ptr->vir_types[i++] = V_HONOUR; else p_ptr->vir_types[i++] = V_JUSTICE; @@ -497,7 +497,7 @@ void get_virtues() p_ptr->vir_types[i++] = V_FAITH; else p_ptr->vir_types[i++] = V_JUSTICE; break; - case REALM_HAJA: + case REALM_CRUSADE: if (virtue_number(V_JUSTICE)) p_ptr->vir_types[i++] = V_HONOUR; else p_ptr->vir_types[i++] = V_JUSTICE; diff --git a/src/birth.c b/src/birth.c index 6a513f526..e147247dd 100644 --- a/src/birth.c +++ b/src/birth.c @@ -2030,10 +2030,10 @@ static byte choose_realm(s32b choices, int *count) (*count)++; auto_select = REALM_DAEMON; } - if (choices & CH_HAJA) + if (choices & CH_CRUSADE) { (*count)++; - auto_select = REALM_HAJA; + auto_select = REALM_CRUSADE; } if (choices & CH_MUSIC) { @@ -2062,7 +2062,7 @@ static byte choose_realm(s32b choices, int *count) } else { - choices &= ~(CH_LIFE | CH_HAJA); + choices &= ~(CH_LIFE | CH_CRUSADE); } } } diff --git a/src/cmd3.c b/src/cmd3.c index 8c1601288..2480e4e54 100644 --- a/src/cmd3.c +++ b/src/cmd3.c @@ -908,7 +908,7 @@ static bool high_level_book(object_type *o_ptr) (o_ptr->tval == TV_TRUMP_BOOK) || (o_ptr->tval == TV_ENCHANT_BOOK) || (o_ptr->tval == TV_DAEMON_BOOK) || - (o_ptr->tval == TV_HAJA_BOOK) || + (o_ptr->tval == TV_CRUSADE_BOOK) || (o_ptr->tval == TV_MUSIC_BOOK)) { if (o_ptr->sval > 1) diff --git a/src/cmd5.c b/src/cmd5.c index a70bdc3ad..69b191461 100644 --- a/src/cmd5.c +++ b/src/cmd5.c @@ -367,7 +367,7 @@ static bool item_tester_learn_spell(object_type *o_ptr) } else { - choices &= ~(CH_LIFE | CH_HAJA); + choices &= ~(CH_LIFE | CH_CRUSADE); } } @@ -3938,7 +3938,7 @@ take_hit(DAMAGE_USELIFE, 20 + randint1(30), " } -static bool cast_haja_spell(int spell) +static bool cast_crusade_spell(int spell) { int dir; int beam; @@ -4918,7 +4918,7 @@ msg_format("%s if (randint1(100) < chance) chg_virtue(V_JUSTICE, 1); } - if (realm == REALM_HAJA) + if (realm == REALM_CRUSADE) { if (randint1(100) < chance) chg_virtue(V_JUSTICE, -1); @@ -5013,8 +5013,8 @@ msg_print("An infernal sound echoed."); case REALM_DAEMON: /* DAEMON */ cast = cast_daemon_spell(spell); break; - case REALM_HAJA: /* HAJA */ - cast = cast_haja_spell(spell); + case REALM_CRUSADE: /* CRUSADE */ + cast = cast_crusade_spell(spell); break; case REALM_MUSIC: /* MUSIC */ cast = cast_music_spell(spell); @@ -5074,7 +5074,7 @@ msg_print("An infernal sound echoed."); chg_virtue(V_HONOUR, -1); chg_virtue(V_TEMPERANCE, -1); } - else if (realm == REALM_HAJA) + else if (realm == REALM_CRUSADE) { chg_virtue(V_FAITH, 1); chg_virtue(V_JUSTICE, 1); @@ -5110,7 +5110,7 @@ msg_print("An infernal sound echoed."); if (randint1(100 + p_ptr->lev) < shouhimana) chg_virtue(V_HONOUR, -1); if (randint1(100 + p_ptr->lev) < shouhimana) chg_virtue(V_TEMPERANCE, -1); } - else if (realm == REALM_HAJA) + else if (realm == REALM_CRUSADE) { if (randint1(100 + p_ptr->lev) < shouhimana) chg_virtue(V_FAITH, 1); if (randint1(100 + p_ptr->lev) < shouhimana) chg_virtue(V_JUSTICE, 1); @@ -5173,7 +5173,7 @@ msg_print(" chg_virtue(V_JUSTICE, 10); else if (realm == REALM_NATURE) chg_virtue(V_NATURE, -10); - else if (realm == REALM_HAJA) + else if (realm == REALM_CRUSADE) chg_virtue(V_JUSTICE, -10); else chg_virtue(V_KNOWLEDGE, -10); diff --git a/src/defines.h b/src/defines.h index 8058341d4..113874939 100644 --- a/src/defines.h +++ b/src/defines.h @@ -664,7 +664,7 @@ #define CH_ARCANE 0x40 #define CH_ENCHANT 0x80 #define CH_DAEMON 0x100 -#define CH_HAJA 0x200 +#define CH_CRUSADE 0x200 #define CH_MUSIC 0x10000 #define CH_HISSATSU 0x20000 @@ -683,7 +683,7 @@ #define REALM_ARCANE 7 #define REALM_ENCHANT 8 #define REALM_DAEMON 9 -#define REALM_HAJA 10 +#define REALM_CRUSADE 10 #define MAX_MAGIC 10 #define MIN_TECHNIC 15 #define REALM_MUSIC 16 @@ -696,7 +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) +#define is_good_realm(REALM) ((REALM) == REALM_LIFE || (REALM) == REALM_CRUSADE) /* * Magic-books for the realms @@ -1718,7 +1718,7 @@ #define TV_ARCANE_BOOK 96 #define TV_ENCHANT_BOOK 97 #define TV_DAEMON_BOOK 98 -#define TV_HAJA_BOOK 99 +#define TV_CRUSADE_BOOK 99 #define TV_MUSIC_BOOK 105 #define TV_HISSATSU_BOOK 106 #define TV_GOLD 127 /* Gold can only be picked up by players */ diff --git a/src/flavor.c b/src/flavor.c index 8e0664f62..bc337cdc3 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -399,7 +399,7 @@ static bool object_easy_know(int i) case TV_ARCANE_BOOK: case TV_ENCHANT_BOOK: case TV_DAEMON_BOOK: - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: { @@ -909,7 +909,7 @@ extern char *object_desc_kosuu(char *t, object_type *o_ptr) case TV_ARCANE_BOOK: case TV_ENCHANT_BOOK: case TV_DAEMON_BOOK: - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: { @@ -1579,7 +1579,7 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode) break; } - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: { modstr = basenm; #ifdef JP diff --git a/src/init2.c b/src/init2.c index 4b814f4f6..a1b9e327a 100644 --- a/src/init2.c +++ b/src/init2.c @@ -1064,10 +1064,10 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] = { TV_LIFE_BOOK, 1 }, { TV_LIFE_BOOK, 1 }, - { TV_HAJA_BOOK, 0 }, - { TV_HAJA_BOOK, 0 }, - { TV_HAJA_BOOK, 1 }, - { TV_HAJA_BOOK, 1 }, + { TV_CRUSADE_BOOK, 0 }, + { TV_CRUSADE_BOOK, 0 }, + { TV_CRUSADE_BOOK, 1 }, + { TV_CRUSADE_BOOK, 1 }, { TV_HAFTED, SV_WHIP }, { TV_HAFTED, SV_MACE }, diff --git a/src/object2.c b/src/object2.c index f11d589b2..da75246c2 100644 --- a/src/object2.c +++ b/src/object2.c @@ -4420,7 +4420,7 @@ static bool kind_is_good(int k_idx) case TV_TRUMP_BOOK: case TV_ENCHANT_BOOK: case TV_DAEMON_BOOK: - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: { diff --git a/src/spells2.c b/src/spells2.c index 17f9b23a0..ca0cc65ca 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -3785,7 +3785,7 @@ bool detect_objects_magic(int range) (tv == TV_ARCANE_BOOK) || (tv == TV_ENCHANT_BOOK) || (tv == TV_DAEMON_BOOK) || - (tv == TV_HAJA_BOOK) || + (tv == TV_CRUSADE_BOOK) || (tv == TV_MUSIC_BOOK) || (tv == TV_HISSATSU_BOOK) || ((o_ptr->to_a > 0) || (o_ptr->to_h + o_ptr->to_d > 0))) diff --git a/src/spells3.c b/src/spells3.c index bbc0c55a4..22a75b590 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -3986,7 +3986,7 @@ s16b spell_chance(int spell, int realm) else if (p_ptr->dec_mana) chance-=2; if ((realm+1 == REALM_NATURE) && ((p_ptr->align > 50) || (p_ptr->align < -50))) chance += penalty; - if (((realm+1 == REALM_LIFE) || (realm+1 == REALM_HAJA)) && (p_ptr->align < -20)) chance += penalty; + if (((realm+1 == REALM_LIFE) || (realm+1 == REALM_CRUSADE)) && (p_ptr->align < -20)) chance += penalty; if (((realm+1 == REALM_DEATH) || (realm+1 == REALM_DAEMON)) && (p_ptr->align > 20)) chance += penalty; /* Minimum failure rate */ @@ -4332,7 +4332,7 @@ static void spell_info(char *p, int spell, int realm) } break; - case 9: /* Haja */ + case 9: /* Crusade */ switch (spell) { case 0: sprintf(p, " %s%dd4", s_dam, 3 + ((plev - 1) / 5)); break; @@ -4739,7 +4739,7 @@ bool hates_fire(object_type *o_ptr) case TV_ARCANE_BOOK: case TV_ENCHANT_BOOK: case TV_DAEMON_BOOK: - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: { diff --git a/src/store.c b/src/store.c index 018e230e0..0c8569e56 100644 --- a/src/store.c +++ b/src/store.c @@ -1005,7 +1005,7 @@ static void mass_produce(object_type *o_ptr) case TV_ARCANE_BOOK: case TV_ENCHANT_BOOK: case TV_DAEMON_BOOK: - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: case TV_MUSIC_BOOK: case TV_HISSATSU_BOOK: { @@ -1385,7 +1385,7 @@ static bool store_will_buy(object_type *o_ptr) switch (o_ptr->tval) { case TV_LIFE_BOOK: - case TV_HAJA_BOOK: + case TV_CRUSADE_BOOK: case TV_SCROLL: case TV_POTION: case TV_HAFTED: diff --git a/src/tables.c b/src/tables.c index 40a0bba8a..223c33679 100644 --- a/src/tables.c +++ b/src/tables.c @@ -3984,13 +3984,13 @@ s32b realm_choices1[] = (CH_LIFE | CH_SORCERY | CH_NATURE | CH_CHAOS | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_ENCHANT | CH_DAEMON | - CH_HAJA), /* Mage */ + CH_CRUSADE), /* Mage */ (CH_LIFE | CH_DEATH | CH_DAEMON | - CH_HAJA), /* Priest */ + CH_CRUSADE), /* Priest */ (CH_SORCERY | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_ENCHANT), /* Rogue */ (CH_NATURE), /* Ranger */ - (CH_HAJA | CH_DEATH), /* Paladin */ + (CH_CRUSADE | CH_DEATH), /* Paladin */ (CH_ARCANE), /* Warrior-Mage */ (CH_CHAOS | CH_DAEMON), /* Chaos-Warrior */ (CH_LIFE | CH_NATURE | CH_DEATH | @@ -3999,7 +3999,7 @@ s32b realm_choices1[] = (CH_LIFE | CH_SORCERY | CH_NATURE | CH_CHAOS | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_ENCHANT | CH_DAEMON | - CH_HAJA), /* High-Mage */ + CH_CRUSADE), /* High-Mage */ (CH_ARCANE), /* Tourist */ (CH_NONE), /* Imitation */ (CH_TRUMP), /* Beastmaster */ @@ -4010,7 +4010,7 @@ s32b realm_choices1[] = (CH_NONE), /* Red Mage */ (CH_HISSATSU), /* Samurai */ (CH_LIFE | CH_NATURE | CH_DEATH | - CH_ENCHANT | CH_HAJA), /* ForceTrainer */ + CH_ENCHANT | CH_CRUSADE), /* ForceTrainer */ (CH_NONE), /* Blue Mage */ (CH_NONE), /* Kihei */ (CH_NONE), /* Berserker */ @@ -4025,11 +4025,11 @@ s32b realm_choices2[] = (CH_LIFE | CH_SORCERY | CH_NATURE | CH_CHAOS | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_ENCHANT | CH_DAEMON | - CH_HAJA), /* Mage */ + CH_CRUSADE), /* Mage */ (CH_LIFE | CH_SORCERY | CH_NATURE | CH_CHAOS | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_ENCHANT | CH_DAEMON | - CH_HAJA), /* Priest */ + CH_CRUSADE), /* Priest */ (CH_NONE), /* Rogue */ (CH_SORCERY | CH_CHAOS | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_DAEMON), /* Ranger */ @@ -4037,7 +4037,7 @@ s32b realm_choices2[] = (CH_LIFE | CH_NATURE | CH_CHAOS | CH_DEATH | CH_TRUMP | CH_ARCANE | CH_SORCERY | CH_ENCHANT | CH_DAEMON | - CH_HAJA), /* Warrior-Mage */ + CH_CRUSADE), /* Warrior-Mage */ (CH_NONE), /* Chaos-Warrior */ (CH_NONE), /* Monk */ (CH_NONE), /* Mindcrafter */ diff --git a/src/wizard1.c b/src/wizard1.c index 862e57f7c..566c6ae6f 100644 --- a/src/wizard1.c +++ b/src/wizard1.c @@ -180,7 +180,7 @@ static grouper group_item[] = { TV_ARCANE_BOOK, "ËâË¡½ñ¡ÊÈë½Ñ¡Ë" }, { TV_ENCHANT_BOOK, "ËâË¡½ñ¡Ê¾¢¡Ë" }, { TV_DAEMON_BOOK, "ËâË¡½ñ¡Ê°­Ëâ¡Ë" }, -{ TV_HAJA_BOOK, "ËâË¡½ñ¡ÊÇ˼١Ë" }, +{ TV_CRUSADE_BOOK, "ËâË¡½ñ¡ÊÇ˼١Ë" }, { TV_MUSIC_BOOK, "²Î½¸" }, { TV_HISSATSU_BOOK, "Éð·Ý¤Î½ñ" }, #else @@ -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 (Crusade)" }, + { TV_CRUSADE_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 887f5b6dc..8e4989e4e 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, "Crusade Spellbook"}, + { TV_CRUSADE_BOOK, "Crusade Spellbook"}, { TV_MUSIC_BOOK, "Music Spellbook" }, { TV_HISSATSU_BOOK, "Book of Kendo" }, { TV_PARCHEMENT, "Parchement" }, diff --git a/src/xtra2.c b/src/xtra2.c index fcf5733ea..97aa9d34d 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -319,7 +319,7 @@ static bool kind_is_book(int k_idx) object_kind *k_ptr = &k_info[k_idx]; /* Analyze the item type */ - if ((k_ptr->tval >= TV_LIFE_BOOK) && (k_ptr->tval <= TV_HAJA_BOOK)) + if ((k_ptr->tval >= TV_LIFE_BOOK) && (k_ptr->tval <= TV_CRUSADE_BOOK)) { return (TRUE); } @@ -337,7 +337,7 @@ static bool kind_is_good_book(int k_idx) object_kind *k_ptr = &k_info[k_idx]; /* Analyze the item type */ - if ((k_ptr->tval >= TV_LIFE_BOOK) && (k_ptr->tval <= TV_HAJA_BOOK) && (k_ptr->tval != TV_ARCANE_BOOK) && (k_ptr->sval > 1)) + if ((k_ptr->tval >= TV_LIFE_BOOK) && (k_ptr->tval <= TV_CRUSADE_BOOK) && (k_ptr->tval != TV_ARCANE_BOOK) && (k_ptr->sval > 1)) { return (TRUE); } -- 2.11.0