From e4789bde97c287e93a7d0ab309d8feae6d21b858 Mon Sep 17 00:00:00 2001 From: dis- Date: Sun, 19 May 2013 09:23:22 +0000 Subject: [PATCH] Add Elemental brand ego Activation. ball(100) and temp resistance like ring of flame --- lib/edit/e_info.txt | 15 ++++++++++----- src/artifact.c | 44 +++++++++++++++----------------------------- src/object1.c | 12 ++++++++---- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt index 5958f3d23..900946331 100644 --- a/lib/edit/e_info.txt +++ b/lib/edit/e_info.txt @@ -584,32 +584,37 @@ N:72: E:of Melting X:24:15 W:0:36:0:8000 -F:BRAND_ACID | RES_ACID | IGNORE_ACID +F:BRAND_ACID | RES_ACID | IGNORE_ACID | ACTIVATE +U:RESIST_ACID N:73:ÅÅ·â¤Î E:of Shocking X:24:20 W:0:36:0:4500 -F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC +F:BRAND_ELEC | RES_ELEC | IGNORE_ELEC | ACTIVATE +U:RESIST_ELEC N:74:¾Æ´þ¤Î E:of Burning X:24:20 W:0:36:0:3000 -F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE | LITE +F:BRAND_FIRE | RES_FIRE | IGNORE_FIRE | LITE | ACTIVATE +U:RESIST_FIRE N:75:Åà·ë¤Î E:of Freezing X:24:15 W:0:36:0:2500 -F:BRAND_COLD | RES_COLD | IGNORE_COLD +F:BRAND_COLD | RES_COLD | IGNORE_COLD | ACTIVATE +U:RESIST_COLD #JZ# N:76:ÆÇ»¦¤Î E:of Venom X:24:20 W:0:36:0:4500 -F:BRAND_POIS | RES_POIS +F:BRAND_POIS | RES_POIS | ACTIVATE +U:RESIST_POIS #JZ# N:77:(º®ÆÙ) diff --git a/src/artifact.c b/src/artifact.c index bbcc46ceb..364815f14 100644 --- a/src/artifact.c +++ b/src/artifact.c @@ -3198,12 +3198,8 @@ bool activate_random_artifact(object_type *o_ptr) case ACT_RESIST_ACID: { -#ifdef JP - msg_format("%s¤¬¹õ¤¯µ±¤¤¤¿...", name); -#else - msg_format("The %s grows black.", name); -#endif - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ACID)) + msg_format(_("%s¤¬¹õ¤¯µ±¤¤¤¿...", "The %s grows black."), name); + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ACID)) || (o_ptr->name2 == EGO_BRAND_ACID)) { if (!get_aim_dir(&dir)) return FALSE; fire_ball(GF_ACID, dir, 100, 2); @@ -3214,12 +3210,8 @@ bool activate_random_artifact(object_type *o_ptr) case ACT_RESIST_FIRE: { -#ifdef JP - msg_format("%s¤¬ÀÖ¤¯µ±¤¤¤¿...", name); -#else - msg_format("The %s grows red.", name); -#endif - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) + msg_format(_("%s¤¬ÀÖ¤¯µ±¤¤¤¿...","The %s grows red."), name); + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) || (o_ptr->name2 == EGO_BRAND_FIRE)) { if (!get_aim_dir(&dir)) return FALSE; fire_ball(GF_FIRE, dir, 100, 2); @@ -3230,12 +3222,8 @@ bool activate_random_artifact(object_type *o_ptr) case ACT_RESIST_COLD: { -#ifdef JP - msg_format("%s¤¬Çò¤¯µ±¤¤¤¿...", name); -#else - msg_format("The %s grows white.", name); -#endif - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) + msg_format(_("%s¤¬Çò¤¯µ±¤¤¤¿...","The %s grows white.") , name); + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) || (o_ptr->name2 == EGO_BRAND_COLD)) { if (!get_aim_dir(&dir)) return FALSE; fire_ball(GF_COLD, dir, 100, 2); @@ -3246,12 +3234,8 @@ bool activate_random_artifact(object_type *o_ptr) case ACT_RESIST_ELEC: { -#ifdef JP - msg_format("%s¤¬ÀĤ¯µ±¤¤¤¿...", name); -#else - msg_format("The %s grows blue.", name); -#endif - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ELEC)) + msg_format(_("%s¤¬ÀĤ¯µ±¤¤¤¿...", "The %s grows blue."), name); + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ELEC)) || (o_ptr->name2 == EGO_BRAND_ELEC)) { if (!get_aim_dir(&dir)) return FALSE; fire_ball(GF_ELEC, dir, 100, 2); @@ -3262,11 +3246,13 @@ bool activate_random_artifact(object_type *o_ptr) case ACT_RESIST_POIS: { -#ifdef JP - msg_format("%s¤¬ÎФ˵±¤¤¤¿...", name); -#else - msg_format("The %s grows green.", name); -#endif + msg_format(_("%s¤¬ÎФ˵±¤¤¤¿...", "The %s grows green."), name); + if (o_ptr->name2 == EGO_BRAND_POIS) + { + if (!get_aim_dir(&dir)) return FALSE; + fire_ball(GF_POIS, dir, 100, 2); + } + (void)set_oppose_pois(randint1(20) + 20, FALSE); break; } diff --git a/src/object1.c b/src/object1.c index 78fea6e0b..5659ec898 100644 --- a/src/object1.c +++ b/src/object1.c @@ -384,21 +384,25 @@ static cptr item_activation_aux(object_type *o_ptr) desc = _("Çï»ÒÌÚ¤òÂǤÁ¤Ê¤é¤¹", "beat wooden clappers"); break; case ACT_RESIST_ACID: - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ACID)) + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ACID)) || (o_ptr->name2 == EGO_BRAND_ACID)) desc = _("¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë (100) ¤È»À¤Ø¤ÎÂÑÀ­", "ball of acid (100) and resist acid"); break; case ACT_RESIST_FIRE: - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_FLAMES)) || (o_ptr->name2 == EGO_BRAND_FIRE)) desc = _("¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (100) ¤È²Ð¤Ø¤ÎÂÑÀ­", "ball of fire (100) and resist fire"); break; case ACT_RESIST_COLD: - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ICE)) || (o_ptr->name2 == EGO_BRAND_COLD)) desc = _("¥¢¥¤¥¹¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ­", "ball of cold (100) and resist cold"); break; case ACT_RESIST_ELEC: - if ((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ELEC)) + if (((o_ptr->tval == TV_RING) && (o_ptr->sval == SV_RING_ELEC)) || (o_ptr->name2 == EGO_BRAND_ELEC)) desc = _("¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) ¤ÈÅÅ·â¤Ø¤ÎÂÑÀ­", "ball of elec (100) and resist elec"); break; + case ACT_RESIST_POIS: + if (o_ptr->name2 == EGO_BRAND_POIS) + desc = _("°­½­±À (100) ¤ÈÆǤؤÎÂÑÀ­", "ball of poison (100) and resist elec"); + break; } /* Timeout description */ -- 2.11.0