･ﾞ･ｯ･﨓ｾﾊﾑｹｹ｡｣ENCHANT｢ｪCRAFT

diff --git a/src/avatar.c b/src/avatar.c
index 5ef28a1..e363fe7 100644 (file)
--- a/src/avatar.c
+++ b/src/avatar.c
@@ -172,7 +172,7 @@ static s16b get_realm_virtues(byte realm)
                return V_KNOWLEDGE;
        case REALM_ARCANE:
                return 0;
-       case REALM_ENCHANT:
+       case REALM_CRAFT:
                if (virtue_number(V_ENCHANT)) return V_INDIVIDUALISM;
                else return V_ENCHANT;
        case REALM_DAEMON:

diff --git a/src/birth.c b/src/birth.c
index 89f0631..20d350b 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -2124,7 +2124,7 @@ static byte choose_realm(s32b choices, int *count)
        if (choices & CH_ENCHANT)
        {
                (*count)++;
-               auto_select = REALM_ENCHANT;
+               auto_select = REALM_CRAFT;
        }
        if (choices & CH_DAEMON)
        {

diff --git a/src/cmd3.c b/src/cmd3.c
index 4d7844d..9bf5035 100644 (file)
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -920,7 +920,7 @@ static bool high_level_book(object_type *o_ptr)
            (o_ptr->tval == TV_CHAOS_BOOK) ||
            (o_ptr->tval == TV_DEATH_BOOK) ||
            (o_ptr->tval == TV_TRUMP_BOOK) ||
-           (o_ptr->tval == TV_ENCHANT_BOOK) ||
+           (o_ptr->tval == TV_CRAFT_BOOK) ||
            (o_ptr->tval == TV_DAEMON_BOOK) ||
            (o_ptr->tval == TV_CRUSADE_BOOK) ||
            (o_ptr->tval == TV_MUSIC_BOOK))

diff --git a/src/defines.h b/src/defines.h
index 2251db7..fc0a16c 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -732,7 +732,7 @@
 #define REALM_DEATH        5
 #define REALM_TRUMP        6
 #define REALM_ARCANE       7
-#define REALM_ENCHANT      8
+#define REALM_CRAFT      8
 #define REALM_DAEMON       9
 #define REALM_CRUSADE      10
 #define MAX_MAGIC          10
@@ -1982,7 +1982,7 @@
 #define TV_DEATH_BOOK   94
 #define TV_TRUMP_BOOK   95
 #define TV_ARCANE_BOOK  96
-#define TV_ENCHANT_BOOK 97
+#define TV_CRAFT_BOOK 97
 #define TV_DAEMON_BOOK  98
 #define TV_CRUSADE_BOOK 99
 #define TV_MUSIC_BOOK   105

diff --git a/src/do-spell.c b/src/do-spell.c
index af7d876..f0c5a76 100644 (file)
--- a/src/do-spell.c
+++ b/src/do-spell.c
@@ -6665,7 +6665,7 @@ static cptr do_arcane_spell(int spell, int mode)
 }
 
 
-static cptr do_enchant_spell(int spell, int mode)
+static cptr do_craft_spell(int spell, int mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
@@ -11408,7 +11408,7 @@ cptr do_spell(int realm, int spell, int mode)
        case REALM_DEATH:    return do_death_spell(spell, mode);
        case REALM_TRUMP:    return do_trump_spell(spell, mode);
        case REALM_ARCANE:   return do_arcane_spell(spell, mode);
-       case REALM_ENCHANT:  return do_enchant_spell(spell, mode);
+       case REALM_CRAFT:    return do_craft_spell(spell, mode);
        case REALM_DAEMON:   return do_daemon_spell(spell, mode);
        case REALM_CRUSADE:  return do_crusade_spell(spell, mode);
        case REALM_MUSIC:    return do_music_spell(spell, mode);

diff --git a/src/flavor.c b/src/flavor.c
index 9e56104..7eaee8a 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -397,7 +397,7 @@ static bool object_easy_know(int i)
                case TV_DEATH_BOOK:
                case TV_TRUMP_BOOK:
                case TV_ARCANE_BOOK:
-               case TV_ENCHANT_BOOK:
+               case TV_CRAFT_BOOK:
                case TV_DAEMON_BOOK:
                case TV_CRUSADE_BOOK:
                case TV_MUSIC_BOOK:
@@ -919,7 +919,7 @@ char *object_desc_kosuu(char *t, object_type *o_ptr)
       case  TV_DEATH_BOOK:
       case  TV_TRUMP_BOOK:
       case  TV_ARCANE_BOOK:
-      case  TV_ENCHANT_BOOK:
+      case  TV_CRAFT_BOOK:
       case  TV_DAEMON_BOOK:
       case  TV_CRUSADE_BOOK:
       case  TV_MUSIC_BOOK:
@@ -2143,7 +2143,7 @@ void object_desc(char *buf, object_type *o_ptr, u32b mode)
                        break;
                }
 
