4つの新アーティファクト導入. 古い城の報酬に.

diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 4307aed..43dac64 100644 (file)
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -3447,3 +3447,51 @@ D:
 D:¥Ù¥ì¥ó¥Î¡¼¥ë¤ÎÌî¤Ë¤ª¤¤¤ÆËⲦ¤Ë¿¶¤ë¤Ã¤¿·õ¤À¡£
 D:¡Ö¤·¤«¤·¤ï¤¿¤·¤ÏÀ¸¤­¿È¤Î¿Í´Ö¤ÎÃˤǤϤʤ¤¡ª¤ªÁ°¤¬¸þ¤­¹ç¤Ã¤Æ
 D:¤¤¤ë¤Î¤Ï½÷¤À¡£¤ï¤¿¤·¤Ï¥¨¥ª¥¦¥£¥ó¡¢¥¨¥ª¥à¥ó¥É¤Î̼¤À¡£¡×
+
+N:217:À»µ³»Î¤Î
+E:of Sacred Knights
+I:40:25:1
+W:50:50:2:77777
+P:0:0d0:0:0:10
+F:WIS | MAGIC_MASTERY | HIDE_TYPE |
+F:RES_CONF | RES_CHAOS | 
+F:SEE_INVIS | FREE_ACT | REGEN | HOLD_LIFE | ACTIVATE |
+F:INSTA_ART
+D:À»µ³»Î¤ÎÀâÌÀ¤À¤è¡£
+D:¤½¤Î¤¦¤Á¤Ê¤ó¤«¤«¤¯¤è¡£
+
+N:218:ÃϹö¤Î
+E:of the Hell
+I:40:26:-2
+W:50:40:30:66666
+P:0:0d0:15:15:-5
+F:INT | WIS | CHR | STEALTH | SPEED | HIDE_TYPE |
+F:RES_DARK | RES_NETHER |
+F:SEE_INVIS | AGGRAVATE | ESP_UNDEAD | ACTIVATE |
+F:INSTA_ART
+D:ÃϹö¤ÎÀâÌÀ¤À¤è¡£
+D:¤½¤Î¤¦¤Á¤Ê¤ó¤«¤«¤¯¤è¡£
+
+N:219:ÂÓËâÎÏ
+E:The Charmed
+I:40:27:2
+W:50:80:2:100000
+P:0:0d0:0:0:5
+F:INT | CHR | INFRA | SEARCH | HIDE_TYPE |
+F:SEE_INVIS | FREE_ACT | SLOW_DIGEST | REGEN | LITE | WARNING |
+F:SH_FIRE | SH_ELEC | SH_COLD | ACTIVATE |
+F:INSTA_ART
+D:ÂÓËâÎϤÎÀâÌÀ¤À¤è¡£
+D:¤½¤Î¤¦¤Á¤Ê¤ó¤«¤«¤¯¤è¡£
+
+N:220:¤â¤Î¤Þ¤Í¤Î»ÏÁÄ¥´¥´¤Î
+E:of Gogo
+I:40:28:4
+W:50:50:2:55555
+P:0:0d0:0:0:0
+F:INT | WIS | DEX | 
+F:SEE_INVIS | LITE |
+F:INSTA_ART
+D:¥´¥´¤ÎÀâÌÀ¤À¤è¡£
+D:¤½¤Î¤¦¤Á¤Ê¤ó¤«¤«¤¯¤è¡£
+

diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index cd9c9cd..4a02b4d 100644 (file)
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -6286,3 +6286,31 @@ P:0:1d2:0:0:0
 D:$It does nothing when you use it.
 D:¤½¤ì¤Ï»È¤Ã¤Æ¤â²¿¤âµ¯¤³¤é¤Ê¤¤¡£
 F:FULL_NAME
+
+N:659:¼ó¾þ
+E:& Amulet~
+G:":d
+I:40:25:0
+W:50:0:2:77777
+F:INSTA_ART
+
+N:660:¼óÎØ
+E:& Collar Harness~
+G:":d
+I:40:26:0
+W:50:0:30:66666
+F:INSTA_ART
+
+N:661:¥Ú¥ó¥À¥ó¥È
+E:& Pendant~
+G:":d
+I:40:27:0
+W:50:0:2:100000
+F:INSTA_ART
+
+N:662:¥Ú¥ó¥À¥ó¥È
+E:& Pendant~
+G:":d
+I:40:28:0
+W:50:0:2:55555
+F:INSTA_ART

diff --git a/lib/edit/misc.txt b/lib/edit/misc.txt
index 7810773..7a2e659 100644 (file)
--- a/lib/edit/misc.txt
+++ b/lib/edit/misc.txt
@@ -16,7 +16,7 @@ M:WY:66
 M:R:1070
 
 # Maximum number of items in k_info.txt
