Vから名称が変更されたアーティファクトについて ART_* の定義をきちんと書き変えた。また、定義し忘れているアーティファクトを追加した。

diff --git a/src/artifact.c b/src/artifact.c
index 1066a22..7b936e4 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -2891,7 +2891,7 @@ void random_artifact_resistance(object_type * o_ptr)
 
        switch (o_ptr->name1)
        {
-               case ART_CELEBORN:
+               case ART_JULIAN:
                case ART_ARVEDUI:
                case ART_CASPANION:
                case ART_HITHLOMIR:
@@ -2920,7 +2920,7 @@ void random_artifact_resistance(object_type * o_ptr)
                case ART_ANDURIL:
                case ART_ZARCUTHRA:
                case ART_GURTHANG:
-               case ART_HARADEKKET:
+               case ART_SOULSWORD:
                case ART_BRAND:
                case ART_DAWN:
                case ART_BUCKLAND:
@@ -2936,7 +2936,7 @@ void random_artifact_resistance(object_type * o_ptr)
                case ART_BERUTHIEL:
                case ART_THINGOL:
                case ART_ULMO:
-               case ART_OLORIN:
+               case ART_GANDALF:
                        {
                                /* Give a power */
                                give_power = TRUE;
@@ -2944,7 +2944,7 @@ void random_artifact_resistance(object_type * o_ptr)
                        break;
                case ART_CRIMSON:
                case ART_POWER:
-               case ART_GONDOR:
+               case ART_AMBER:
                case ART_AULE:
                        {
                                /* Give both */

diff --git a/src/cmd1.c b/src/cmd1.c
index ddfcae5..492b633 100644 (file)
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -344,7 +344,7 @@ s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode)
 
                                if (mult < 50) mult = 50;
 
-                               if ((o_ptr->name1 == ART_AEGLIN) && (m_ptr->r_idx == MON_FAFNER))
+                               if ((o_ptr->name1 == ART_NOTHUNG) && (m_ptr->r_idx == MON_FAFNER))
                                        mult *= 3;
                        }
 

diff --git a/src/cmd6.c b/src/cmd6.c
index 0d2db73..0f313b2 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -4096,7 +4096,7 @@ static void do_cmd_activate_aux(int item)
                                break;
                        }
 
