X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fxtra2.c;h=5f6ce903949ef12f33b323461dafef1a0cae9532;hb=2e0bb544a4dbdd0a190028450cf6efbad793fc5c;hp=1f54bd4efac5872986bdab1074473a45e94904e6;hpb=1c750bbc037ebf3dfd1f1ff6f3f511530070c241;p=hengband%2Fhengband.git

diff --git a/src/xtra2.c b/src/xtra2.c
index 1f54bd4ef..5f6ce9039 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);
@@ -481,7 +477,7 @@ void check_quest_completion(monster_type *m_ptr)
 	{
 		int i;
 
-		for (i = max_quests - 1; i > 0; i--)
+		for (i = max_q_idx - 1; i > 0; i--)
 		{
 			quest_type* const q_ptr = &quest[i];
 			
@@ -680,7 +676,7 @@ void check_find_art_quest_completion(object_type *o_ptr)
 {
 	int i;
 	/* Check if completed a quest */
-	for (i = 0; i < max_quests; i++)
+	for (i = 0; i < max_q_idx; i++)
 	{
 		if ((quest[i].type == QUEST_TYPE_FIND_ARTIFACT) &&
 		    (quest[i].status == QUEST_STATUS_TAKEN) &&
@@ -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;
 	
@@ -3510,9 +3502,9 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
 			if (c_ptr->mimic) sprintf(f_idx_str, "%d/%d", c_ptr->feat, c_ptr->mimic);
 			else sprintf(f_idx_str, "%d", c_ptr->feat);
 #ifdef JP
-			sprintf(out_val, "%s%s%s%s[%s] %x %s %d %d %d (%d,%d) %d", s1, name, s2, s3, info, c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, y, x, travel.cost[y][x]);
+			sprintf(out_val, "%s%s%s%s[%s] %x %s %d %d %d (%d,%d) %d", s1, name, s2, s3, info, (unsigned int)c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, (int)y, (int)x, travel.cost[y][x]);
 #else
-			sprintf(out_val, "%s%s%s%s [%s] %x %s %d %d %d (%d,%d)", s1, s2, s3, name, info, c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, y, x);
+			sprintf(out_val, "%s%s%s%s [%s] %x %s %d %d %d (%d,%d)", s1, s2, s3, name, info, c_ptr->info, f_idx_str, c_ptr->dist, c_ptr->cost, c_ptr->when, (int)y, (int)x);
 #endif
 		}
 		else
@@ -4091,6 +4083,7 @@ bool get_aim_dir(DIRECTION *dp)
 	DIRECTION dir;
 	char	command;
 	cptr	p;
+	COMMAND_CODE code;
 
 	/* Initialize */
 	(*dp) = 0;
@@ -4103,17 +4096,18 @@ bool get_aim_dir(DIRECTION *dp)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-	if (repeat_pull(dp))
+	if (repeat_pull(&code))
 	{
 		/* Confusion? */
 
 		/* Verify */
-		if (!(*dp == 5 && !target_okay()))
+		if (!(code == 5 && !target_okay()))
 		{
 /*			return (TRUE); */
-			dir = *dp;
+			dir = (DIRECTION)code;
 		}
 	}
+	*dp = (DIRECTION)code;
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4208,7 +4202,7 @@ bool get_aim_dir(DIRECTION *dp)
 #ifdef ALLOW_REPEAT /* TNB */
 
 /*	repeat_push(dir); */
-	repeat_push(command_dir);
+	repeat_push((COMMAND_CODE)command_dir);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4238,6 +4232,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 {
 	DIRECTION dir;
 	cptr prompt;
+	COMMAND_CODE code;
 
 	/* Initialize */
 	(*dp) = 0;
@@ -4247,11 +4242,12 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-	if (repeat_pull(dp))
+	if (repeat_pull(&code))
 	{
-		dir = *dp;
+		dir = (DIRECTION)code;
 /*		return (TRUE); */
 	}
+	*dp = (DIRECTION)code;
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4363,7 +4359,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 #ifdef ALLOW_REPEAT /* TNB */
 
 /*	repeat_push(dir); */
-	repeat_push(command_dir);
+	repeat_push((COMMAND_CODE)command_dir);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4375,6 +4371,7 @@ bool get_rep_dir(DIRECTION *dp, bool under)
 bool get_rep_dir2(DIRECTION *dp)
 {
 	DIRECTION dir;
+	COMMAND_CODE code;
 
 	/* Initialize */
 	(*dp) = 0;
@@ -4384,11 +4381,12 @@ bool get_rep_dir2(DIRECTION *dp)
 
 #ifdef ALLOW_REPEAT /* TNB */
 
-	if (repeat_pull(dp))
+	if (repeat_pull(&code))
 	{
-		dir = *dp;
+		dir = (DIRECTION)code;
 /*		return (TRUE); */
 	}
+	*dp = (DIRECTION)code;
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4440,7 +4438,7 @@ bool get_rep_dir2(DIRECTION *dp)
 #ifdef ALLOW_REPEAT /* TNB */
 
 /*	repeat_push(dir); */
-	repeat_push(command_dir);
+	repeat_push((COMMAND_CODE)command_dir);
 
 #endif /* ALLOW_REPEAT -- TNB */
 
@@ -4483,27 +4481,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");
 	}
@@ -4511,29 +4495,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)
@@ -4550,15 +4524,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)
@@ -4571,9 +4540,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:",
@@ -4585,29 +4555,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 */
@@ -4710,41 +4670,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.'"));
@@ -4752,15 +4701,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++)
@@ -4769,23 +4713,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:",
@@ -4797,9 +4739,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:",
@@ -4814,9 +4758,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:",
@@ -4831,9 +4777,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:",
@@ -4849,21 +4798,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!'"));
 
@@ -4873,32 +4819,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);
@@ -4913,16 +4847,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;
@@ -4935,16 +4864,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);
@@ -4952,14 +4876,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))
@@ -5003,10 +4921,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);
@@ -5031,70 +4949,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))
@@ -5103,6 +4997,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]);
 
@@ -5112,6 +5007,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]);
 
@@ -5121,6 +5017,7 @@ msg_format("%sはあなたを無視した。",
 				reward = _("アンデッドがペットになった。", "an undead servant");
 
 			break;
+
 		default:
 			msg_format(_("%sの声がどもった:", "The voice of %s stammers:"),