-M:K:659
+M:K:663
 
 # Maximum number of vaults in v_info.txt
 M:V:129
@@ -25,7 +25,7 @@ M:V:129
 M:F:255
 
 # Maximum number of artifacts in a_info.txt
-M:A:217
+M:A:221
 
 # Maximum number of ego-items in e_info.txt
 M:E:255

diff --git a/lib/edit/t0000001.txt b/lib/edit/t0000001.txt
index fb150a9..0ac80d5 100644 (file)
--- a/lib/edit/t0000001.txt
+++ b/lib/edit/t0000001.txt
@@ -410,10 +410,18 @@ F:@:1:3:0:0:0:33
 F:a:128:3
 F:@:1:3:0:0:0:15
 
+#--- this is old ---
 # Quest 27 rewarding (Magiceater, Mirror-Master)
 # get The Jewel Encrusted Crown of Numenor
 # continue with quest 33
-?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Magiceater] [EQU $CLASS Mirror-Master] ] ] ]
+#?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Magiceater] [EQU $CLASS Mirror-Master] ] ] ]
+#F:a:128:3
+#F:@:1:3:0:0:0:132
+
+# Quest 27 rewarding (Mirror-Master)
+# get The Jewel Encrusted Crown of Numenor
+# continue with quest 33
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Mirror-Master] ]
 F:a:128:3
 F:@:1:3:0:0:0:132
 
@@ -424,6 +432,34 @@ F:@:1:3:0:0:0:132
 F:a:128:3
 F:@:1:3:0:0:0:81
 
+# Quest 27 rewarding (crusade Paladin)
+# get the Amulet of Sacred Knights
+# continue with quest 33
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Paladin] [EQU $REALM1 Crusade] ]
+F:a:128:3
+F:@:1:3:0:0:0:217
+
+# Quest 27 rewarding (death Paladin)
+# get the Collar Harness of the Hell
+# continue with quest 33
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Paladin] [EQU $REALM1 Death] ]
+F:a:128:3
+F:@:1:3:0:0:0:218
+
+# Quest 27 rewarding (Warrior-Mage, Red-Mage, Magic-Eater )
+# get the Charmed Pendant
+# continue with quest 33
+?:[AND [EQU $QUEST27 3] [IOR [EQU $CLASS Warrior-Mage] [EQU $CLASS Red-Mage] [EQU $CLASS Magic-Eater] ] ]
+F:a:128:3
+F:@:1:3:0:0:0:219
+
+# Quest 27 rewarding (Imitator)
+# get the Pendant of Gogo
+# continue with quest 33
+?:[AND [EQU $QUEST27 3] [EQU $CLASS Imitator] ]
+F:a:128:3
+F:@:1:3:0:0:0:220
+
 # Quest 27 finished, continue with quest 33
 ?:[EQU $QUEST27 4]
 F:a:128:3

diff --git a/src/cmd6.c b/src/cmd6.c
index cf82f4e..9211e3f 100644 (file)
--- a/src/cmd6.c
+++ b/src/cmd6.c
@@ -5729,6 +5729,48 @@ msg_print("
                                o_ptr->timeout = randint0(150) + 150;
                                break;
                        }
+                       case ART_HELL:
+                       {
+#ifdef JP
+                               msg_print("¼óÎؤ¬¿¼¤¤°Ç¤Ëʤ¤ï¤ì¤¿...");
+#else
+                               msg_print("Your collar harness is coverd in pitch-darkness...");
+#endif
+                               if (!get_aim_dir(&dir)) return;
+                               fire_ball(GF_DARK, dir, 250, 4);
+                               o_ptr->timeout = randint0(150) + 150;
+                               break;
+                       }
+                       case ART_SACRED_KNIGHTS:
+                       {
+#ifdef JP
+                               msg_print("¼ó¾þ¤¬¿¿¼Â¤ò¾È¤é¤·½Ð¤¹...");
+#else
+                               msg_print("Your amulet exhibits the truth...");
+#endif
+                               if (remove_all_curse())
+                               {
+#ifdef JP
+                                       msg_print("狼¤Ë¸«¼é¤é¤ì¤Æ¤¤¤ë¤è¤¦¤Êµ¤¤¬¤¹¤ë¡£");
+#else
+                                       msg_print("You feel as if someone is watching over you.");
+#endif
+                               }
+                               (void)probing();
+                               break;
+                       }
+                       case ART_CHARMED:
+                       {
+#ifdef JP
+                               msg_print("¥Ú¥ó¥À¥ó¥È¤¬ÀÄÇò¤¯¸÷¤Ã¤¿¡¥¡¥¡¥");
+#else
+                               msg_print("Your pendant glows pale...");
+#endif
+                               if (!get_aim_dir(&dir)) return;
+                               fire_ball(GF_MANA, dir, 200, 4);
+                               o_ptr->timeout = randint0(150) + 150;
+                               break;
+                       }
                }
 
                /* Window stuff */