-                       case ART_THRAIN:
+                       case ART_JUDGE:
                        {
 #ifdef JP
 msg_print("¤½¤ÎÊõÀФÏÀÖ¤¯ÌÀ¤ë¤¯¸÷¤Ã¤¿¡ª");
@@ -4173,7 +4173,7 @@ if (get_check("
                                break;
                        }
 
-                       case ART_BARAHIR:
+                       case ART_FRAKIR:
                        {
 #ifdef JP
 msg_print("¤¢¤Ê¤¿¤Ï¥Õ¥é¥­¥¢¤ËŨ¤òÄù¤á»¦¤¹¤è¤¦Ì¿¤¸¤¿¡£");
@@ -4337,7 +4337,7 @@ msg_print("
                                break;
                        }
 
-                       case ART_BELEGENNON:
+                       case ART_LOHENGRIN:
                        {
 #ifdef JP
 msg_print("Å·¹ñ¤Î²Î¤¬Ê¹¤³¤¨¤ë...");
@@ -4356,7 +4356,7 @@ msg_print("ŷ
                                break;
                        }
 
-                       case ART_CELEBORN:
+                       case ART_JULIAN:
                        {
 #ifdef JP
                                msg_print("¥¢¡¼¥Þ¡¼¤¬¿¼¤¤¥Ö¥ë¡¼¤Ëµ±¤¤¤¿...");
@@ -4407,7 +4407,7 @@ msg_print("ŷ
                                break;
                        }
 
-                       case ART_GONDOR:
+                       case ART_AMBER:
                        {
 #ifdef JP
                                msg_print("²¦´§¤¬¿¼¤¤¥Ö¥ë¡¼¤Ëµ±¤¤¤¿...");
@@ -4590,7 +4590,7 @@ msg_print("ŷ
                                break;
                        }
 
-                       case ART_DAL:
+                       case ART_FLORA:
                        {
 #ifdef JP
                                msg_print("¥Ö¡¼¥Ä¤¬¿¼¤¤¥Ö¥ë¡¼¤Ëµ±¤¤¤¿...");
@@ -4674,7 +4674,7 @@ msg_print("ŷ
                                break;
                        }
 
-                       case ART_BELANGIL:
+                       case ART_FIONA:
                        {
 #ifdef JP
                                msg_print("¥À¥¬¡¼¤¬Î䵤¤Ëʤ¤ï¤ì¤¿...");
@@ -4689,7 +4689,7 @@ msg_print("ŷ
                        }
 
                        case ART_KUSANAGI:
-                       case ART_ANGUIREL:
+                       case ART_WEREWINDLE:
                        {
                                switch (randint1(13))
                                {
@@ -4810,7 +4810,7 @@ msg_print("
                                break;
                        }
 
-                       case ART_OROME:
+                       case ART_DESTINY:
                        {
 #ifdef JP
                                msg_print("¥¹¥Ô¥¢¤¬¸ÝÆ°¤·¤¿...");
@@ -4971,7 +4971,7 @@ msg_print("
                                break;
                        }
 
-                       case ART_OLORIN:
+                       case ART_GANDALF:
                        {
 #ifdef JP
                                msg_print("¾ó¤¬ÌÀ¤ë¤¯µ±¤¤¤¿...");
@@ -5533,7 +5533,7 @@ msg_print("
                                o_ptr->timeout = 40 + randint1(40);
                                break;
                        }
-                       case ART_VIOLET:
+                       case ART_HERMIT:
                        {
 #ifdef JP
                                msg_print("¥à¥Á¤«¤é±Ô¤¤²»¤¬Î®¤ì½Ð¤¿...");

diff --git a/src/defines.h b/src/defines.h
index 01898b0..17f2c8f 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1082,7 +1082,7 @@
 /* Lites */
 #define ART_GALADRIEL            1
 #define ART_ELENDIL              2
-#define ART_THRAIN               3
+#define ART_JUDGE                3
 #define ART_EDISON               7
 #define ART_PALANTIR             15
 #define ART_STONE_LORE           17
@@ -1099,7 +1099,7 @@
 #define ART_NIGHT                215
 
 /* Rings */
-#define ART_BARAHIR              8
+#define ART_FRAKIR               8
 #define ART_TULKAS               9
 #define ART_NARYA               10
 #define ART_NENYA               11
@@ -1116,10 +1116,11 @@
 #define ART_SOULKEEPER          19
 #define ART_ISILDUR             20
 #define ART_ROHIRRIM            21
-#define ART_BELEGENNON          22
-#define ART_CELEBORN            23
+#define ART_LOHENGRIN           22
+#define ART_JULIAN              23
 #define ART_ARVEDUI             24
 #define ART_CASPANION           25
+#define ART_GILES               168
 #define ART_MORLOK              203
 #define ART_VETERAN             206
 
@@ -1142,10 +1143,11 @@
 #define ART_YENDOR              141
 #define ART_YATA                151
 #define ART_EARENDIL            186
-#define ART_HERCULES            197
+#define ART_PERSEUS             197
 
 /* Helms and Crowns */
-#define ART_MORGOTH             34
+#define ART_INDRA               33
+#define ART_CHAOS               34
 #define ART_BERUTHIEL           35
 #define ART_THRANDUIL           36
 #define ART_THENGEL             37
@@ -1153,7 +1155,7 @@
 #define ART_DOR                 39
 #define ART_HOLHENNETH          40
 #define ART_TERROR              41
-#define ART_GONDOR              42
+#define ART_AMBER               42
 #define ART_NUMENOR             132
 #define ART_STONEMASK           146
 
@@ -1175,15 +1177,16 @@
 #define ART_CORWIN              55
 #define ART_PAURAEGEN           56
 #define ART_PAURNEN             57
-#define ART_CAMLOST             58
+#define ART_THANOS              58
 #define ART_FINGOLFIN           59
 #define ART_PAURNIMMEN          185
 
 /* Boots */
 #define ART_FEANOR              60
-#define ART_DAL                 61
+#define ART_FLORA               61
 #define ART_THROR               62
 #define ART_SHIVA_BOOTS         63
+#define ART_GLASS               165
 #define ART_GETA                210
 
 /* Digging */
@@ -1191,34 +1194,35 @@
 
 /* Swords */
 #define ART_MAEDHROS            64
-#define ART_ANGRIST             65
+#define ART_CAINE               65
 #define ART_NARTHANC            66
 #define ART_NIMTHANC            67
 #define ART_DETHANC             68
 #define ART_RILIA               69
-#define ART_BELANGIL            70
+#define ART_FIONA               70
 #define ART_CALRIS              71
 #define ART_GRAYSWANDIR         72
 #define ART_GLAMDRING           73
-#define ART_AEGLIN              74
+#define ART_NOTHUNG             74
 #define ART_ORCRIST             75
 #define ART_GURTHANG            76
 #define ART_ZARCUTHRA           77
-#define ART_MORMEGIL            78
+#define ART_TWILIGHT            78
 #define ART_GONDRICAM           79
 #define ART_CRISDURIAN          80
-#define ART_GROO                81
+#define ART_AGLARANG            81
 #define ART_RINGIL              82
 #define ART_ANDURIL             83
-#define ART_ANGUIREL            84
+#define ART_WEREWINDLE          84
 #define ART_CHAINSWORD          85
 #define ART_FORASGIL            86
 #define ART_CARETH              87
 #define ART_STING               88
-#define ART_HARADEKKET          89
-#define ART_GILETTAR            90
+#define ART_SOULSWORD           89
+#define ART_MERLIN              90
 #define ART_DOOMCALLER          91
 #define ART_VORPAL_BLADE        92
+#define ART_SLAYER              123
 #define ART_KUSANAGI            128
 #define ART_HURIN               133
 #define ART_AZAGHAL             135
@@ -1231,6 +1235,8 @@
 #define ART_FALIS               155
 #define ART_HRUNTING            156
 #define ART_ANUBIS              158
+#define ART_GURENKI             160
+#define ART_TAILBITER           167
 #define ART_MUSASI_KATANA       171
 #define ART_MUSASI_WAKIZASI     172
 #define ART_QUICKTHORN          174
@@ -1241,10 +1247,12 @@
 #define ART_ARUNRUTH            184
 #define ART_HAKABUSA            189
 #define ART_STORMBRINGER        190
+#define ART_NARSIL              191
 #define ART_KANNU               193
 #define ART_GRIMTOOTH           196
 #define ART_KAMUI               198
 #define ART_GOURYU              207
+#define ART_EOWYN               216
 
 /* Polearms */
 #define ART_THEODEN             93
@@ -1252,14 +1260,14 @@
 #define ART_OSONDIR             95
 #define ART_TIL                 96
 #define ART_RUNESPEAR           97
-#define ART_OROME               98
-#define ART_NIMLOTH             99
+#define ART_DESTINY             98
+#define ART_HAGEN               99
 #define ART_EORLINGAS           100
 #define ART_DURIN               101
 #define ART_EONWE               102
 #define ART_BALLI               103
 #define ART_LOTHARANG           104
-#define ART_MUNDWINE            105
+#define ART_DWARVES_AXE         105
 #define ART_BARUKKHELED         106
 #define ART_WRATH               107
 #define ART_ULMO                108
@@ -1286,7 +1294,7 @@
 #define ART_AULE                117
 #define ART_NAR                 118
 #define ART_ERIRIL              119
-#define ART_OLORIN              120
+#define ART_GANDALF             120
 #define ART_DEATHWREAKER        121
 #define ART_TURMIL              122
 #define ART_MJOLLNIR            136
@@ -1303,7 +1311,7 @@
 #define ART_SHUTEN_DOJI         194
 #define ART_G_HAMMER            195
 #define ART_AEGISFANG           208
-#define ART_VIOLET              209
+#define ART_HERMIT              209
 #define ART_GOTHMOG             212
 #define ART_JIZO                213
 #define ART_FUNDIN              214

diff --git a/src/object1.c b/src/object1.c
index 5295a4a..8ea85ca 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1246,7 +1246,7 @@ return "
 #endif
 
                }
-               case ART_BELANGIL:
+               case ART_FIONA:
                {
 #ifdef JP
 return "¥¢¥¤¥¹¡¦¥Ü¡¼¥ë(48) : 5+d5 ¥¿¡¼¥óËè";
@@ -1255,7 +1255,7 @@ return "
 #endif
 
                }
-               case ART_DAL:
+               case ART_FLORA:
                {
 #ifdef JP
 return "¶²Éݽüµî/ÆǾä· : 5 ¥¿¡¼¥óËè";
@@ -1373,7 +1373,7 @@ return "
 #endif
 
                }
-               case ART_OLORIN:
+               case ART_GANDALF:
                {
 #ifdef JP
 return "õº÷¡¢Á´´¶ÃΡ¢Á´´ÕÄê : 1000 ¥¿¡¼¥óËè";
@@ -1419,7 +1419,7 @@ return "
 
                }
                case ART_KUSANAGI:
-               case ART_ANGUIREL:
+               case ART_WEREWINDLE:
                {
 #ifdef JP
 return "ƨÁö : 35 ¥¿¡¼¥óËè";
@@ -1455,7 +1455,7 @@ return "
 #endif
 
                }
-               case ART_OROME:
+               case ART_DESTINY:
                {
 #ifdef JP
 return "´äÀÐÍϲò : 5 ¥¿¡¼¥óËè";
@@ -1482,7 +1482,7 @@ return "
 #endif
 
                }
-               case ART_BELEGENNON:
+               case ART_LOHENGRIN:
                {
 #ifdef JP
 return ("²óÉü (777)¡¢Ìþ¤·¡¢»Îµ¤¹âÍÈ : 300 ¥¿¡¼¥óËè");
@@ -1491,7 +1491,7 @@ return ("
 #endif
 
                }
-               case ART_CELEBORN:
+               case ART_JULIAN:
                {
 #ifdef JP
 return "Ëõ»¦ : 500 ¥¿¡¼¥óËè";
@@ -1627,7 +1627,7 @@ return "
 #endif
 
                }
-               case ART_GONDOR:
+               case ART_AMBER:
                {
 #ifdef JP
 return "ÂÎÎϲóÉü(500) : 500 ¥¿¡¼¥óËè";
@@ -1672,7 +1672,7 @@ return "
 #endif
 
                }
-               case ART_THRAIN:
+               case ART_JUDGE:
                {
 #ifdef JP
 return "ÂÎÎϤȰú¤­Âؤ¨¤ËÀéΤ´ã¤Èµ¢´Ô";
@@ -1701,7 +1701,7 @@ return "
 
                }
                case ART_CARLAMMAS:
-               case ART_VIOLET:
+               case ART_HERMIT:
                {
 #ifdef JP
 return "Âмٰ­·ë³¦ : 225+d225 ¥¿¡¼¥óËè";
@@ -1710,7 +1710,7 @@ return "
 #endif
 
                }
-               case ART_BARAHIR:
+               case ART_FRAKIR:
                {
 #ifdef JP
 return "Ã⩹¶·â(100) : 100+d100 ¥¿¡¼¥óËè";

diff --git a/src/xtra2.c b/src/xtra2.c
index b7850eb..0074e47 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1114,7 +1114,7 @@ msg_print("
                        object_prep(q_ptr, lookup_kind(TV_CROWN, SV_MORGOTH));
 
                        /* Mega-Hack -- Mark this item as "Morgoth" */
-                       q_ptr->name1 = ART_MORGOTH;
+                       q_ptr->name1 = ART_CHAOS;
 
                        /* Mega-Hack -- Actually create "Morgoth" */
                        apply_magic(q_ptr, -1, TRUE, TRUE, TRUE, FALSE);
@@ -1132,12 +1132,12 @@ msg_print("
                        case MON_OBERON:
                                if (one_in_(3))
                                {
-                                       a_idx = ART_THRAIN;
+                                       a_idx = ART_JUDGE;
                                        chance = 33;
                                }
                                else
                                {
-                                       a_idx = ART_GONDOR;
+                                       a_idx = ART_AMBER;
                                        chance = 50;
                                }
                                break;
@@ -1194,7 +1194,7 @@ msg_print("
                                break;
 
                        case MON_DWORKIN:
-                               a_idx = ART_THRAIN;
+                               a_idx = ART_JUDGE;
                                chance = 20;
                                break;
 
@@ -1219,7 +1219,7 @@ msg_print("
                                }
                                else
                                {
-                                       a_idx = ART_ANGUIREL;
+                                       a_idx = ART_WEREWINDLE;
                                        chance = 33;
                                }
                                break;
@@ -1238,7 +1238,7 @@ msg_print("
                                break;
 
                        case MON_SURTUR:
-                               a_idx = ART_MORMEGIL;
+                               a_idx = ART_TWILIGHT;
                                chance = 66;
                                break;
 
@@ -1248,17 +1248,17 @@ msg_print("
                                break;
 
                        case MON_FIONA:
-                               a_idx = ART_BELANGIL;
+                               a_idx = ART_FIONA;
                                chance = 50;
                                break;
 
                        case MON_JULIAN:
-                               a_idx = ART_CELEBORN;
+                               a_idx = ART_JULIAN;
                                chance = 45;
                                break;
 
                        case MON_KLING:
-                               a_idx = ART_OROME;
+                               a_idx = ART_DESTINY;
                                chance = 40;
                                break;
 
@@ -1268,12 +1268,12 @@ msg_print("
                                break;
 
                        case MON_HAGEN:
-                               a_idx = ART_NIMLOTH;
+                               a_idx = ART_HAGEN;
                                chance = 66;
                                break;
 
                        case MON_CAIN:
-                               a_idx = ART_ANGRIST;
+                               a_idx = ART_CAINE;
                                chance = 50;
                                break;