From: iks Date: Thu, 31 Jan 2013 13:46:17 +0000 (+0000) Subject: Amulets' egos also are defined its activation type in e_info.txt. X-Git-Tag: v2.1.2~148 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=2b0fe2afb9fb4257543bbc273eac533e39e0642f;p=hengband%2Fhengband.git Amulets' egos also are defined its activation type in e_info.txt. Activation of Resist elements are corrected. --- diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt index 40c5f7b51..111af05ca 100644 --- a/lib/edit/e_info.txt +++ b/lib/edit/e_info.txt @@ -1352,6 +1352,7 @@ X:29:15 W:60:0:0:8000 C:0:0:0:0 F:ACTIVATE +U:ID_PLAIN N:220:Ì¥ÏǤΠE:and Monster Turning @@ -1359,6 +1360,7 @@ X:29:15 W:40:0:0:2000 C:0:0:0:0 F:ACTIVATE +U:CHARM_OTHER N:221:Ǧ¤Ó¤Î E:and Stealth @@ -1373,6 +1375,7 @@ X:29:5 W:5:0:0:500 C:0:0:0:0 F:ACTIVATE +U:PHASE_DOOR N:223:ž°Ü¤Î E:at Will @@ -1380,6 +1383,7 @@ X:29:5 W:10:0:0:1000 C:0:0:0:0 F:ACTIVATE +U:TELEPORT N:224:¼¡¸µ¤Î E:and Dimension Door @@ -1387,6 +1391,7 @@ X:29:30 W:100:0:0:30000 C:0:0:0:0 F:ACTIVATE +U:DIM_DOOR N:225:(ËɱҼÔ) E:(Defender) @@ -1408,6 +1413,7 @@ X:29:15 W:80:0:0:5000 C:0:0:0:0 F:RES_FIRE | ACTIVATE +U:RESIST_FIRE N:228:ÂÑÎä¤Î E:and Resist Cold @@ -1422,6 +1428,7 @@ X:29:15 W:80:0:0:5000 C:0:0:0:0 F:RES_COLD | ACTIVATE +U:RESIST_COLD N:230:ÂÑÅŤΠE:and Resist Lightning @@ -1436,6 +1443,7 @@ X:29:15 W:80:0:0:5000 C:0:0:0:0 F:RES_ELEC | ACTIVATE +U:RESIST_ELEC N:232:ÂÑ»À¤Î E:and Resist Acid @@ -1450,6 +1458,7 @@ X:29:15 W:80:0:0:5000 C:0:0:0:0 F:RES_ACID | ACTIVATE +U:RESIST_ACID N:234:ÉâÍ·¤Î E:and Levitation @@ -1471,6 +1480,7 @@ X:29:20 W:0:0:0:2000 C:0:0:0:3 F:SEARCH | ACTIVATE +U:DETECT_ALL N:237:¶ò¼Ô¤Î E:and Naivety diff --git a/src/artifact.c b/src/artifact.c index 1c2b4ad0f..9e60defbc 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -3197,7 +3197,7 @@ bool activate_random_artifact(object_type *o_ptr) #else msg_format("The %s grows blue.", name); #endif - (void)set_oppose_cold(randint1(20) + 20, FALSE); + (void)set_oppose_elec(randint1(20) + 20, FALSE); o_ptr->timeout = 40 + randint1(40); break; } @@ -3209,7 +3209,7 @@ bool activate_random_artifact(object_type *o_ptr) #else msg_format("The %s grows green.", name); #endif - (void)set_oppose_cold(randint1(20) + 20, FALSE); + (void)set_oppose_pois(randint1(20) + 20, FALSE); o_ptr->timeout = 40 + randint1(40); break; } diff --git a/src/cmd6.c b/src/cmd6.c index e0278189c..eb7d05ea7 100644 --- a/src/cmd6.c +++ b/src/cmd6.c @@ -4404,58 +4404,6 @@ msg_print(" return; } - else if (o_ptr->tval == TV_AMULET) - { - if (object_is_ego(o_ptr)) - { - switch (o_ptr->name2) - { - case EGO_AMU_IDENT: - if (!ident_spell(FALSE)) return; - o_ptr->timeout = 10; - break; - case EGO_AMU_CHARM: - if (!get_aim_dir(&dir)) return; - charm_monster(dir, MAX(20, p_ptr->lev)); - o_ptr->timeout = 200; - break; - case EGO_AMU_JUMP: - teleport_player(10, 0L); - o_ptr->timeout = randint0(10) + 10; - break; - case EGO_AMU_TELEPORT: - teleport_player(100, 0L); - o_ptr->timeout = randint0(50) + 50; - break; - case EGO_AMU_D_DOOR: - (void)dimension_door(); - o_ptr->timeout = 200; - break; - case EGO_AMU_RES_FIRE_: - (void)set_oppose_fire(randint1(20) + 20, FALSE); - o_ptr->timeout = randint0(50) + 50; - break; - case EGO_AMU_RES_COLD_: - (void)set_oppose_cold(randint1(20) + 20, FALSE); - o_ptr->timeout = randint0(50) + 50; - break; - case EGO_AMU_RES_ELEC_: - (void)set_oppose_elec(randint1(20) + 20, FALSE); - o_ptr->timeout = randint0(50) + 50; - break; - case EGO_AMU_RES_ACID_: - (void)set_oppose_acid(randint1(20) + 20, FALSE); - o_ptr->timeout = randint0(50) + 50; - break; - case EGO_AMU_DETECTION: - detect_all(DETECT_RAD_DEFAULT); - o_ptr->timeout = randint0(55)+55; - break; - } - } - return; - } - else if (o_ptr->tval == TV_WHISTLE) { if (music_singing_any()) stop_singing(); diff --git a/src/object1.c b/src/object1.c index 2d00b8b84..9e3c8078d 100644 --- a/src/object1.c +++ b/src/object1.c @@ -964,76 +964,6 @@ return " } } - if (o_ptr->tval == TV_AMULET) - { - if (object_is_ego(o_ptr)) - { - switch (o_ptr->name2) - { - case EGO_AMU_IDENT: -#ifdef JP - return "´ÕÄê : 10 ¥¿¡¼¥óËè"; -#else - return "identify every 10 turns"; -#endif - case EGO_AMU_CHARM: -#ifdef JP - return "¥â¥ó¥¹¥¿¡¼Ì¥Î» : 200 ¥¿¡¼¥óËè"; -#else - return "charm monster every 200 turns"; -#endif - case EGO_AMU_JUMP: -#ifdef JP - return "¥·¥ç¡¼¥È¡¦¥Æ¥ì¥Ý¡¼¥È : 10+d10 ¥¿¡¼¥óËè"; -#else - return "blink every 10+d10 turns"; -#endif - case EGO_AMU_TELEPORT: -#ifdef JP - return "¥Æ¥ì¥Ý¡¼¥È : 50+d50 ¥¿¡¼¥óËè"; -#else - return "teleport every 50+d50 turns"; -#endif - case EGO_AMU_D_DOOR: -#ifdef JP - return "¼¡¸µ¤ÎÈâ : 200 ¥¿¡¼¥óËè"; -#else - return "dimension door every 200 turns"; -#endif - case EGO_AMU_RES_FIRE_: -#ifdef JP - return "²Ð±ê¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè"; -#else - return "resist fire every 50+d50 turns"; -#endif - case EGO_AMU_RES_COLD_: -#ifdef JP - return "Î䵤¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè"; -#else - return "resist cold every 50+d50 turns"; -#endif - case EGO_AMU_RES_ELEC_: -#ifdef JP - return "ÅÅ·â¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè"; -#else - return "resist elec every 50+d50 turns"; -#endif - case EGO_AMU_RES_ACID_: -#ifdef JP - return "»À¤Ø¤ÎÂÑÀ­ : 50+d50¥¿¡¼¥óËè"; -#else - return "resist acid every 50+d50 turns"; -#endif - case EGO_AMU_DETECTION: -#ifdef JP - return "Á´´¶ÃÎ : 55+d55¥¿¡¼¥óËè"; -#else - return "detect all floor every 55+d55 turns"; -#endif - } - } - } - if (o_ptr->tval == TV_WHISTLE) { #ifdef JP diff --git a/src/tables.c b/src/tables.c index e1a1122b1..83dd91ee0 100644 --- a/src/tables.c +++ b/src/tables.c @@ -6749,10 +6749,10 @@ activation_type activation_info[] = { "HELO", ACT_HELO, 10, 500 }, { "HELO_SPEED", ACT_HELO_SPEED, 30, 20000 }, { "RESIST_ACID", ACT_RESIST_ACID, 20, 2000 }, - { "RESIST_FIRE", ACT_RESIST_ACID, 20, 2000 }, - { "RESIST_COLD", ACT_RESIST_ACID, 20, 2000 }, - { "RESIST_ELEC", ACT_RESIST_ACID, 20, 2000 }, - { "RESIST_POIS", ACT_RESIST_ACID, 20, 2000 }, + { "RESIST_FIRE", ACT_RESIST_FIRE, 20, 2000 }, + { "RESIST_COLD", ACT_RESIST_COLD, 20, 2000 }, + { "RESIST_ELEC", ACT_RESIST_ELEC, 20, 2000 }, + { "RESIST_POIS", ACT_RESIST_POIS, 20, 2000 }, { "LIGHT", ACT_LIGHT, 10, 150 }, { "MAP_LIGHT", ACT_MAP_LIGHT, 30, 500 },