固定アーティファクトの発動は全部外部フラグ化し終わった。

[hengband/hengband.git] / src / object1.c

diff --git a/src/object1.c b/src/object1.c
index c155e39..fbd60c0 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -456,7 +456,11 @@ cptr item_activation(object_type *o_ptr)
                                return "Ëõ»¦ : 500 ¥¿¡¼¥óËè";
                        case ACT_MASS_GENO:
                                return "¼þÊÕËõ»¦ : 1000 ¥¿¡¼¥óËè";
-
+                       case ACT_SCARE_AREA:
+                               return "¥â¥ó¥¹¥¿¡¼¶²¹² : 40+d40¥¿¡¼¥óËè";
+                       case ACT_AGGRAVATE:
+                               if (o_ptr->name1 == ART_HYOUSIGI) return "Çï»ÒÌÚ¤òÂǤÁ¤Ê¤é¤¹ : ¤¤¤Ä¤Ç¤â";
+                               return "¥â¥ó¥¹¥¿¡¼¤òÅܤ餻¤ë : ¤¤¤Ä¤Ç¤â";
                        case ACT_CHARM_ANIMAL:
                                return "ưʪ̥λ : 200 ¥¿¡¼¥óËè";
                        case ACT_CHARM_UNDEAD:
@@ -578,6 +582,14 @@ cptr item_activation(object_type *o_ptr)
                        /* Unique activation */
                        case ACT_FISHING:
                                return "Äà¤ê¤ò¤¹¤ë : ¤¤¤Ä¤Ç¤â";
+                       case ACT_INROU:
+                               return "Îã¤Î¥¢¥ì : 150+d150 ¥¿¡¼¥óËè";
+                       case ACT_MURAMASA:
+                               return "ÏÓÎϤξ徺 : ³ÎΨ50%¤Ç²õ¤ì¤ë";
+                       case ACT_BLOODY_MOON:
+                               return "°À­Êѹ¹ : 3333 ¥¿¡¼¥óËè";
+                       case ACT_CRIMSON:
+                               return "¥Õ¥¡¥¤¥¢¡ª : 15 ¥¿¡¼¥óËè";
 
                        default:
                                return "̤ÄêµÁ";
@@ -673,6 +685,11 @@ cptr item_activation(object_type *o_ptr)
                                return "genocide every 500 turns";
                        case ACT_MASS_GENO:
                                return "mass genocide every 1000 turns";
+                       case ACT_SCARE_AREA:
+                               return "frighten monsters every 40+d40 turns";
+                       case ACT_AGGRAVATE:
+                               if (o_ptr->name1 == ART_HYOUSIGI) return "beat wooden clappers every turn";
+                               return "aggravete monsters every turn";
 
                        case ACT_CHARM_ANIMAL:
                                return "charm animal every 200 turns";
@@ -805,6 +822,14 @@ cptr item_activation(object_type *o_ptr)
                        /* Unique activation */
                        case ACT_FISHING:
                                return "fishing : every time";
+                       case ACT_INROU:
+                               return "reveal your identity every 150+d150 turns";
+                       case ACT_MURAMASA:
+                               return "increase STR (destroyed 50%)";
+                       case ACT_BLOODY_MOON:
+                               return "change zokusei every 3333 turns";
+                       case ACT_CRIMSON:
+                               return "fire! every 15 turns";
 
                        default:
                                return "something undefined";
@@ -815,55 +840,13 @@ cptr item_activation(object_type *o_ptr)
        /* Some artifacts can be activated */
        switch (o_ptr->name1)
        {
-               case ART_CRIMSON:
-               {
-#ifdef JP
-                       return "¥Õ¥¡¥¤¥¢¡ª : 15 ¥¿¡¼¥óËè";
-#else
-                       return "fire! every 15 turns";
-#endif
-               }
-               case ART_BOROMIR:
-               {
-#ifdef JP
-                       return "¥â¥ó¥¹¥¿¡¼¶²¹² : 40+d40¥¿¡¼¥óËè";
-#else
-                       return "frighten monsters every 40+d40 turns";
-#endif
-               }
-               case ART_MURAMASA:
-               {
-#ifdef JP
-                       return "ÏÓÎϤξ徺 : ³ÎΨ50%¤Ç²õ¤ì¤ë";
-#else
-                       return "increase STR (destroyed 50%)";
-#endif
-               }
-               case ART_INROU:
-               {
-#ifdef JP
-                       return "Îã¤Î¥¢¥ì : 150+d150 ¥¿¡¼¥óËè";
-#else
-                       return "reveal your identity every 150+d150 turns";
-#endif
-               }
-               case ART_HYOUSIGI:
-               {
-#ifdef JP
-                       return "Çï»ÒÌÚ¤òÂǤÁ¤Ê¤é¤¹ : ¤¤¤Ä¤Ç¤â";
-#else
-                       return "beat wooden clappers every turn";
-#endif
-               }
-               case ART_BLOOD:
-               {
+               /* Nothing */
+       default:
 #ifdef JP
-                       return "°À­Êѹ¹ : 3333 ¥¿¡¼¥óËè";
+               return "̤ÄêµÁ";
 #else
-                       return "change zokusei every 3333 turns";
+               return "something undefined";
 #endif
-
-               }
        }
 
        if (object_is_smith(o_ptr))