-               case TV_ENCHANT_BOOK:
+               case TV_CRAFT_BOOK:
                {
 #ifdef JP
                        basenm = "¾¢¤ÎËâË¡½ñ%";

diff --git a/src/init2.c b/src/init2.c
index b296fef..b9ddc85 100644 (file)
--- a/src/init2.c
+++ b/src/init2.c
@@ -1368,10 +1368,10 @@ static byte store_table[MAX_STORES][STORE_CHOICES][2] =
                { TV_ARCANE_BOOK, 2 },
                { TV_ARCANE_BOOK, 3 },
 
-               { TV_ENCHANT_BOOK, 0 },
-               { TV_ENCHANT_BOOK, 0 },
-               { TV_ENCHANT_BOOK, 1 },
-               { TV_ENCHANT_BOOK, 1 },
+               { TV_CRAFT_BOOK, 0 },
+               { TV_CRAFT_BOOK, 0 },
+               { TV_CRAFT_BOOK, 1 },
+               { TV_CRAFT_BOOK, 1 },
 
                { TV_DAEMON_BOOK, 0 },
                { TV_DAEMON_BOOK, 0 },

diff --git a/src/object2.c b/src/object2.c
index 9a968a8..c7f52bb 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -4552,7 +4552,7 @@ static bool kind_is_good(int k_idx)
                case TV_CHAOS_BOOK:
                case TV_DEATH_BOOK:
                case TV_TRUMP_BOOK:
-               case TV_ENCHANT_BOOK:
+               case TV_CRAFT_BOOK:
                case TV_DAEMON_BOOK:
                case TV_CRUSADE_BOOK:
                case TV_MUSIC_BOOK:

diff --git a/src/spells2.c b/src/spells2.c
index 170f59c..1088ae3 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3845,7 +3845,7 @@ bool detect_objects_magic(int range)
                    (tv == TV_DEATH_BOOK) ||
                    (tv == TV_TRUMP_BOOK) ||
                        (tv == TV_ARCANE_BOOK) ||
-                       (tv == TV_ENCHANT_BOOK) ||
+                       (tv == TV_CRAFT_BOOK) ||
                        (tv == TV_DAEMON_BOOK) ||
                        (tv == TV_CRUSADE_BOOK) ||
                        (tv == TV_MUSIC_BOOK) ||

diff --git a/src/spells3.c b/src/spells3.c
index 7dcb826..0089d86 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -4529,7 +4529,7 @@ bool hates_fire(object_type *o_ptr)
                case TV_DEATH_BOOK:
                case TV_TRUMP_BOOK:
                case TV_ARCANE_BOOK:
-               case TV_ENCHANT_BOOK:
+               case TV_CRAFT_BOOK:
                case TV_DAEMON_BOOK:
                case TV_CRUSADE_BOOK:
                case TV_MUSIC_BOOK:

diff --git a/src/store.c b/src/store.c
index abe9e2a..5901ccb 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -1016,7 +1016,7 @@ static void mass_produce(object_type *o_ptr)
                case TV_DEATH_BOOK:
                case TV_TRUMP_BOOK:
                case TV_ARCANE_BOOK:
-               case TV_ENCHANT_BOOK:
+               case TV_CRAFT_BOOK:
                case TV_DAEMON_BOOK:
                case TV_CRUSADE_BOOK:
                case TV_MUSIC_BOOK:
@@ -1465,7 +1465,7 @@ static bool store_will_buy(object_type *o_ptr)
                                case TV_DEATH_BOOK:
                                case TV_TRUMP_BOOK:
                                case TV_ARCANE_BOOK:
-                               case TV_ENCHANT_BOOK:
+                               case TV_CRAFT_BOOK:
                                case TV_DAEMON_BOOK:
                                case TV_MUSIC_BOOK:
                                case TV_AMULET:
@@ -1500,7 +1500,7 @@ static bool store_will_buy(object_type *o_ptr)
                                case TV_LIFE_BOOK:
                                case TV_TRUMP_BOOK:
                                case TV_ARCANE_BOOK:
-                               case TV_ENCHANT_BOOK:
+                               case TV_CRAFT_BOOK:
                                case TV_DAEMON_BOOK:
                                case TV_CRUSADE_BOOK:
                                case TV_MUSIC_BOOK:

diff --git a/src/wizard1.c b/src/wizard1.c
index 01bfbe2..6fbce43 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -186,7 +186,7 @@ static grouper group_item[] =
 { TV_DEATH_BOOK,    "ËâË¡½ñ¡Ê°Å¹õ¡Ë" },
 { TV_TRUMP_BOOK,    "ËâË¡½ñ¡Ê¥È¥é¥ó¥×¡Ë" },
 { TV_ARCANE_BOOK,   "ËâË¡½ñ¡ÊÈë½Ñ¡Ë" },
-{ TV_ENCHANT_BOOK,  "ËâË¡½ñ¡Ê¾¢¡Ë" },
+{ TV_CRAFT_BOOK,  "ËâË¡½ñ¡Ê¾¢¡Ë" },
 { TV_DAEMON_BOOK,   "ËâË¡½ñ¡Ê°­Ëâ¡Ë" },
 { TV_CRUSADE_BOOK,     "ËâË¡½ñ¡ÊÇ˼١Ë" },
 { TV_MUSIC_BOOK,    "²Î½¸" },
@@ -199,7 +199,7 @@ static grouper group_item[] =
        { TV_DEATH_BOOK,    "Books (Death)" },
        { TV_TRUMP_BOOK,    "Books (Trump)" },
        { TV_ARCANE_BOOK,   "Books (Arcane)" },
-       { TV_ENCHANT_BOOK,  "Books (Craft)" },
+       { TV_CRAFT_BOOK,  "Books (Craft)" },
        { TV_DAEMON_BOOK,   "Books (Daemon)" },
        { TV_CRUSADE_BOOK,     "Books (Crusade)" },
        { TV_MUSIC_BOOK,    "Song Books" },

diff --git a/src/wizard2.c b/src/wizard2.c
index 47d3109..627b5af 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -649,7 +649,7 @@ static tval_desc tvals[] =
        { TV_DEATH_BOOK,        "Death Spellbook"      },
        { TV_TRUMP_BOOK,        "Trump Spellbook"      },
        { TV_ARCANE_BOOK,       "Arcane Spellbook"     },
-       { TV_ENCHANT_BOOK,      "Craft Spellbook"},
+       { TV_CRAFT_BOOK,      "Craft Spellbook"},
        { TV_DAEMON_BOOK,       "Daemon Spellbook"},
        { TV_CRUSADE_BOOK,      "Crusade Spellbook"},
        { TV_MUSIC_BOOK,        "Music Spellbook"      },

diff --git a/src/xtra1.c b/src/xtra1.c
index 14eb702..70646d0 100644 (file)
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -5548,7 +5548,7 @@ msg_print("
                if ((inventory[i].tval == TV_TRUMP_BOOK) && (inventory[i].sval == 1)) have_dd_t = TRUE;
 #endif
                if ((inventory[i].tval == TV_NATURE_BOOK) && (inventory[i].sval == 2)) have_sw = TRUE;
-               if ((inventory[i].tval == TV_ENCHANT_BOOK) && (inventory[i].sval == 2)) have_kabe = TRUE;
+               if ((inventory[i].tval == TV_CRAFT_BOOK) && (inventory[i].sval == 2)) have_kabe = TRUE;
        }
        for (this_o_idx = cave[py][px].o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
@@ -5565,7 +5565,7 @@ msg_print("
                if ((o_ptr->tval == TV_TRUMP_BOOK) && (o_ptr->sval == 1)) have_dd_t = TRUE;
 #endif
                if ((o_ptr->tval == TV_NATURE_BOOK) && (o_ptr->sval == 2)) have_sw = TRUE;
-               if ((o_ptr->tval == TV_ENCHANT_BOOK) && (o_ptr->sval == 2)) have_kabe = TRUE;
+               if ((o_ptr->tval == TV_CRAFT_BOOK) && (o_ptr->sval == 2)) have_kabe = TRUE;
        }
 
        if (p_ptr->pass_wall && !p_ptr->kill_wall) p_ptr->no_flowed = TRUE;
@@ -5588,9 +5588,9 @@ msg_print("
                if (p_ptr->lev >= s_ptr->slevel) p_ptr->no_flowed = TRUE;
        }
 
-       if (have_kabe && ((p_ptr->realm1 == REALM_ENCHANT) || (p_ptr->realm2 == REALM_ENCHANT) || (p_ptr->pclass == CLASS_SORCERER)))
+       if (have_kabe && ((p_ptr->realm1 == REALM_CRAFT) || (p_ptr->realm2 == REALM_CRAFT) || (p_ptr->pclass == CLASS_SORCERER)))
        {
-               magic_type *s_ptr = &mp_ptr->info[REALM_ENCHANT-1][SPELL_KABE];
+               magic_type *s_ptr = &mp_ptr->info[REALM_CRAFT-1][SPELL_KABE];
                if (p_ptr->lev >= s_ptr->slevel) p_ptr->no_flowed = TRUE;
        }
 }