X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fxtra2.c;h=2a42800b4c44e567959fb57c58d2b2dd1e362796;hb=66abb5c6692a4ff7fa162842c87d4824e67ceae4;hp=3011542eae29eb362ddfd19b54cf51d0d3093ce2;hpb=81898eff96d5e8dd8dc79d092d9420aacff6ef68;p=hengband%2Fhengband.git
diff --git a/src/xtra2.c b/src/xtra2.c
index 3011542ea..2a42800b4 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -12,6 +12,7 @@
#include "angband.h"
+#include "cmd-pet.h"
#define REWARD_CHANCE 10
@@ -103,12 +104,7 @@ void check_experience(void)
sound(SOUND_LEVEL);
/* Message */
-#ifdef JP
-msg_format("ã¬ãã« %d ã«ããããã", p_ptr->lev);
-#else
- msg_format("Welcome to level %d.", p_ptr->lev);
-
-#endif
+ msg_format(_("ã¬ãã« %d ã«ããããã", "Welcome to level %d."), p_ptr->lev);
/* Update some stuff */
p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
@@ -1588,7 +1584,6 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
bool innocent = TRUE, thief = FALSE;
int i;
int expdam;
- int dealt_damage;
(void)COPY(&exp_mon, m_ptr, monster_type);
@@ -1615,9 +1610,6 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
/* Genocided by chaos patron */
if (!m_idx) return TRUE;
- /* Remember dealt_damage before this attack*/
- dealt_damage = m_ptr->dealt_damage;
-
/* Hurt it */
m_ptr->hp -= dam;
@@ -3648,6 +3640,15 @@ bool target_set(BIT_FLAGS mode)
{
strcpy(info, _("qæ¢ pèª oç¾ +次 -å", "q,p,o,+,-,
"));
}
+
+ if (cheat_sight)
+ {
+ char cheatinfo[30];
+ sprintf(cheatinfo, " LOS:%d, PROJECTABLE:%d",
+ los(p_ptr->y, p_ptr->x, y, x),
+ projectable(p_ptr->y, p_ptr->x, y, x));
+ strcat(info, cheatinfo);
+ }
/* Describe and Prompt */
while (TRUE){
@@ -3887,6 +3888,15 @@ bool target_set(BIT_FLAGS mode)
/* Default prompt */
strcpy(info, _("qæ¢ t決 pèª mè¿ +次 -å", "q,t,p,m,+,-,"));
+ if (cheat_sight)
+ {
+ char cheatinfo[30];
+ sprintf(cheatinfo, " LOS:%d, PROJECTABLE:%d",
+ los(p_ptr->y, p_ptr->x, y, x),
+ projectable(p_ptr->y, p_ptr->x, y, x));
+ strcat(info, cheatinfo);
+ }
+
/* Describe and Prompt (enable "TARGET_LOOK") */
while ((query = target_set_aux(y, x, mode | TARGET_LOOK, info)) == 0);
@@ -4489,27 +4499,13 @@ void gain_level_reward(int chosen_reward)
type--;
-#ifdef JP
-sprintf(wrath_reason, "%sã®æã",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- sprintf(wrath_reason, "the Wrath of %s",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
-
+ sprintf(wrath_reason, _("%sã®æã", "the Wrath of %s"), chaos_patrons[p_ptr->chaos_patron]);
effect = chaos_rewards[p_ptr->chaos_patron][type];
if (one_in_(6) && !chosen_reward)
{
-#ifdef JP
-msg_format("%^sã¯è¤ç¾ã¨ãã¦ããªããçªç¶å¤ç°ãããã",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("%^s rewards you with a mutation!",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
-
+ msg_format(_("%^sã¯è¤ç¾ã¨ãã¦ããªããçªç¶å¤ç°ãããã", "%^s rewards you with a mutation!"), chaos_patrons[p_ptr->chaos_patron]);
(void)gain_random_mutation(0);
reward = _("å¤ç°ããã", "mutation");
}
@@ -4517,29 +4513,19 @@ msg_format("%^sã¯è¤ç¾ã¨ãã¦ããªããçªç¶å¤ç°ãããã",
{
switch (chosen_reward ? chosen_reward : effect)
{
+
case REW_POLY_SLF:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ãæ°ããªã姿ãå¿
è¦ã¨ããï¼ã", "'Thou needst a new form, mortal!'"));
do_poly_self();
reward = _("å¤ç°ããã", "polymorphing");
break;
+
case REW_GAIN_EXP:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ã¯è¯ãè¡ãããï¼ç¶ããï¼ã", "'Well done, mortal! Lead on!'"));
if (p_ptr->prace == RACE_ANDROID)
@@ -4556,15 +4542,10 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
reward = _("çµé¨å¤ãå¾ã", "experience");
}
break;
+
case REW_LOSE_EXP:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãä¸åããæ±ããã«å¤ãããã", "'Thou didst not deserve that, slave.'"));
if (p_ptr->prace == RACE_ANDROID)
@@ -4577,9 +4558,10 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
reward = _("çµé¨å¤ã失ã£ãã", "losing experience");
}
break;
+
case REW_GOOD_OBJ:
#ifdef JP
-msg_format("%sã®å£°ãããããã:",
+ msg_format("%sã®å£°ãããããã:",
chaos_patrons[p_ptr->chaos_patron]);
#else
msg_format("The voice of %s whispers:",
@@ -4591,29 +4573,19 @@ msg_format("%sã®å£°ãããããã:",
acquirement(p_ptr->y, p_ptr->x, 1, FALSE, FALSE, FALSE);
reward = _("ä¸è³ªãªã¢ã¤ãã ãæã«å
¥ããã", "a good item");
break;
+
case REW_GREA_OBJ:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæãä¸ããç©ãè³¢æã«ä½¿ãã¹ããã", "'Use my gift wisely.'"));
acquirement(p_ptr->y, p_ptr->x, 1, TRUE, FALSE, FALSE);
reward = _("é«ç´åã®ã¢ã¤ãã ãæã«å
¥ããã", "an excellent item");
break;
+
case REW_CHAOS_WP:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ã®è¡ãã¯è²´ãå£ã«å¤ãããã", "'Thy deed hath earned thee a worthy blade.'"));
/* Get local object */
@@ -4716,41 +4688,30 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
(void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
reward = _("(æ··æ²)ã®æ¦å¨ãæã«å
¥ããã", "chaos weapon");
break;
+
case REW_GOOD_OBS:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ã®è¡ãã¯è²´ãå ±ãã«å¤ãããã", "'Thy deed hath earned thee a worthy reward.'"));
acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, FALSE, FALSE, FALSE);
reward = _("ä¸è³ªãªã¢ã¤ãã ãæã«å
¥ããã", "good items");
break;
+
case REW_GREA_OBS:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãä¸åããæ±ã®ç®èº«ã¸ã®æãæãã¿ç¡ãå ±ããè¦ãããããã", "'Behold, mortal, how generously I reward thy loyalty.'"));
acquirement(p_ptr->y, p_ptr->x, randint1(2) + 1, TRUE, FALSE, FALSE);
reward = _("é«ç´åã®ã¢ã¤ãã ãæã«å
¥ããã", "excellent items");
break;
+
case REW_TY_CURSE:
#ifdef JP
-msg_format("%sã®å£°ãè½ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
+ msg_format("%sã®å£°ãè½ã渡ã£ã:", chaos_patrons[p_ptr->chaos_patron]);
#else
- msg_format("The voice of %s thunders:",
- chaos_patrons[p_ptr->chaos_patron]);
+ msg_format("The voice of %s thunders:", chaos_patrons[p_ptr->chaos_patron]);
#endif
msg_print(_("ãä¸åããæ±å²æ
¢ãªããã", "'Thou art growing arrogant, mortal.'"));
@@ -4758,15 +4719,10 @@ msg_format("%sã®å£°ãè½ã渡ã£ã:",
(void)activate_ty_curse(FALSE, &count);
reward = _("ç¦ã
ããåªãããããããã", "cursing");
break;
+
case REW_SUMMON_M:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæãä¸åãã¡ãããã®å²æ
¢ãªãè
ãåãã¹ãï¼ã", "'My pets, destroy the arrogant mortal!'"));
for (dummy = 0; dummy < randint1(5) + 1; dummy++)
@@ -4775,23 +4731,21 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
}
reward = _("ã¢ã³ã¹ã¿ã¼ãå¬åãããã", "summoning hostile monsters");
break;
+
+
case REW_H_SUMMON:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ãããå¼·ãæµãå¿
è¦ã¨ããï¼ã", "'Thou needst worthier opponents!'"));
activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
reward = _("ã¢ã³ã¹ã¿ã¼ãå¬åãããã", "summoning many hostile monsters");
break;
+
+
case REW_DO_HAVOC:
#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
+ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
chaos_patrons[p_ptr->chaos_patron]);
#else
msg_format("The voice of %s booms out:",
@@ -4803,9 +4757,11 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
call_chaos();
reward = _("ã«ãªã¹ã®åã渦巻ããã", "calling chaos");
break;
+
+
case REW_GAIN_ABL:
#ifdef JP
-msg_format("%sã®å£°ãé³´ãé¿ãã:",
+ msg_format("%sã®å£°ãé³´ãé¿ãã:",
chaos_patrons[p_ptr->chaos_patron]);
#else
msg_format("The voice of %s rings out:",
@@ -4820,9 +4776,11 @@ msg_format("%sã®å£°ãé³´ãé¿ãã:",
do_inc_stat(randint0(6));
reward = _("è½åå¤ãä¸ãã£ãã", "increasing a stat");
break;
+
+
case REW_LOSE_ABL:
#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
+ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
chaos_patrons[p_ptr->chaos_patron]);
#else
msg_format("The voice of %s booms out:",
@@ -4837,9 +4795,12 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
(void)do_dec_stat(randint0(6));
reward = _("è½åå¤ãä¸ãã£ãã", "decreasing a stat");
break;
+
+
case REW_RUIN_ABL:
+
#ifdef JP
-msg_format("%sã®å£°ãè½ã渡ã£ã:",
+ msg_format("%sã®å£°ãè½ã渡ã£ã:",
chaos_patrons[p_ptr->chaos_patron]);
#else
msg_format("The voice of %s thunders:",
@@ -4855,21 +4816,18 @@ msg_format("%sã®å£°ãè½ã渡ã£ã:",
}
reward = _("å
¨è½åå¤ãä¸ãã£ãã", "decreasing all stats");
break;
+
case REW_POLY_WND:
- msg_format(_("%sã®åã触ããã®ãæããã", "You feel the power of %s touch you."),
+ msg_format(_("%sã®åã触ããã®ãæããã", "You feel the power of %s touch you."),
chaos_patrons[p_ptr->chaos_patron]);
do_poly_wounds();
reward = _("å·ãå¤åããã", "polymorphing wounds");
break;
+
case REW_AUGM_ABL:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæããããããªãè³ç©ãåãã¨ããããï¼ã", "'Receive this modest gift from me!'"));
@@ -4879,32 +4837,20 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
}
reward = _("å
¨è½åå¤ãä¸ãã£ãã", "increasing all stats");
break;
+
case REW_HURT_LOT:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãè¦ããããããç¡è½ãªæãè
ãï¼ã", "'Suffer, pathetic fool!'"));
fire_ball(GF_DISINTEGRATE, 0, p_ptr->lev * 4, 4);
take_hit(DAMAGE_NOESCAPE, p_ptr->lev * 4, wrath_reason, -1);
reward = _("å解ã®çãçºçããã", "generating disintegration ball");
break;
- case REW_HEAL_FUL:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
- msg_print(_("ãç¦ãããããæãä¸åãï¼ã", "'Rise, my servant!'"));
+ case REW_HEAL_FUL:
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
restore_level();
(void)set_poisoned(0);
(void)set_blind(0);
@@ -4919,16 +4865,11 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
}
reward = _("ä½åãå復ããã", "healing");
break;
+
case REW_CURSE_WP:
- if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM)) break;
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ if (!buki_motteruka(INVEN_RARM) && !buki_motteruka(INVEN_LARM)) break;
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ãæ¦å¨ã«é ¼ããã¨ãªãããã", "'Thou reliest too much on thy weapon.'"));
dummy = INVEN_RARM;
@@ -4941,16 +4882,11 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
(void)curse_weapon(FALSE, dummy);
reward = format(_("%sãç ´å£ãããã", "destroying %s"), o_name);
break;
+
case REW_CURSE_AR:
- if (!inventory[INVEN_BODY].k_idx) break;
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ if (!inventory[INVEN_BODY].k_idx) break;
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ±ãé²å
·ã«é ¼ããã¨ãªãããã", "'Thou reliest too much on thine equipment.'"));
object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
@@ -4958,14 +4894,8 @@ msg_format("%sã®å£°ãé¿ã渡ã£ã:",
reward = format(_("%sãç ´å£ãããã", "destroying %s"), o_name);
break;
case REW_PISS_OFF:
-#ifdef JP
-msg_format("%sã®å£°ãããããã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s whispers:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãããããã:", "The voice of %s whispers:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæãæãããã罪ãåãã¹ããã", "'Now thou shalt pay for annoying me.'"));
switch (randint1(4))
@@ -5009,10 +4939,10 @@ msg_format("%sã®å£°ãããããã:",
break;
}
break;
+
case REW_WRATH:
- msg_format(_("%sã®å£°ãè½ã渡ã£ã:", "The voice of %s thunders:"),
- chaos_patrons[p_ptr->chaos_patron]);
+ msg_format(_("%sã®å£°ãè½ã渡ã£ã:", "The voice of %s thunders:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ»ã¬ããããä¸åãï¼ã", "'Die, mortal!'"));
take_hit(DAMAGE_LOSELIFE, p_ptr->lev * 4, wrath_reason, -1);
@@ -5037,70 +4967,46 @@ msg_format("%sã®å£°ãããããã:",
}
if (one_in_(2)) (void)curse_armor();
break;
+
case REW_DESTRUCT:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæ»ã¨ç ´å£ããæãåã³ãªãï¼ã", "'Death and destruction! This pleaseth me!'"));
(void)destroy_area(p_ptr->y, p_ptr->x, 25, FALSE);
reward = _("ãã³ã¸ã§ã³ã*ç ´å£*ãããã", "*destruct*ing dungeon");
break;
+
case REW_GENOCIDE:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæãæ±ã®æµãæ¹æ®ºããï¼ã", "'Let me relieve thee of thine oppressors!'"));
-
(void)symbol_genocide(0, FALSE);
reward = _("ã¢ã³ã¹ã¿ã¼ãæ¹æ®ºãããã", "genociding monsters");
break;
+
case REW_MASS_GEN:
-#ifdef JP
-msg_format("%sã®å£°ãé¿ã渡ã£ã:",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("The voice of %s booms out:",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®å£°ãé¿ã渡ã£ã:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
msg_print(_("ãæãæ±ã®æµãæ¹æ®ºããï¼ã", "'Let me relieve thee of thine oppressors!'"));
(void)mass_genocide(0, FALSE);
reward = _("ã¢ã³ã¹ã¿ã¼ãæ¹æ®ºãããã", "genociding nearby monsters");
break;
+
case REW_DISPEL_C:
-#ifdef JP
-msg_format("%sã®åãæµãæ»æããã®ãæããï¼",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("You can feel the power of %s assault your enemies!",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã®åãæµãæ»æããã®ãæããï¼", "You can feel the power of %s assault your enemies!"), chaos_patrons[p_ptr->chaos_patron]);
(void)dispel_monsters(p_ptr->lev * 4);
break;
+
case REW_IGNORE:
-#ifdef JP
-msg_format("%sã¯ããªããç¡è¦ããã",
- chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("%s ignores you.",
- chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sã¯ããªããç¡è¦ããã", "%s ignores you."), chaos_patrons[p_ptr->chaos_patron]);
break;
+
case REW_SER_DEMO:
+
msg_format(_("%sã¯è¤ç¾ã¨ãã¦æªéã®ä½¿ããããããï¼", "%s rewards you with a demonic servant!"),chaos_patrons[p_ptr->chaos_patron]);
if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, PM_FORCE_PET))
@@ -5109,6 +5015,7 @@ msg_format("%sã¯ããªããç¡è¦ããã",
reward = _("æªéããããã«ãªã£ãã", "a demonic servant");
break;
+
case REW_SER_MONS:
msg_format(_("%sã¯è¤ç¾ã¨ãã¦ä½¿ããããããï¼", "%s rewards you with a servant!"),chaos_patrons[p_ptr->chaos_patron]);
@@ -5118,6 +5025,7 @@ msg_format("%sã¯ããªããç¡è¦ããã",
reward = _("ã¢ã³ã¹ã¿ã¼ããããã«ãªã£ãã", "a servant");
break;
+
case REW_SER_UNDE:
msg_format(_("%sã¯è¤ç¾ã¨ãã¦ã¢ã³ãããã®ä½¿ããããããã", "%s rewards you with an undead servant!"),chaos_patrons[p_ptr->chaos_patron]);
@@ -5127,6 +5035,7 @@ msg_format("%sã¯ããªããç¡è¦ããã",
reward = _("ã¢ã³ãããããããã«ãªã£ãã", "an undead servant");
break;
+
default:
msg_format(_("%sã®å£°ãã©ãã£ã:", "The voice of %s stammers:"),