diff --git a/src/defines.h b/src/defines.h
index 1cd73b5..a8f3332 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1141,6 +1141,10 @@
 #define ART_MAGATAMA             149
 #define ART_INROU                166
 #define ART_NIGHT                215
+#define ART_SACRED_KNIGHTS       217
+#define ART_HELL                 218
+#define ART_CHARMED              219
+#define ART_GOGO                 220
 
 /* Rings */
 #define ART_FRAKIR               8

diff --git a/src/flavor.c b/src/flavor.c
index 1a4e688..45313fa 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -26,7 +26,7 @@
  * Max sizes of the following arrays
  */
 #define MAX_ROCKS      59       /* Used with rings (min 38) */
-#define MAX_AMULETS    26       /* Used with amulets (min 14) */
+#define MAX_AMULETS    30       /* Used with amulets (min 14) */
 #define MAX_WOODS      34       /* Used with staffs (min 30) */
 #define MAX_METALS     40       /* Used with wands/rods (min 29/29) */
 #define MAX_COLORS     70       /* Used with potions (min 60) */
@@ -106,7 +106,7 @@ static cptr amulet_adj[MAX_AMULETS]
        "Tortoise Shell", "Golden", "Azure", "Crystal", "Silver",
        "Copper", "Swastika", "Platinum","Runed", "Rusty",
        "Curved", "Dragon's claw", "Rosary", "Jade", "Mithril",
-       "Ruby"
+       "Ruby", "Emerald", "Sapphire", "Garnet", "Diamond"
 };
 #else
 = {
@@ -115,7 +115,7 @@ static cptr amulet_adj[MAX_AMULETS]
     "¤Ù¤Ã¹Ã¤Î","¶â¤Î","ÎÜÍþ¤Î","¿å¾½¤Î","¶ä¤Î",
     "Ƽ¤Î","ÒĤÎ", "¥×¥é¥Á¥Ê¤Î", "¥ë¡¼¥ó¤¬¹ï¤Þ¤ì¤¿","»¬¤Ó¤¿",
     "¶Ê¤¬¤Ã¤¿", "¥É¥é¥´¥ó¤ÎÄÞ¤Î", "¿ô¼î¤Î", "¤Ò¤¹¤¤¤Î", "¥ß¥¹¥ê¥ë¤Î",
-    "¥ë¥Ó¡¼¤Î"
+    "¥ë¥Ó¡¼¤Î", "¥¨¥á¥é¥ë¥É¤Î", "¥µ¥Õ¥¡¥¤¥¢¤Î", "¥¬¡¼¥Í¥Ã¥È¤Î", "¥À¥¤¥¢¥â¥ó¥É¤Î"
 };
 #endif
 
@@ -126,7 +126,7 @@ static byte amulet_col[MAX_AMULETS] =
        TERM_GREEN, TERM_YELLOW, TERM_L_BLUE, TERM_L_BLUE, TERM_L_WHITE,
        TERM_L_UMBER, TERM_VIOLET, TERM_WHITE, TERM_UMBER, TERM_RED, 
        TERM_GREEN, TERM_L_GREEN, TERM_L_GREEN, TERM_GREEN, TERM_L_BLUE, 
-       TERM_RED
+       TERM_RED, TERM_GREEN, TERM_BLUE, TERM_RED, TERM_WHITE
 };
 
 

diff --git a/src/object1.c b/src/object1.c
index 8b73771..a036b45 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -1856,6 +1856,7 @@ return "
 #endif
                }
                case ART_NIGHT:
+               case ART_HELL:
                {
 #ifdef JP
 return "°Å¹õ¤ÎÍò(250) : 150+d150 ¥¿¡¼¥óËè";
@@ -1864,6 +1865,24 @@ return "
 #endif
 
                }
+               case ART_SACRED_KNIGHTS:
+               {
+#ifdef JP
+return "*²ò¼ö*¤ÈÄ´ºº: ¤¤¤Ä¤Ç¤â";
+#else
+                       return "Dispel Curse and Probing every turn";
+#endif
+
+               }
+               case ART_CHARMED:
+               {
+#ifdef JP
+return "ËâÎϤÎÍò(200) : 150+d150 ¥¿¡¼¥óËè";
+#else
+                       return "mana storm (200) every 150+d150 turns";
+#endif
+
+               }
        }