#include "angband.h"
+#include "cmd-pet.h"
+#include "object-curse.h"
#define REWARD_CHANCE 10
bool level_mutation = FALSE;
bool level_inc_stat = FALSE;
bool android = (p_ptr->prace == RACE_ANDROID ? TRUE : FALSE);
- int old_lev = p_ptr->lev;
+ PLAYER_LEVEL old_lev = p_ptr->lev;
/* Hack -- lower limit */
if (p_ptr->exp < 0) p_ptr->exp = 0;
/* Redraw some stuff */
p_ptr->redraw |= (PR_LEV | PR_TITLE);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER);
/* Handle stuff */
do_cmd_write_nikki(NIKKI_LEVELUP, p_ptr->lev, NULL);
}
- /* Sound */
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);
/* Redraw some stuff */
p_ptr->redraw |= (PR_LEV | PR_TITLE | PR_EXP);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER | PW_SPELL | PW_INVEN);
/* HPとMPの上昇量を表示 */
for(n = 0; n < 6; n++)
if (n != choice - 'a')
prt("",n+2,14);
-#ifdef JP
- if (get_check("よろしいですか？")) break;
-#else
- if (get_check("Are you sure? ")) break;
-#endif
+ if (get_check(_("よろしいですか？", "Are you sure? "))) break;
}
do_inc_stat(choice - 'a');
screen_load();
if (level_mutation)
{
-#ifdef JP
-msg_print("あなたは変わった気がする...");
-#else
- msg_print("You feel different...");
-#endif
-
+ msg_print(_("あなたは変わった気がする...", "You feel different..."));
(void)gain_random_mutation(0);
level_mutation = FALSE;
}
/* Redraw some stuff */
p_ptr->redraw |= (PR_LEV | PR_TITLE);
- /* Window stuff */
p_ptr->window |= (PW_PLAYER | PW_SPELL);
/* Handle stuff */
* @details
* Hack -- Return the "automatic coin type" of a monster race
* Used to allocate proper treasure when "Creeping coins" die
- * XXX XXX XXX Note the use of actual "monster names"
+ * Note the use of actual "monster names"
*/
-static int get_coin_type(int r_idx)
+static int get_coin_type(MONRACE_IDX r_idx)
{
/* Analyze monsters */
switch (r_idx)
{
- case MON_COPPER_COINS: return 2;
- case MON_SILVER_COINS: return 5;
- case MON_GOLD_COINS: return 10;
- case MON_MITHRIL_COINS:
- case MON_MITHRIL_GOLEM: return 16;
- case MON_ADAMANT_COINS: return 17;
+ case MON_COPPER_COINS: return 2;
+ case MON_SILVER_COINS: return 5;
+ case MON_GOLD_COINS: return 10;
+ case MON_MITHRIL_COINS:
+ case MON_MITHRIL_GOLEM: return 16;
+ case MON_ADAMANT_COINS: return 17;
}
/* Assume nothing */
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトがクロークならばTRUEを返す
*/
-static bool kind_is_cloak(int k_idx)
+static bool kind_is_cloak(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトが竿状武器ならばTRUEを返す
*/
-static bool kind_is_polearm(int k_idx)
+static bool kind_is_polearm(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトが剣ならばTRUEを返す
*/
-static bool kind_is_sword(int k_idx)
+static bool kind_is_sword(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトが魔法書ならばTRUEを返す
*/
-static bool kind_is_book(int k_idx)
+static bool kind_is_book(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトがベースアイテム時点でGOODなアイテムならばTRUEを返す
*/
-static bool kind_is_good_book(int k_idx)
+static bool kind_is_good_book(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトが鎧ならばTRUEを返す
*/
-static bool kind_is_armor(int k_idx)
+static bool kind_is_armor(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param k_idx 判定したいオブジェクトのベースアイテムID
* @return オブジェクトが打撃武器ならばTRUEを返す
*/
-static bool kind_is_hafted(int k_idx)
+static bool kind_is_hafted(KIND_OBJECT_IDX k_idx)
{
object_kind *k_ptr = &k_info[k_idx];
* @param quest_num 達成状態にしたいクエストのID
* @return なし
*/
-void complete_quest(int quest_num)
+void complete_quest(QUEST_IDX quest_num)
{
quest_type* const q_ptr = &quest[quest_num];
if (!(q_ptr->flags & QUEST_FLAG_SILENT))
{
+ play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_QUEST_CLEAR);
msg_print(_("クエストを達成した！", "You just completed your quest!"));
msg_print(NULL);
}
* @brief 現在フロアに残っている敵モンスターの数を返す /
* @return 現在の敵モンスターの数
*/
-static int count_all_hostile_monsters(void)
+static MONSTER_NUMBER count_all_hostile_monsters(void)
{
- int x, y;
- int number_mon = 0;
+ POSITION x, y;
+ MONSTER_NUMBER number_mon = 0;
for (x = 0; x < cur_wid; ++ x)
{
for (y = 0; y < cur_hgt; ++ y)
{
- int m_idx = cave[y][x].m_idx;
+ MONSTER_IDX m_idx = cave[y][x].m_idx;
if (m_idx > 0 && is_hostile(&m_list[m_idx]))
{
- ++ number_mon;
+ ++number_mon;
}
}
}
*/
void check_quest_completion(monster_type *m_ptr)
{
- int y, x;
-
- int quest_num;
+ POSITION y, x;
+ QUEST_IDX quest_num;
bool create_stairs = FALSE;
bool reward = FALSE;
object_type forge;
- object_type *q_ptr;
+ object_type *o_ptr;
/* Get the location */
y = m_ptr->fy;
x = m_ptr->fx;
/* Inside a quest */
- quest_num = p_ptr->inside_quest;
+ quest_num = p_ptr->inside_quest;
/* Search for an active quest on this dungeon level */
if (!quest_num)
{
- int i;
+ QUEST_IDX 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];
/* Create a magical staircase */
if (create_stairs)
{
- int ny, nx;
+ POSITION ny, nx;
/* Stagger around */
while (cave_perma_bold(y, x) || cave[y][x].o_idx || (cave[y][x].info & CAVE_OBJECT) )
}
/* Explain the staircase */
-#ifdef JP
-msg_print("魔法の階段が現れた...");
-#else
- msg_print("A magical staircase appears...");
-#endif
-
+ msg_print(_("魔法の階段が現れた...", "A magical staircase appears..."));
/* Create stairs down */
cave_set_feat(y, x, feat_down_stair);
for (i = 0; i < (dun_level / 15)+1; i++)
{
/* Get local object */
- q_ptr = &forge;
-
- /* Wipe the object */
- object_wipe(q_ptr);
+ o_ptr = &forge;
+ object_wipe(o_ptr);
/* Make a great object */
- make_object(q_ptr, AM_GOOD | AM_GREAT);
+ make_object(o_ptr, AM_GOOD | AM_GREAT);
/* Drop it in the dungeon */
- (void)drop_near(q_ptr, -1, y, x);
+ (void)drop_near(o_ptr, -1, y, x);
}
}
}
*/
void check_find_art_quest_completion(object_type *o_ptr)
{
- int i;
+ QUEST_IDX 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) &&
- (quest[i].k_idx == o_ptr->name1))
+ if((quest[i].type == QUEST_TYPE_FIND_ARTIFACT) &&
+ (quest[i].status == QUEST_STATUS_TAKEN) &&
+ (quest[i].k_idx == o_ptr->name1))
{
complete_quest(i);
}
{
if (r_ptr->blow[i].method == RBM_EXPLODE)
{
-#ifdef JP
- return "は爆発して粉々になった。";
-#else
- return " explodes into tiny shreds.";
-#endif
+ return _("は爆発して粉々になった。", " explodes into tiny shreds.");
}
}
-
-#ifdef JP
- return "を倒した。";
-#else
- return " is destroyed.";
-#endif
+ return _("を倒した。", " is destroyed.");
}
/* Assume a default death */
-#ifdef JP
- return "は死んだ。";
-#else
- return " dies.";
-#endif
+ return _("は死んだ。", " dies.");
}
* it drops all of its objects, which may disappear in crowded rooms.
* </pre>
*/
-void monster_death(int m_idx, bool drop_item)
+void monster_death(MONSTER_IDX m_idx, bool drop_item)
{
int i, j, y, x;
{
if (r_ptr->blow[i].method == RBM_EXPLODE)
{
- int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
- int typ = mbe_info[r_ptr->blow[i].effect].explode_type;
- int d_dice = r_ptr->blow[i].d_dice;
- int d_side = r_ptr->blow[i].d_side;
- int damage = damroll(d_dice, d_side);
+ BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+ EFFECT_ID typ = mbe_info[r_ptr->blow[i].effect].explode_type;
+ DICE_NUMBER d_dice = r_ptr->blow[i].d_dice;
+ DICE_SID d_side = r_ptr->blow[i].d_side;
+ HIT_POINT damage = damroll(d_dice, d_side);
project(m_idx, 3, y, x, damage, typ, flg, -1);
break;
if (p_ptr->arena_number > MAX_ARENA_MONS)
{
-#ifdef JP
-msg_print("素晴らしい！君こそ真の勝利者だ。");
-#else
- msg_print("You are a Genuine Champion!");
-#endif
+ msg_print(_("素晴らしい！君こそ真の勝利者だ。", "You are a Genuine Champion!"));
}
else
{
-#ifdef JP
-msg_print("勝利！チャンピオンへの道を進んでいる。");
-#else
- msg_print("Victorious! You're on your way to becoming Champion.");
-#endif
+ msg_print(_("勝利！チャンピオンへの道を進んでいる。", "Victorious! You're on your way to becoming Champion."));
}
if (arena_info[p_ptr->arena_number].tval)
{
if (rakuba(-1, FALSE))
{
-#ifdef JP
-msg_print("地面に落とされた。");
-#else
- msg_print("You have fallen from your riding pet.");
-#endif
+ msg_print(_("地面に落とされた。", "You have fallen from your riding pet."));
}
}
{
int wy = y, wx = x;
bool pet = is_pet(m_ptr);
- u32b mode = 0L;
+ BIT_FLAGS mode = 0L;
if (pet) mode |= PM_FORCE_PET;
}
if (notice)
-#ifdef JP
- msg_print("ピンク・ホラーは分裂した！");
-#else
- msg_print("The Pink horror divides!");
-#endif
+ msg_print(_("ピンク・ホラーは分裂した！", "The Pink horror divides!"));
}
break;
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Activate restriction */
{
if (!one_in_(7))
{
- int wy = y, wx = x;
+ POSITION wy = y, wx = x;
int attempts = 100;
bool pet = is_pet(m_ptr);
if (attempts > 0)
{
- u32b mode = 0L;
+ BIT_FLAGS mode = 0L;
if (pet) mode |= PM_FORCE_PET;
if (summon_specific((pet ? -1 : m_idx), wy, wx, 100, SUMMON_DAWN, mode))
{
if (player_can_see_bold(wy, wx))
-#ifdef JP
- msg_print("新たな戦士が現れた！");
-#else
- msg_print("A new warrior steps forth!");
-#endif
-
+ msg_print(_("新たな戦士が現れた！", "A new warrior steps forth!"));
}
}
}
case MON_UNMAKER:
/* One more ultra-hack: An Unmaker goes out with a big bang! */
{
- int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+ BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
(void)project(m_idx, 6, y, x, 100, GF_CHAOS, flg, -1);
}
break;
/* Reward for "lazy" player */
if (p_ptr->pseikaku == SEIKAKU_NAMAKE)
{
- int a_idx = 0;
+ ARTIFACT_IDX a_idx = 0;
artifact_type *a_ptr = NULL;
if (!drop_chosen_item) break;
case MON_ROLENTO:
{
- int flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
+ BIT_FLAGS flg = PROJECT_GRID | PROJECT_ITEM | PROJECT_KILL;
(void)project(m_idx, 3, y, x, damroll(20, 10), GF_FIRE, flg, -1);
}
break;
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Activate restriction */
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Activate restriction */
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Activate restriction */
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Activate restriction */
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Activate restriction */
/* Mega-Hack -- drop fixed items */
if (drop_chosen_item)
{
- int a_idx = 0;
+ ARTIFACT_IDX a_idx = 0;
int chance = 0;
- switch (m_ptr->r_idx)
+ for(i = 0; i < 4; i++)
{
- case MON_OBERON:
- if (one_in_(3))
- {
- a_idx = ART_JUDGE;
- chance = 33;
- }
- else
- {
- a_idx = ART_AMBER;
- chance = 50;
- }
- break;
-
- case MON_GHB:
- a_idx = ART_GHB;
- chance = 100;
- break;
-
- case MON_STORMBRINGER:
- a_idx = ART_STORMBRINGER;
- chance = 100;
- break;
-
- case MON_ECHIZEN:
- a_idx = ART_CRIMSON;
- chance = 50;
- break;
-
- case MON_GANDALF:
- a_idx = ART_ICANUS;
- chance = 20;
- break;
-
- case MON_OROCHI:
- a_idx = ART_KUSANAGI;
- chance = 25;
- break;
-
- case MON_DWORKIN:
- a_idx = ART_JUDGE;
- chance = 20;
- break;
-
- case MON_SAURON:
- if (one_in_(10))
- {
- a_idx = ART_POWER;
- chance = 100;
- }
- else
- {
- a_idx = ART_AHO;
- chance = 100;
- }
- break;
-
- case MON_BRAND:
- if (!one_in_(3))
- {
- a_idx = ART_BRAND;
- chance = 25;
- }
- else
- {
- a_idx = ART_WEREWINDLE;
- chance = 33;
- }
- break;
-
- case MON_CORWIN:
- if (!one_in_(3))
- {
- a_idx = ART_GRAYSWANDIR;
- chance = 33;
- }
- else
- {
- a_idx = ART_CORWIN;
- chance = 33;
- }
- break;
-
- case MON_SURTUR:
- if (!one_in_(3))
- {
- a_idx = ART_TWILIGHT;
- chance = 100;
- }
- else
- {
- a_idx = ART_ORB_OF_FATE;
- chance = 100;
- }
- break;
-
- case MON_SARUMAN:
- a_idx = ART_ELENDIL;
- chance = 33;
- break;
-
- case MON_FIONA:
- a_idx = ART_FIONA;
- chance = 50;
- break;
-
- case MON_JULIAN:
- a_idx = ART_JULIAN;
- chance = 45;
- break;
-
- case MON_KLING:
- a_idx = ART_DESTINY;
- chance = 40;
- break;
-
- case MON_GOEMON:
- a_idx = ART_ZANTETSU;
- chance = 100;
- break;
-
- case MON_HAGEN:
- a_idx = ART_HAGEN;
- chance = 66;
- break;
-
- case MON_CAINE:
- a_idx = ART_CAINE;
- chance = 50;
- break;
-
- case MON_BULLGATES:
- a_idx = ART_WINBLOWS;
- chance = 66;
- break;
-
- case MON_LUNGORTHIN:
- a_idx = ART_CALRIS;
- chance = 50;
- break;
-
- case MON_JACK_SHADOWS:
- a_idx = ART_JACK;
- chance = 15;
- break;
-
- case MON_DIO:
- a_idx = ART_STONEMASK;
- chance = 20;
- break;
-
- case MON_BELD:
- a_idx = ART_SOULCRUSH;
- chance = 10;
- break;
-
- case MON_PIP:
- a_idx = ART_EXCALIBUR_J;
- chance = 50;
- break;
-
- case MON_SHUTEN:
- a_idx = ART_SHUTEN_DOJI;
- chance = 33;
- break;
-
- case MON_GOTHMOG:
- a_idx = ART_GOTHMOG;
- chance = 33;
- break;
-
- case MON_FUNDIN:
- a_idx = ART_FUNDIN;
- chance = 5;
- break;
-
- case MON_ROBIN_HOOD:
- a_idx = ART_ROBIN_HOOD;
- chance = 5;
- break;
-
- case MON_KOGAN:
- a_idx = ART_NANACHO;
- chance = 80;
- break;
-
+ if(!r_ptr->artifact_id[i]) break;
+ a_idx = r_ptr->artifact_id[i];
+ chance = r_ptr->artifact_percent[i];
}
if ((a_idx > 0) && ((randint0(100) < chance) || p_ptr->wizard))
if ((r_ptr->flags7 & RF7_GUARDIAN) && (d_info[dungeon_type].final_guardian == m_ptr->r_idx))
{
- int k_idx = d_info[dungeon_type].final_object ? d_info[dungeon_type].final_object
+ KIND_OBJECT_IDX k_idx = d_info[dungeon_type].final_object ? d_info[dungeon_type].final_object
: lookup_kind(TV_SCROLL, SV_SCROLL_ACQUIREMENT);
if (d_info[dungeon_type].final_artifact)
{
- int a_idx = d_info[dungeon_type].final_artifact;
+ a_idx = d_info[dungeon_type].final_artifact;
artifact_type *a_ptr = &a_info[a_idx];
if (!a_ptr->cur_num)
/* Drop it in the dungeon */
(void)drop_near(q_ptr, -1, y, x);
}
-#ifdef JP
- msg_format("あなたは%sを制覇した！",d_name+d_info[dungeon_type].name);
-#else
- msg_format("You have conquered %s!",d_name+d_info[dungeon_type].name);
-#endif
+ msg_format(_("あなたは%sを制覇した！", "You have conquered %s!"),d_name+d_info[dungeon_type].name);
}
}
{
/* Get local object */
q_ptr = &forge;
-
- /* Wipe the object */
object_wipe(q_ptr);
/* Make Gold */
/* Make some gold */
if (!make_gold(q_ptr)) continue;
- /* XXX XXX XXX */
dump_gold++;
}
/* Make an object */
if (!make_object(q_ptr, mo_mode)) continue;
- /* XXX XXX XXX */
dump_item++;
}
/* Redraw the "title" */
p_ptr->redraw |= (PR_TITLE);
-#ifdef JP
- do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "見事に変愚蛮怒の勝利者となった！");
-#else
- do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "become *WINNER* of Hengband finely!");
-#endif
+ play_music(TERM_XTRA_MUSIC_BASIC, MUSIC_BASIC_FINAL_QUEST_CLEAR);
+
+ do_cmd_write_nikki(NIKKI_BUNSHOU, 0, _("見事に変愚蛮怒の勝利者となった！", "become *WINNER* of Hengband finely!"));
if ((p_ptr->pclass == CLASS_CHAOS_WARRIOR) || (p_ptr->muta2 & MUT2_CHAOS_GIFT))
{
-#ifdef JP
- msg_format("%sからの声が響いた。", chaos_patrons[p_ptr->chaos_patron]);
- msg_print("『よくやった、定命の者よ！』");
-#else
- msg_format("The voice of %s booms out:", chaos_patrons[p_ptr->chaos_patron]);
- msg_print("'Thou art donst well, mortal!'");
-#endif
+ msg_format(_("%sからの声が響いた。", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
+ msg_print(_("『よくやった、定命の者よ！』", "'Thou art donst well, mortal!'"));
}
/* Congratulations */
-#ifdef JP
- msg_print("*** おめでとう ***");
-#else
- msg_print("*** CONGRATULATIONS ***");
-#endif
-
-#ifdef JP
- msg_print("あなたはゲームをコンプリートしました。");
-#else
- msg_print("You have won the game!");
-#endif
-
-#ifdef JP
- msg_print("準備が整ったら引退(自殺コマンド)しても結構です。");
-#else
- msg_print("You may retire (commit suicide) when you are ready.");
-#endif
+ msg_print(_("*** おめでとう ***", "*** CONGRATULATIONS ***"));
+ msg_print(_("あなたはゲームをコンプリートしました。", "You have won the game!"));
+ msg_print(_("準備が整ったら引退(自殺コマンド)しても結構です。", "You may retire (commit suicide) when you are ready."));
}
}
* "type" is not yet used and should be 0.
* </pre>
*/
-int mon_damage_mod(monster_type *m_ptr, int dam, bool is_psy_spear)
+HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear)
{
monster_race *r_ptr = &r_info[m_ptr->r_idx];
{
if (!p_ptr->blind && is_seen(m_ptr))
{
-#ifdef JP
- msg_print("バリアを切り裂いた！");
-#else
- msg_print("The barrier is penetrated!");
-#endif
+ msg_print(_("バリアを切り裂いた！", "The barrier is penetrated!"));
}
}
else if (!one_in_(PENETRATE_INVULNERABILITY))
* experience point of a monster later.
* </pre>
*/
-static void get_exp_from_mon(int dam, monster_type *m_ptr)
+static void get_exp_from_mon(HIT_POINT dam, monster_type *m_ptr)
{
monster_race *r_ptr = &r_info[m_ptr->r_idx];
}
/* Special penalty for rest_and_shoot exp scum */
- if ((m_ptr->dealt_damage > (u32b)m_ptr->max_maxhp) && (m_ptr->hp >= 0))
+ if ((m_ptr->dealt_damage > m_ptr->max_maxhp) && (m_ptr->hp >= 0))
{
int over_damage = m_ptr->dealt_damage / m_ptr->max_maxhp;
if (over_damage > 32) over_damage = 32;
* Made name, sex, and capitalization generic -BEN-
* As always, the "ghost" processing is a total hack.
* Hack -- we "delay" fear messages by passing around a "fear" flag.
- * XXX XXX XXX Consider decreasing monster experience over time, say,
+ * Consider decreasing monster experience over time, say,
* by using "(m_exp * m_lev * (m_lev)) / (p_lev * (m_lev + n_killed))"
* instead of simply "(m_exp * m_lev) / (p_lev)", to make the first
* monster worth more than subsequent monsters. This would also need
* to induce changes in the monster recall code.
* </pre>
*/
-bool mon_take_hit(int m_idx, int dam, bool *fear, cptr note)
+bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
{
monster_type *m_ptr = &m_list[m_idx];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
bool innocent = TRUE, thief = FALSE;
int i;
int expdam;
- int dealt_damage;
(void)COPY(&exp_mon, m_ptr, monster_type);
/* 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;
m_ptr->dealt_damage += dam;
- if(m_ptr->dealt_damage > (u32b)m_ptr->max_maxhp * 100) m_ptr->dealt_damage = m_ptr->max_maxhp * 100;
+ if(m_ptr->dealt_damage > m_ptr->max_maxhp * 100) m_ptr->dealt_damage = m_ptr->max_maxhp * 100;
if (p_ptr->wizard)
{
msg_format( _("合計%d/%dのダメージを与えた。","You do %d (out of %d) damage."),
bool stop_ty = FALSE;
int count = 0;
-#ifdef JP
-msg_format("%^sは恐ろしい血の呪いをあなたにかけた！", m_name);
-#else
- msg_format("%^s puts a terrible blood curse on you!", m_name);
-#endif
-
+ msg_format(_("%^sは恐ろしい血の呪いをあなたにかけた！", "%^s puts a terrible blood curse on you!"), m_name);
curse_equipment(100, 50);
do
char line_got[1024];
/* Dump a message */
-#ifdef JP
- if (!get_rnd_line("mondeath_j.txt", m_ptr->r_idx, line_got))
-#else
- if (!get_rnd_line("mondeath.txt", m_ptr->r_idx, line_got))
-#endif
+ if (!get_rnd_line(_("mondeath_j.txt", "mondeath.txt"), m_ptr->r_idx, line_got))
msg_format("%^s %s", m_name, line_got);
chg_virtue (V_JUSTICE, -1);
}
- if ((r_ptr->flags3 & RF3_ANIMAL) && !(r_ptr->flags3 & RF3_EVIL) && !(r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) && !(r_ptr->flags5 & ~(RF5_NOMAGIC_MASK)) && !(r_ptr->flags6 & ~(RF6_NOMAGIC_MASK)))
+ if ((r_ptr->flags3 & RF3_ANIMAL) && !(r_ptr->flags3 & RF3_EVIL) && !(r_ptr->flags4 & ~(RF4_NOMAGIC_MASK)) && !(r_ptr->a_ability_flags1 & ~(RF5_NOMAGIC_MASK)) && !(r_ptr->a_ability_flags2 & ~(RF6_NOMAGIC_MASK)))
{
if (one_in_(4)) chg_virtue(V_NATURE, -1);
}
if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
msg_format("せっかくだから%sを殺した。", m_name);
else
-msg_format("%sを殺した。", m_name);
+ msg_format("%sを殺した。", m_name);
#else
msg_format("You have killed %s.", m_name);
#endif
/* Death by Physical attack -- non-living monster */
else if (!monster_living(r_ptr))
{
- int i;
bool explode = FALSE;
for (i = 0; i < 4; i++)
/* Special note at death */
if (explode)
-#ifdef JP
- msg_format("%sは爆発して粉々になった。", m_name);
-#else
- msg_format("%^s explodes into tiny shreds.", m_name);
-#endif
+ msg_format(_("%sは爆発して粉々になった。", "%^s explodes into tiny shreds."), m_name);
else
{
#ifdef JP
{
if ((kubi_r_idx[i] == m_ptr->r_idx) && !(m_ptr->mflag2 & MFLAG2_CHAMELEON))
{
-#ifdef JP
-msg_format("%sの首には賞金がかかっている。", m_name);
-#else
- msg_format("There is a price on %s's head.", m_name);
-#endif
+ msg_format(_("%sの首には賞金がかかっている。", "There is a price on %s's head."), m_name);
break;
}
}
{
int dummy_y = m_ptr->fy;
int dummy_x = m_ptr->fx;
- u32b mode = 0L;
+ BIT_FLAGS mode = 0L;
if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
- /* Delete the monster */
+
delete_monster_idx(m_idx);
if (summon_named_creature(0, dummy_y, dummy_x, MON_BIKETAL, mode))
{
-#ifdef JP
- msg_print("「ハァッハッハッハ！！私がバイケタルだ！！」");
-#else
- msg_print("Uwa-hahaha! *I* am Biketal!");
-#endif
+ msg_print(_("「ハァッハッハッハ！！私がバイケタルだ！！」", "Uwa-hahaha! *I* am Biketal!"));
}
}
else
{
- /* Delete the monster */
+
delete_monster_idx(m_idx);
}
/* Hack -- note fear */
(*fear) = TRUE;
- /* XXX XXX XXX Hack -- Add some timed fear */
+ /* Hack -- Add some timed fear */
(void)set_monster_monfear(m_idx, (randint1(10) +
(((dam >= m_ptr->hp) && (percentage > 7)) ?
20 : ((11 - percentage) * 5))));
if (m_ptr->hp > m_ptr->maxhp/3) dam = (dam + 1) / 2;
if (rakuba((dam > 200) ? 200 : dam, FALSE))
{
-#ifdef JP
-msg_format("%^sに振り落とされた！", m_name);
-#else
- msg_format("%^s has thrown you off!", m_name);
-#endif
+ msg_format(_("%^sに振り落とされた！", "%^s has thrown you off!"), m_name);
}
}
#endif
* @param hgt_p コンソールの表示行数を返す
* @return なし
*/
-void get_screen_size(int *wid_p, int *hgt_p)
+void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p)
{
Term_get_size(wid_p, hgt_p);
*hgt_p -= ROW_MAP + 2;
{
int wid, hgt;
- /* Get size */
get_screen_size(&wid, &hgt);
panel_row_max = panel_row_min + hgt - 1;
verify_panel();
- /* Update stuff */
p_ptr->update |= (PU_TORCH | PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
/* Forget lite/view */
/* Hack -- update */
handle_stuff();
-
- /* Redraw */
Term_redraw();
/*
* Waiting command;
* Place the cursor on the player
*/
- if (can_save) move_cursor_relative(py, px);
+ if (can_save) move_cursor_relative(p_ptr->y, p_ptr->x);
/* Refresh */
Term_fresh();
/* Only if the dungeon exists */
if (!character_dungeon) return;
- /* Window stuff */
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_SPELL | PW_PLAYER);
-
- /* Window stuff */
p_ptr->window |= (PW_MESSAGE | PW_OVERHEAD | PW_DUNGEON | PW_MONSTER | PW_OBJECT);
/* Hack -- update */
handle_stuff();
-
- /* Redraw */
Term_redraw();
}
* Also used in do_cmd_locate
* @return 実際に再描画が必要だった場合TRUEを返す
*/
-bool change_panel(int dy, int dx)
+bool change_panel(POSITION dy, POSITION dx)
{
- int y, x;
- int wid, hgt;
+ POSITION y, x;
+ TERM_LEN wid, hgt;
- /* Get size */
get_screen_size(&wid, &hgt);
/* Apply the motion */
/* Recalculate the boundaries */
panel_bounds_center();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
/* Handle stuff */
* Also used in do_cmd_locate
* @return 実際に再描画が必要だった場合TRUEを返す
*/
-bool change_panel_xy(int y, int x)
+static bool change_panel_xy(POSITION y, POSITION x)
{
- int dy = 0, dx = 0;
- int wid, hgt;
+ POSITION dy = 0, dx = 0;
+ TERM_LEN wid, hgt;
- /* Get size */
get_screen_size(&wid, &hgt);
if (y < panel_row_min) dy = -1;
*/
void verify_panel(void)
{
- int y = py;
- int x = px;
+ POSITION y = p_ptr->y;
+ POSITION x = p_ptr->x;
int wid, hgt;
int prow_min;
int max_prow_min;
int max_pcol_min;
- /* Get size */
get_screen_size(&wid, &hgt);
max_prow_min = cur_hgt - hgt;
panel_col_min = pcol_min;
/* Hack -- optional disturb on "panel change" */
- if (disturb_panel && !center_player) disturb(0, 0);
+ if (disturb_panel && !center_player) disturb(FALSE, FALSE);
/* Recalculate the boundaries */
panel_bounds_center();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
}
/*
* Monster health description
*/
-cptr look_mon_desc(monster_type *m_ptr, u32b mode)
+cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
{
monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
bool living;
}
else if (is_pet(m_ptr))
{
-#ifdef JP
- attitude = ", ペット";
-#else
- attitude = ", pet";
-#endif
+ attitude = _(", ペット", ", pet");
}
else if (is_friendly(m_ptr))
{
-#ifdef JP
- attitude = ", 友好的";
-#else
- attitude = ", friendly";
-#endif
+ attitude = _(", 友好的", ", friendly");
}
else
{
-#ifdef JP
- attitude = "";
-#else
- attitude = "";
-#endif
+ attitude = _("", "");
}
/* Display monster's level --- idea borrowed from ToME */
if (ap_r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE))
{
-#ifdef JP
- return format("レベル%d, %s%s%s", ap_r_ptr->level, desc, attitude, clone);
-#else
- return format("Level %d, %s%s%s", ap_r_ptr->level, desc, attitude, clone);
-#endif
+ return format(_("レベル%d, %s%s%s", "Level %d, %s%s%s"), ap_r_ptr->level, desc, attitude, clone);
}
else
{
-#ifdef JP
- return format("レベル???, %s%s%s", desc, attitude, clone);
-#else
- return format("Level ???, %s%s%s", desc, attitude, clone);
-#endif
+ return format(_("レベル???, %s%s%s", "Level ???, %s%s%s"), desc, attitude, clone);
}
}
* Future versions may restrict the ability to target "trappers"
* and "mimics", but the semantics is a little bit weird.
*/
-bool target_able(int m_idx)
+bool target_able(MONSTER_IDX m_idx)
{
monster_type *m_ptr = &m_list[m_idx];
if (p_ptr->riding && (p_ptr->riding == m_idx)) return (TRUE);
/* Monster must be projectable */
- if (!projectable(py, px, m_ptr->fy, m_ptr->fx)) return (FALSE);
+ if (!projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)) return (FALSE);
- /* XXX XXX XXX Hack -- Never target trappers */
+ /* Hack -- Never target trappers */
/* if (CLEAR_ATTR && (CLEAR_CHAR)) return (FALSE); */
/* Assume okay */
*/
static bool ang_sort_comp_distance(vptr u, vptr v, int a, int b)
{
- byte *x = (byte*)(u);
- byte *y = (byte*)(v);
+ POSITION *x = (POSITION*)(u);
+ POSITION *y = (POSITION*)(v);
- int da, db, kx, ky;
+ POSITION da, db, kx, ky;
/* Absolute distance components */
- kx = x[a]; kx -= px; kx = ABS(kx);
- ky = y[a]; ky -= py; ky = ABS(ky);
+ kx = x[a]; kx -= p_ptr->x; kx = ABS(kx);
+ ky = y[a]; ky -= p_ptr->y; ky = ABS(ky);
/* Approximate Double Distance to the first point */
da = ((kx > ky) ? (kx + kx + ky) : (ky + ky + kx));
/* Absolute distance components */
- kx = x[b]; kx -= px; kx = ABS(kx);
- ky = y[b]; ky -= py; ky = ABS(ky);
+ kx = x[b]; kx -= p_ptr->x; kx = ABS(kx);
+ ky = y[b]; ky -= p_ptr->y; ky = ABS(ky);
/* Approximate Double Distance to the first point */
db = ((kx > ky) ? (kx + kx + ky) : (ky + ky + kx));
*/
static bool ang_sort_comp_importance(vptr u, vptr v, int a, int b)
{
- byte *x = (byte*)(u);
- byte *y = (byte*)(v);
+ POSITION *x = (POSITION*)(u);
+ POSITION *y = (POSITION*)(v);
cave_type *ca_ptr = &cave[y[a]][x[a]];
cave_type *cb_ptr = &cave[y[b]][x[b]];
monster_type *ma_ptr = &m_list[ca_ptr->m_idx];
monster_race *ap_ra_ptr, *ap_rb_ptr;
/* The player grid */
- if (y[a] == py && x[a] == px) return TRUE;
- if (y[b] == py && x[b] == px) return FALSE;
+ if (y[a] == p_ptr->y && x[a] == p_ptr->x) return TRUE;
+ if (y[b] == p_ptr->y && x[b] == p_ptr->x) return FALSE;
/* Extract monster race */
if (ca_ptr->m_idx && ma_ptr->ml) ap_ra_ptr = &r_info[ma_ptr->ap_r_idx];
*/
static void ang_sort_swap_distance(vptr u, vptr v, int a, int b)
{
- byte *x = (byte*)(u);
- byte *y = (byte*)(v);
+ POSITION *x = (POSITION*)(u);
+ POSITION *y = (POSITION*)(v);
- byte temp;
+ POSITION temp;
/* Swap "x" */
temp = x[a];
/*
* Hack -- help "select" a location (see below)
*/
-static s16b target_pick(int y1, int x1, int dy, int dx)
+static POSITION_IDX target_pick(POSITION y1, POSITION x1, POSITION dy, POSITION dx)
{
- int i, v;
-
- int x2, y2, x3, y3, x4, y4;
-
- int b_i = -1, b_v = 9999;
+ POSITION_IDX i, v;
+ POSITION x2, y2, x3, y3, x4, y4;
+ POSITION_IDX b_i = -1, b_v = 9999;
/* Scan the locations */
/* Approximate Double Distance */
v = ((x4 > y4) ? (x4 + x4 + y4) : (y4 + y4 + x4));
- /* XXX XXX XXX Penalize location */
+ /* Penalize location */
/* Track best */
if ((b_i >= 0) && (v >= b_v)) continue;
/* Track best */
b_i = i; b_v = v;
}
-
- /* Result */
return (b_i);
}
/*
* Hack -- determine if a given location is "interesting"
*/
-static bool target_set_accept(int y, int x)
+static bool target_set_accept(POSITION y, POSITION x)
{
cave_type *c_ptr;
-
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
/* Bounds */
if (!(in_bounds(y, x))) return (FALSE);
/* Player grid is always interesting */
if (player_bold(y, x)) return (TRUE);
-
/* Handle hallucination */
if (p_ptr->image) return (FALSE);
-
/* Examine the grid */
c_ptr = &cave[y][x];
if (have_flag(f_info[get_feat_mimic(c_ptr)].flags, FF_NOTICE)) return TRUE;
}
- /* Nope */
return (FALSE);
}
*
* Return the number of target_able monsters in the set.
*/
-static void target_set_prepare(int mode)
+static void target_set_prepare(BIT_FLAGS mode)
{
- int y, x;
- int min_hgt, max_hgt, min_wid, max_wid;
+ POSITION y, x;
+ POSITION min_hgt, max_hgt, min_wid, max_wid;
if (mode & TARGET_KILL)
{
/* Inner range */
- min_hgt = MAX((py - MAX_RANGE), 0);
- max_hgt = MIN((py + MAX_RANGE), cur_hgt - 1);
- min_wid = MAX((px - MAX_RANGE), 0);
- max_wid = MIN((px + MAX_RANGE), cur_wid - 1);
+ min_hgt = MAX((p_ptr->y - MAX_RANGE), 0);
+ max_hgt = MIN((p_ptr->y + MAX_RANGE), cur_hgt - 1);
+ min_wid = MAX((p_ptr->x - MAX_RANGE), 0);
+ max_wid = MIN((p_ptr->x + MAX_RANGE), cur_wid - 1);
}
else /* not targetting */
{
if (p_ptr->riding && target_pet && (temp_n > 1) && (mode & (TARGET_KILL)))
{
- byte tmp;
+ POSITION tmp;
tmp = temp_y[0];
temp_y[0] = temp_y[1];
temp_x[1] = tmp;
}
}
-void target_set_prepare_look(){
+
+void target_set_prepare_look(void){
target_set_prepare(TARGET_LOOK);
}
* recall info and the health bar info to track that monster.
*
* Eventually, we may allow multiple objects per grid, or objects
- * and terrain features in the same grid. XXX XXX XXX
+ * and terrain features in the same grid.
*
* This function must handle blindness/hallucination.
*/
-static int target_set_aux(int y, int x, int mode, cptr info)
+static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
{
cave_type *c_ptr = &cave[y][x];
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
cptr s1 = "", s2 = "", s3 = "", x_info = "";
bool boring = TRUE;
- s16b feat;
+ FEAT_IDX feat;
feature_type *f_ptr;
- int query = '\001';
+ char query = '\001';
char out_val[MAX_NLEN+80];
-
-#ifdef ALLOW_EASY_FLOOR
- int floor_list[23], floor_num = 0;
+ OBJECT_IDX floor_list[23];
+ ITEM_NUMBER floor_num = 0;
/* Scan all objects in the grid */
if (easy_floor)
if (floor_num)
{
-#ifdef JP
- x_info = "x物 ";
-#else
- x_info = "x,";
-#endif
+ x_info = _("x物 ", "x,");
}
}
-#endif /* ALLOW_EASY_FLOOR */
-
/* Hack -- under the player */
if (player_bold(y, x))
{
}
else
{
-#ifdef JP
- s1 = "ターゲット:";
-#else
- s1 = "Target:";
-#endif
+ s1 = _("ターゲット:", "Target:");
}
/* Hack -- hallucination */
if (p_ptr->image)
{
-#ifdef JP
- cptr name = "何か奇妙な物";
-#else
- cptr name = "something strange";
-#endif
-
+ cptr name = _("何か奇妙な物", "something strange");
/* Display a message */
#ifdef JP
screen_roff(m_ptr->ap_r_idx, 0);
/* Hack -- Complete the prompt (again) */
-#ifdef JP
- Term_addstr(-1, TERM_WHITE, format(" [r思 %s%s]", x_info, info));
-#else
- Term_addstr(-1, TERM_WHITE, format(" [r,%s%s]", x_info, info));
-#endif
+ Term_addstr(-1, TERM_WHITE, format(_(" [r思 %s%s]", " [r,%s%s]"), x_info, info));
/* Command */
query = inkey();
if ((query == ' ') && !(mode & (TARGET_LOOK))) return query;
/* Change the intro */
-#ifdef JP
- s1 = "それは";
-#else
- s1 = "It is ";
-#endif
-
+ s1 = _("それは", "It is ");
/* Hack -- take account of gender */
-#ifdef JP
- if (ap_r_ptr->flags1 & (RF1_FEMALE)) s1 = "彼女は";
-#else
- if (ap_r_ptr->flags1 & (RF1_FEMALE)) s1 = "She is ";
-#endif
-
-#ifdef JP
- else if (ap_r_ptr->flags1 & (RF1_MALE)) s1 = "彼は";
-#else
- else if (ap_r_ptr->flags1 & (RF1_MALE)) s1 = "He is ";
-#endif
-
+ if (ap_r_ptr->flags1 & (RF1_FEMALE)) s1 = _("彼女は", "She is ");
+ else if (ap_r_ptr->flags1 & (RF1_MALE)) s1 = _("彼は", "He is ");
/* Use a preposition */
#ifdef JP
/* Obtain an object description */
object_desc(o_name, o_ptr, 0);
- /* Describe the object */
#ifdef JP
sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info);
#else
if ((query == ' ') && !(mode & (TARGET_LOOK))) return query;
/* Change the intro */
-#ifdef JP
- s2 = "をまた";
-#else
- s2 = "also carrying ";
-#endif
+ s2 = _("をまた", "also carrying ");
}
/* Use a preposition */
#endif
}
-
-#ifdef ALLOW_EASY_FLOOR
if (floor_num)
{
int min_width = 0;
/* Acquire object */
o_ptr = &o_list[floor_list[0]];
- /* Describe the object */
object_desc(o_name, o_ptr, 0);
- /* Message */
#ifdef JP
- sprintf(out_val, "%s%s%s%s[%s]",
- s1, o_name, s2, s3, info);
+ sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info);
#else
- sprintf(out_val, "%s%s%s%s [%s]",
- s1, s2, s3, o_name, info);
+ sprintf(out_val, "%s%s%s%s [%s]", s1, s2, s3, o_name, info);
#endif
prt(out_val, 0, 0);
/* Display rough information about items */
#ifdef JP
sprintf(out_val, "%s %d個のアイテム%s%s ['x'で一覧, %s]",
- s1, floor_num, s2, s3, info);
+ s1, (int)floor_num, s2, s3, info);
#else
sprintf(out_val, "%s%s%sa pile of %d items [x,%s]",
- s1, s2, s3, floor_num, info);
+ s1, s2, s3, (int)floor_num, info);
#endif
prt(out_val, 0, 0);
/* Continue scrolling list if requested */
while (1)
{
- int i, o_idx;
+ int i;
+ OBJECT_IDX o_idx;
/* Save screen */
screen_save();
/* Prompt */
#ifdef JP
sprintf(out_val, "%s %d個のアイテム%s%s [Enterで次へ, %s]",
- s1, floor_num, s2, s3, info);
+ s1, (int)floor_num, s2, s3, info);
#else
sprintf(out_val, "%s%s%sa pile of %d items [Enter,%s]",
- s1, s2, s3, floor_num, info);
+ s1, s2, s3, (int)floor_num, info);
#endif
prt(out_val, 0, 0);
/* NOTREACHED */
}
-#endif /* ALLOW_EASY_FLOOR */
-
/* Scan all objects in the grid */
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
/* Obtain an object description */
object_desc(o_name, o_ptr, 0);
- /* Describe the object */
#ifdef JP
sprintf(out_val, "%s%s%s%s[%s]", s1, o_name, s2, s3, info);
#else
if ((query == ' ') && !(mode & TARGET_LOOK)) return query;
/* Change the intro */
-#ifdef JP
- s1 = "それは";
-#else
- s1 = "It is ";
-#endif
-
+ s1 = _("それは", "It is ");
/* Plurals */
-#ifdef JP
- if (o_ptr->number != 1) s1 = "それらは";
-#else
- if (o_ptr->number != 1) s1 = "They are ";
-#endif
-
+ if (o_ptr->number != 1) s1 = _("それらは", "They are ");
/* Preposition */
#ifdef JP
if (have_flag(f_ptr->flags, FF_QUEST_ENTER))
{
/* Set the quest number temporary */
- int old_quest = p_ptr->inside_quest;
+ IDX old_quest = p_ptr->inside_quest;
int j;
/* Clear the text */
process_dungeon_file("q_info.txt", 0, 0, 0, 0);
-#ifdef JP
- name = format("クエスト「%s」(%d階相当)", quest[c_ptr->special].name, quest[c_ptr->special].level);
-#else
- name = format("the entrance to the quest '%s'(level %d)", quest[c_ptr->special].name, quest[c_ptr->special].level);
-#endif
+ name = format(_("クエスト「%s」(%d階相当)", "the entrance to the quest '%s'(level %d)"),
+ quest[c_ptr->special].name, quest[c_ptr->special].level);
/* Reset the old quest number */
p_ptr->inside_quest = old_quest;
}
else if (have_flag(f_ptr->flags, FF_ENTRANCE))
{
-#ifdef JP
- name = format("%s(%d階相当)", d_text + d_info[c_ptr->special].text, d_info[c_ptr->special].mindepth);
-#else
- name = format("%s(level %d)", d_text + d_info[c_ptr->special].text, d_info[c_ptr->special].mindepth);
-#endif
+ name = format(_("%s(%d階相当)", "%s(level %d)"), d_text + d_info[c_ptr->special].text, d_info[c_ptr->special].mindepth);
}
else if (have_flag(f_ptr->flags, FF_TOWN))
{
}
else if (p_ptr->wild_mode && (feat == feat_floor))
{
-#ifdef JP
- name = "道";
-#else
- name = "road";
-#endif
+ name = _("道", "road");
}
else
{
(!have_flag(f_ptr->flags, FF_LOS) && !have_flag(f_ptr->flags, FF_TREE)) ||
have_flag(f_ptr->flags, FF_TOWN)))
{
-#ifdef JP
- s2 = "の中";
-#else
- s2 = "in ";
-#endif
+ s2 = _("の中", "in ");
}
/* Hack -- special introduction for store & building doors -KMW- */
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
*
* All locations must be on the current panel. Consider the use of
* "panel_bounds()" to allow "off-panel" targets, perhaps by using
- * some form of "scrolling" the map around the cursor. XXX XXX XXX
+ * some form of "scrolling" the map around the cursor.
* That is, consider the possibility of "auto-scrolling" the screen
* while the cursor moves around. This may require changes in the
- * "update_mon()" code to allow "visibility" even if off panel, and
+ * "update_monster()" code to allow "visibility" even if off panel, and
* may require dynamic recalculation of the "temp" grid set.
*
* Hack -- targeting/observing an "outer border grid" may induce
* This command will cancel any old target, even if used from
* inside the "look" command.
*/
-bool target_set(int mode)
+bool target_set(BIT_FLAGS mode)
{
int i, d, m, t, bd;
- int y = py;
- int x = px;
+ POSITION y = p_ptr->y;
+ POSITION x = p_ptr->x;
bool done = FALSE;
-
bool flag = TRUE;
-
char query;
-
char info[80];
+ char same_key;
cave_type *c_ptr;
int wid, hgt;
- /* Get size */
get_screen_size(&wid, &hgt);
/* Cancel target */
/* Cancel tracking */
/* health_track(0); */
+ if (rogue_like_commands)
+ {
+ same_key = 'x';
+ }
+ else
+ {
+ same_key = 'l';
+ }
/* Prepare the "temp" array */
target_set_prepare(mode);
/* Allow target */
if (target_able(c_ptr->m_idx))
{
-#ifdef JP
-strcpy(info, "q止 t決 p自 o現 +次 -前");
-#else
- strcpy(info, "q,t,p,o,+,-,<dir>");
-#endif
-
+ strcpy(info, _("q止 t決 p自 o現 +次 -前", "q,t,p,o,+,-,<dir>"));
}
/* Dis-allow target */
else
{
-#ifdef JP
-strcpy(info, "q止 p自 o現 +次 -前");
-#else
- strcpy(info, "q,p,o,+,-,<dir>");
-#endif
+ strcpy(info, _("q止 p自 o現 +次 -前", "q,p,o,+,-,<dir>"));
+ }
+ 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 */
/* Recenter the map around the player */
verify_panel();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
/* Handle stuff */
/* Recalculate interesting grids */
target_set_prepare(mode);
- y = py;
- x = px;
+ y = p_ptr->y;
+ x = p_ptr->x;
}
case 'o':
default:
{
- /* Extract the action (if any) */
- d = get_keymap_dir(query);
+ if(query == same_key)
+ {
+ if (++m == temp_n)
+ {
+ m = 0;
+ if (!expand_list) done = TRUE;
+ }
+ }
+ else
+ {
+ /* Extract the action (if any) */
+ d = get_keymap_dir(query);
- if (!d) bell();
- break;
+ if (!d) bell();
+ break;
+ }
}
}
-
/* Hack -- move around */
if (d)
{
/* Modified to scroll to monster */
- int y2 = panel_row_min;
- int x2 = panel_col_min;
+ POSITION y2 = panel_row_min;
+ POSITION x2 = panel_col_min;
/* Find a new monster */
i = target_pick(temp_y[m], temp_x[m], ddy[d], ddx[d]);
panel_col_min = x2;
panel_bounds_center();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
/* Handle stuff */
c_ptr = &cave[y][x];
/* Default prompt */
-#ifdef JP
-strcpy(info, "q止 t決 p自 m近 +次 -前");
-#else
- strcpy(info, "q,t,p,m,+,-,<dir>");
-#endif
+ strcpy(info, _("q止 t決 p自 m近 +次 -前", "q,t,p,m,+,-,<dir>"));
+ 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)));
+ while ((query = target_set_aux(y, x, mode | TARGET_LOOK, info)) == 0);
/* Cancel tracking */
/* health_track(0); */
/* Recenter the map around the player */
verify_panel();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
/* Handle stuff */
/* Recalculate interesting grids */
target_set_prepare(mode);
- y = py;
- x = px;
+ y = p_ptr->y;
+ x = p_ptr->x;
}
case 'o':
/* Recenter the map around the player */
verify_panel();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
/* Handle stuff */
*
* Note that confusion over-rides any (explicit?) user choice.
*/
-bool get_aim_dir(int *dp)
+bool get_aim_dir(DIRECTION *dp)
{
- int dir;
-
+ DIRECTION dir;
char command;
-
cptr p;
+ COMMAND_CODE code;
- /* Initialize */
(*dp) = 0;
/* Global direction */
/* Hack -- auto-target if requested */
if (use_old_target && target_okay()) dir = 5;
-#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;
}
}
-
-#endif /* ALLOW_REPEAT -- TNB */
+ *dp = (DIRECTION)code;
/* Ask until satisfied */
while (!dir)
/* Choose a prompt */
if (!target_okay())
{
-#ifdef JP
-p = "方向 ('*'でターゲット選択, ESCで中断)? ";
-#else
- p = "Direction ('*' to choose a target, Escape to cancel)? ";
-#endif
-
+ p = _("方向 ('*'でターゲット選択, ESCで中断)? ", "Direction ('*' to choose a target, Escape to cancel)? ");
}
else
{
-#ifdef JP
-p = "方向 ('5'でターゲットへ, '*'でターゲット再選択, ESCで中断)? ";
-#else
- p = "Direction ('5' for target, '*' to re-target, Escape to cancel)? ";
-#endif
-
+ p = _("方向 ('5'でターゲットへ, '*'でターゲット再選択, ESCで中断)? ", "Direction ('5' for target, '*' to re-target, Escape to cancel)? ");
}
/* Get a command (or Cancel) */
/* Check for confusion */
if (p_ptr->confused)
{
- /* XXX XXX XXX */
/* Random direction */
dir = ddd[randint0(8)];
}
if (command_dir != dir)
{
/* Warn the user */
-#ifdef JP
-msg_print("あなたは混乱している。");
-#else
- msg_print("You are confused.");
-#endif
-
+ msg_print(_("あなたは混乱している。", "You are confused."));
}
/* Save direction */
(*dp) = dir;
-#ifdef ALLOW_REPEAT /* TNB */
-
/* repeat_push(dir); */
- repeat_push(command_dir);
-
-#endif /* ALLOW_REPEAT -- TNB */
+ repeat_push((COMMAND_CODE)command_dir);
/* A "valid" direction was entered */
return (TRUE);
}
-
-/*
- * Request a "movement" direction (1,2,3,4,6,7,8,9) from the user,
- * and place it into "command_dir", unless we already have one.
- *
- * This function should be used for all "repeatable" commands, such as
- * run, walk, open, close, bash, disarm, spike, tunnel, etc, as well
- * as all commands which must reference a grid adjacent to the player,
- * and which may not reference the grid under the player. Note that,
- * for example, it is no longer possible to "disarm" or "open" chests
- * in the same grid as the player.
- *
- * Direction "5" is illegal and will (cleanly) abort the command.
- *
- * This function tracks and uses the "global direction", and uses
- * that as the "desired direction", to which "confusion" is applied.
- */
-bool get_rep_dir(int *dp, bool under)
+bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed)
{
- int dir;
+ DIRECTION dir;
cptr prompt;
+ COMMAND_CODE code;
- /* Initialize */
(*dp) = 0;
/* Global direction */
dir = command_dir;
-#ifdef ALLOW_REPEAT /* TNB */
-
- if (repeat_pull(dp))
+ if (repeat_pull(&code))
{
- dir = *dp;
-/* return (TRUE); */
+ dir = (DIRECTION)code;
+ /* return (TRUE); */
}
+ *dp = (DIRECTION)code;
-#endif /* ALLOW_REPEAT -- TNB */
-
- if (under)
+ if (allow_under)
{
prompt = _("方向 ('.'足元, ESCで中断)? ", "Direction ('.' at feet, Escape to cancel)? ");
}
{
prompt = _("方向 (ESCで中断)? ", "Direction (Escape to cancel)? ");
}
-
+
/* Get a direction */
while (!dir)
{
if (!get_com(prompt, &ch, TRUE)) break;
/* Look down */
- if ((under) && ((ch == '5') || (ch == '-') || (ch == '.')))
+ if ((allow_under) && ((ch == '5') || (ch == '-') || (ch == '.')))
{
dir = 5;
}
/* Look up the direction */
dir = get_keymap_dir(ch);
- /* Oops */
if (!dir) bell();
}
}
/* Prevent weirdness */
- if ((dir == 5) && (!under)) dir = 0;
+ if ((dir == 5) && (!allow_under)) dir = 0;
/* Aborted */
if (!dir) return (FALSE);
dir = ddd[randint0(8)];
}
}
- else if (p_ptr->riding)
+ else if (p_ptr->riding && with_steed)
{
monster_type *m_ptr = &m_list[p_ptr->riding];
monster_race *r_ptr = &r_info[m_ptr->r_idx];
if (p_ptr->confused)
{
/* Warn the user */
-#ifdef JP
-msg_print("あなたは混乱している。");
-#else
- msg_print("You are confused.");
-#endif
+ msg_print(_("あなたは混乱している。", "You are confused."));
}
else
{
monster_desc(m_name, m_ptr, 0);
if (MON_CONFUSED(m_ptr))
{
-#ifdef JP
-msg_format("%sは混乱している。", m_name);
-#else
- msg_format("%^s is confusing.", m_name);
-
-#endif
+ msg_format(_("%sは混乱している。", "%^s is confusing."), m_name);
}
else
{
-#ifdef JP
-msg_format("%sは思い通りに動いてくれない。", m_name);
-#else
-msg_format("You cannot control %s.", m_name);
-#endif
+ msg_format(_("%sは思い通りに動いてくれない。", "You cannot control %s."), m_name);
}
}
}
/* Save direction */
(*dp) = dir;
-#ifdef ALLOW_REPEAT /* TNB */
-
-/* repeat_push(dir); */
- repeat_push(command_dir);
-
-#endif /* ALLOW_REPEAT -- TNB */
+ /* repeat_push(dir); */
+ repeat_push((COMMAND_CODE)command_dir);
/* Success */
return (TRUE);
}
-
-bool get_rep_dir2(int *dp)
+/*
+ * @brief 進行方向を指定する(騎乗対象の混乱の影響を受ける) / Request a "movement" direction (1,2,3,4,6,7,8,9) from the user,
+ * and place it into "command_dir", unless we already have one.
+ *
+ * This function should be used for all "repeatable" commands, such as
+ * run, walk, open, close, bash, disarm, spike, tunnel, etc, as well
+ * as all commands which must reference a grid adjacent to the player,
+ * and which may not reference the grid under the player. Note that,
+ * for example, it is no longer possible to "disarm" or "open" chests
+ * in the same grid as the player.
+ *
+ * Direction "5" is illegal and will (cleanly) abort the command.
+ *
+ * This function tracks and uses the "global direction", and uses
+ * that as the "desired direction", to which "confusion" is applied.
+ */
+bool get_rep_dir(DIRECTION *dp, bool under)
{
- int dir;
+ DIRECTION dir;
+ cptr prompt;
+ COMMAND_CODE code;
- /* Initialize */
(*dp) = 0;
/* Global direction */
dir = command_dir;
-#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 */
-
+ if (under)
+ {
+ prompt = _("方向 ('.'足元, ESCで中断)? ", "Direction ('.' at feet, Escape to cancel)? ");
+ }
+ else
+ {
+ prompt = _("方向 (ESCで中断)? ", "Direction (Escape to cancel)? ");
+ }
+
/* Get a direction */
while (!dir)
{
char ch;
/* Get a command (or Cancel) */
-#ifdef JP
-if (!get_com("方向 (ESCで中断)? ", &ch, TRUE)) break;
-#else
- if (!get_com("Direction (Escape to cancel)? ", &ch, TRUE)) break;
-#endif
-
+ if (!get_com(prompt, &ch, TRUE)) break;
- /* Look up the direction */
- dir = get_keymap_dir(ch);
+ /* Look down */
+ if ((under) && ((ch == '5') || (ch == '-') || (ch == '.')))
+ {
+ dir = 5;
+ }
+ else
+ {
+ /* Look up the direction */
+ dir = get_keymap_dir(ch);
- /* Oops */
- if (!dir) bell();
+ if (!dir) bell();
+ }
}
/* Prevent weirdness */
- if (dir == 5) dir = 0;
+ if ((dir == 5) && (!under)) dir = 0;
/* Aborted */
if (!dir) return (FALSE);
dir = ddd[randint0(8)];
}
}
+ else if (p_ptr->riding)
+ {
+ monster_type *m_ptr = &m_list[p_ptr->riding];
+ monster_race *r_ptr = &r_info[m_ptr->r_idx];
+
+ if (MON_CONFUSED(m_ptr))
+ {
+ /* Standard confusion */
+ if (randint0(100) < 75)
+ {
+ /* Random direction */
+ dir = ddd[randint0(8)];
+ }
+ }
+ else if ((r_ptr->flags1 & RF1_RAND_50) && (r_ptr->flags1 & RF1_RAND_25) && (randint0(100) < 50))
+ {
+ /* Random direction */
+ dir = ddd[randint0(8)];
+ }
+ else if ((r_ptr->flags1 & RF1_RAND_50) && (randint0(100) < 25))
+ {
+ /* Random direction */
+ dir = ddd[randint0(8)];
+ }
+ }
/* Notice confusion */
if (command_dir != dir)
{
- /* Warn the user */
-#ifdef JP
-msg_print("あなたは混乱している。");
-#else
- msg_print("You are confused.");
-#endif
+ if (p_ptr->confused)
+ {
+ /* Warn the user */
+ msg_print(_("あなたは混乱している。", "You are confused."));
+ }
+ else
+ {
+ char m_name[80];
+ monster_type *m_ptr = &m_list[p_ptr->riding];
+ monster_desc(m_name, m_ptr, 0);
+ if (MON_CONFUSED(m_ptr))
+ {
+ msg_format(_("%sは混乱している。", "%^s is confusing."), m_name);
+ }
+ else
+ {
+ msg_format(_("%sは思い通りに動いてくれない。", "You cannot control %s."), m_name);
+ }
+ }
}
/* Save direction */
(*dp) = dir;
-#ifdef ALLOW_REPEAT /* TNB */
-
/* repeat_push(dir); */
- repeat_push(command_dir);
-
-#endif /* ALLOW_REPEAT -- TNB */
+ repeat_push((COMMAND_CODE)command_dir);
/* Success */
return (TRUE);
object_type forge;
char wrath_reason[32] = "";
int nasty_chance = 6;
- int dummy = 0, dummy2 = 0;
+ OBJECT_TYPE_VALUE dummy = 0;
+ OBJECT_SUBTYPE_VALUE dummy2 = 0;
int type, effect;
cptr reward = NULL;
char o_name[MAX_NLEN];
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);
-#ifdef JP
- reward = "変異した。";
-#else
- reward = "mutation";
-#endif
+ reward = _("変異した。", "mutation");
}
else
{
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
-#ifdef JP
-msg_print("「汝、新たなる姿を必要とせり！」");
-#else
- msg_print("'Thou needst a new form, mortal!'");
-#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();
-#ifdef JP
- reward = "変異した。";
-#else
- reward = "polymorphing";
-#endif
+ 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
-#ifdef JP
-msg_print("「汝は良く行いたり！続けよ！」");
-#else
- msg_print("'Well done, mortal! Lead on!'");
-#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)
{
-#ifdef JP
- msg_print("しかし何も起こらなかった。");
-#else
- msg_print("But, nothing happen.");
-#endif
+ msg_print(_("しかし何も起こらなかった。", "But, nothing happen."));
}
else if (p_ptr->exp < PY_MAX_EXP)
{
s32b ee = (p_ptr->exp / 2) + 10;
if (ee > 100000L) ee = 100000L;
-#ifdef JP
-msg_print("更に経験を積んだような気がする。");
-#else
- msg_print("You feel more experienced.");
-#endif
+ msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
gain_exp(ee);
-#ifdef JP
- reward = "経験値を得た";
-#else
- reward = "experience";
-#endif
+ 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
-#ifdef JP
-msg_print("「下僕よ、汝それに値せず。」");
-#else
- msg_print("'Thou didst not deserve that, slave.'");
-#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)
{
-#ifdef JP
- msg_print("しかし何も起こらなかった。");
-#else
- msg_print("But, nothing happen.");
-#endif
+ msg_print(_("しかし何も起こらなかった。", "But, nothing happen."));
}
else
{
lose_exp(p_ptr->exp / 6);
-#ifdef JP
- reward = "経験値を失った。";
-#else
- reward = "losing experience";
-#endif
+ 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:",
chaos_patrons[p_ptr->chaos_patron]);
#endif
-#ifdef JP
-msg_print("「我が与えし物を賢明に使うべし。」");
-#else
- msg_print("'Use my gift wisely.'");
-#endif
+ msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
- acquirement(py, px, 1, FALSE, FALSE, FALSE);
-#ifdef JP
- reward = "上質なアイテムを手に入れた。";
-#else
- reward = "a good item";
-#endif
+ 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
-#ifdef JP
-msg_print("「我が与えし物を賢明に使うべし。」");
-#else
- msg_print("'Use my gift wisely.'");
-#endif
+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
+ msg_print(_("「我が与えし物を賢明に使うべし。」", "'Use my gift wisely.'"));
- acquirement(py, px, 1, TRUE, FALSE, FALSE);
-#ifdef JP
- reward = "高級品のアイテムを手に入れた。";
-#else
- reward = "an excellent item";
-#endif
+ 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
-#ifdef JP
-msg_print("「汝の行いは貴き剣に値せり。」");
-#else
- msg_print("'Thy deed hath earned thee a worthy blade.'");
-#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 */
q_ptr = &forge;
q_ptr->name2 = EGO_CHAOTIC;
/* Drop it in the dungeon */
- (void)drop_near(q_ptr, -1, py, px);
-#ifdef JP
- reward = "(混沌)の武器を手に入れた。";
-#else
- reward = "chaos weapon";
-#endif
+ (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
-#ifdef JP
-msg_print("「汝の行いは貴き報いに値せり。」");
-#else
- msg_print("'Thy deed hath earned thee a worthy reward.'");
-#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(py, px, randint1(2) + 1, FALSE, FALSE, FALSE);
-#ifdef JP
- reward = "上質なアイテムを手に入れた。";
-#else
- reward = "good items";
-#endif
+ 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
-#ifdef JP
-msg_print("「下僕よ、汝の献身への我が惜しみ無き報いを見るがよい。」");
-#else
- msg_print("'Behold, mortal, how generously I reward thy loyalty.'");
-#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(py, px, randint1(2) + 1, TRUE, FALSE, FALSE);
-#ifdef JP
- reward = "高級品のアイテムを手に入れた。";
-#else
- reward = "excellent items";
-#endif
+ 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
-#ifdef JP
-msg_print("「下僕よ、汝傲慢なり。」");
-#else
- msg_print("'Thou art growing arrogant, mortal.'");
-#endif
+ msg_print(_("「下僕よ、汝傲慢なり。」", "'Thou art growing arrogant, mortal.'"));
(void)activate_ty_curse(FALSE, &count);
-#ifdef JP
- reward = "禍々しい呪いをかけられた。";
-#else
- reward = "cursing";
-#endif
+ 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
-#ifdef JP
-msg_print("「我が下僕たちよ、かの傲慢なる者を倒すべし！」");
-#else
- msg_print("'My pets, destroy the arrogant mortal!'");
-#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++)
{
- (void)summon_specific(0, py, px, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
+ (void)summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET));
}
-#ifdef JP
- reward = "モンスターを召喚された。";
-#else
- reward = "summoning hostile monsters";
-#endif
+ 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
-#ifdef JP
-msg_print("「汝、より強き敵を必要とせり！」");
-#else
- msg_print("'Thou needst worthier opponents!'");
-#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(py, px, FALSE);
-#ifdef JP
- reward = "モンスターを召喚された。";
-#else
- reward = "summoning many hostile monsters";
-#endif
+ 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:",
chaos_patrons[p_ptr->chaos_patron]);
#endif
-#ifdef JP
-msg_print("「死と破壊こそ我が喜びなり！」");
-#else
- msg_print("'Death and destruction! This pleaseth me!'");
-#endif
+ msg_print(_("「死と破壊こそ我が喜びなり！」", "'Death and destruction! This pleaseth me!'"));
call_chaos();
-#ifdef JP
- reward = "カオスの力が渦巻いた。";
-#else
- reward = "calling chaos";
-#endif
+ 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:",
chaos_patrons[p_ptr->chaos_patron]);
#endif
-#ifdef JP
-msg_print("「留まるのだ、下僕よ。余が汝の肉体を鍛えん。」");
-#else
- msg_print("'Stay, mortal, and let me mold thee.'");
-#endif
+ msg_print(_("「留まるのだ、下僕よ。余が汝の肉体を鍛えん。」", "'Stay, mortal, and let me mold thee.'"));
if (one_in_(3) && !(chaos_stats[p_ptr->chaos_patron] < 0))
do_inc_stat(chaos_stats[p_ptr->chaos_patron]);
else
do_inc_stat(randint0(6));
-#ifdef JP
- reward = "能力値が上がった。";
-#else
- reward = "increasing a stat";
-#endif
+ 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:",
chaos_patrons[p_ptr->chaos_patron]);
#endif
-#ifdef JP
-msg_print("「下僕よ、余は汝に飽みたり。」");
-#else
- msg_print("'I grow tired of thee, mortal.'");
-#endif
+ msg_print(_("「下僕よ、余は汝に飽みたり。」", "'I grow tired of thee, mortal.'"));
if (one_in_(3) && !(chaos_stats[p_ptr->chaos_patron] < 0))
do_dec_stat(chaos_stats[p_ptr->chaos_patron]);
else
(void)do_dec_stat(randint0(6));
-#ifdef JP
- reward = "能力値が下がった。";
-#else
- reward = "decreasing a stat";
-#endif
+ 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:",
chaos_patrons[p_ptr->chaos_patron]);
#endif
-#ifdef JP
-msg_print("「汝、謙虚たることを学ぶべし！」");
-msg_print("あなたは以前より弱くなった！");
-#else
- msg_print("'Thou needst a lesson in humility, mortal!'");
- msg_print("You feel less powerful!");
-#endif
+ msg_print(_("「汝、謙虚たることを学ぶべし！」", "'Thou needst a lesson in humility, mortal!'"));
+ msg_print(_("あなたは以前より弱くなった！", "You feel less powerful!"));
for (dummy = 0; dummy < 6; dummy++)
{
(void)dec_stat(dummy, 10 + randint1(15), TRUE);
}
-#ifdef JP
- reward = "全能力値が下がった。";
-#else
- reward = "decreasing all stats";
-#endif
+ reward = _("全能力値が下がった。", "decreasing all stats");
break;
+
case REW_POLY_WND:
-#ifdef JP
-msg_format("%sの力が触れるのを感じた。",
-#else
- msg_format("You feel the power of %s touch you.",
-#endif
+ msg_format(_("%sの力が触れるのを感じた。", "You feel the power of %s touch you."),
chaos_patrons[p_ptr->chaos_patron]);
do_poly_wounds();
-#ifdef JP
- reward = "傷が変化した。";
-#else
- reward = "polymorphing wounds";
-#endif
+ 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
-#ifdef JP
-msg_print("「我がささやかなる賜物を受けとるがよい！」");
-#else
- msg_print("'Receive this modest gift from me!'");
-#endif
+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
+
+ msg_print(_("「我がささやかなる賜物を受けとるがよい！」", "'Receive this modest gift from me!'"));
for (dummy = 0; dummy < 6; dummy++)
{
(void)do_inc_stat(dummy);
}
-#ifdef JP
- reward = "全能力値が上がった。";
-#else
- reward = "increasing all stats";
-#endif
+ 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
-#ifdef JP
-msg_print("「苦しむがよい、無能な愚か者よ！」");
-#else
- msg_print("'Suffer, pathetic fool!'");
-#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);
-#ifdef JP
- reward = "分解の球が発生した。";
-#else
- reward = "generating disintegration ball";
-#endif
+ 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
-#ifdef JP
-msg_print("「甦るがよい、我が下僕よ！」");
-#else
- msg_print("'Rise, my servant!'");
-#endif
+ case REW_HEAL_FUL:
- restore_level();
- (void)set_poisoned(0);
- (void)set_blind(0);
- (void)set_confused(0);
- (void)set_image(0);
- (void)set_stun(0);
- (void)set_cut(0);
- hp_player(5000);
- for (dummy = 0; dummy < 6; dummy++)
- {
- (void)do_res_stat(dummy);
- }
-#ifdef JP
- reward = "体力が回復した。";
-#else
- reward = "healing";
-#endif
+ msg_format(_("%sの声が響き渡った:", "The voice of %s booms out:"), chaos_patrons[p_ptr->chaos_patron]);
+ (void)restore_level();
+ (void)restore_all_status();
+ (void)true_healing(5000);
+ 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
-#ifdef JP
-msg_print("「汝、武器に頼ることなかれ。」");
-#else
- msg_print("'Thou reliest too much on thy weapon.'");
-#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;
if (buki_motteruka(INVEN_LARM))
}
object_desc(o_name, &inventory[dummy], OD_NAME_ONLY);
(void)curse_weapon(FALSE, dummy);
-#ifdef JP
- reward = format("%sが破壊された。", o_name);
-#else
- reward = format("destroying %s", o_name);
-#endif
+ 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
-#ifdef JP
-msg_print("「汝、防具に頼ることなかれ。」");
-#else
- msg_print("'Thou reliest too much on thine equipment.'");
-#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);
(void)curse_armor();
-#ifdef JP
- reward = format("%sが破壊された。", o_name);
-#else
- reward = format("destroying %s", o_name);
-#endif
+ 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
-#ifdef JP
-msg_print("「我を怒りしめた罪を償うべし。」");
-#else
- msg_print("'Now thou shalt pay for annoying me.'");
-#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))
{
case 1:
(void)activate_ty_curse(FALSE, &count);
-#ifdef JP
- reward = "禍々しい呪いをかけられた。";
-#else
- reward = "cursing";
-#endif
+ reward = _("禍々しい呪いをかけられた。", "cursing");
break;
case 2:
- activate_hi_summon(py, px, FALSE);
-#ifdef JP
- reward = "モンスターを召喚された。";
-#else
- reward = "summoning hostile monsters";
-#endif
+ activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
+ reward = _("モンスターを召喚された。", "summoning hostile monsters");
break;
case 3:
if (one_in_(2))
}
object_desc(o_name, &inventory[dummy], OD_NAME_ONLY);
(void)curse_weapon(FALSE, dummy);
-#ifdef JP
- reward = format("%sが破壊された。", o_name);
-#else
- reward = format("destroying %s", o_name);
-#endif
+ reward = format(_("%sが破壊された。", "destroying %s"), o_name);
}
else
{
if (!inventory[INVEN_BODY].k_idx) break;
object_desc(o_name, &inventory[INVEN_BODY], OD_NAME_ONLY);
(void)curse_armor();
-#ifdef JP
- reward = format("%sが破壊された。", o_name);
-#else
- reward = format("destroying %s", o_name);
-#endif
+ reward = format(_("%sが破壊された。", "destroying %s"), o_name);
}
break;
default:
{
(void)dec_stat(dummy, 10 + randint1(15), TRUE);
}
-#ifdef JP
- reward = "全能力値が下がった。";
-#else
- reward = "decreasing all stats";
-#endif
+ reward = _("全能力値が下がった。", "decreasing all stats");
break;
}
break;
+
case REW_WRATH:
-#ifdef JP
-msg_format("%sの声が轟き渡った:",
-#else
- msg_format("The voice of %s thunders:",
-#endif
- chaos_patrons[p_ptr->chaos_patron]);
-#ifdef JP
-msg_print("「死ぬがよい、下僕よ！」");
-#else
- msg_print("'Die, mortal!'");
-#endif
+ 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);
for (dummy = 0; dummy < 6; dummy++)
{
(void)dec_stat(dummy, 10 + randint1(15), FALSE);
}
- activate_hi_summon(py, px, FALSE);
+ activate_hi_summon(p_ptr->y, p_ptr->x, FALSE);
(void)activate_ty_curse(FALSE, &count);
if (one_in_(2))
{
}
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
-#ifdef JP
-msg_print("「死と破壊こそ我が喜びなり！」");
-#else
- msg_print("'Death and destruction! This pleaseth me!'");
-#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(py, px, 25, FALSE);
-#ifdef JP
- reward = "ダンジョンが*破壊*された。";
-#else
- reward = "*destruct*ing dungeon";
-#endif
+ (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
-#ifdef JP
-msg_print("「我、汝の敵を抹殺せん！」");
-#else
- msg_print("'Let me relieve thee of thine oppressors!'");
-#endif
+ case REW_GENOCIDE:
+ 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);
-#ifdef JP
- reward = "モンスターが抹殺された。";
-#else
- reward = "genociding monsters";
-#endif
+ 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
-#ifdef JP
-msg_print("「我、汝の敵を抹殺せん！」");
-#else
- msg_print("'Let me relieve thee of thine oppressors!'");
-#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);
-#ifdef JP
- reward = "モンスターが抹殺された。";
-#else
- reward = "genociding nearby monsters";
-#endif
+ 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:
-#ifdef JP
-msg_format("%sは褒美として悪魔の使いをよこした！",chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("%s rewards you with a demonic servant!",chaos_patrons[p_ptr->chaos_patron]);
-#endif
- if (!summon_specific(-1, py, px, dun_level, SUMMON_DEMON, PM_FORCE_PET))
-#ifdef JP
-msg_print("何も現れなかった...");
-#else
- msg_print("Nobody ever turns up...");
-#endif
+ 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))
+ msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
else
-#ifdef JP
- reward = "悪魔がペットになった。";
-#else
- reward = "a demonic servant";
-#endif
+ reward = _("悪魔がペットになった。", "a demonic servant");
break;
+
case REW_SER_MONS:
-#ifdef JP
-msg_format("%sは褒美として使いをよこした！",chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("%s rewards you with a servant!",chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sは褒美として使いをよこした！", "%s rewards you with a servant!"),chaos_patrons[p_ptr->chaos_patron]);
- if (!summon_specific(-1, py, px, dun_level, 0, PM_FORCE_PET))
-#ifdef JP
-msg_print("何も現れなかった...");
-#else
- msg_print("Nobody ever turns up...");
-#endif
+ if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, 0, PM_FORCE_PET))
+ msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
else
-#ifdef JP
- reward = "モンスターがペットになった。";
-#else
- reward = "a servant";
-#endif
+ reward = _("モンスターがペットになった。", "a servant");
break;
+
case REW_SER_UNDE:
-#ifdef JP
-msg_format("%sは褒美としてアンデッドの使いをよこした。",chaos_patrons[p_ptr->chaos_patron]);
-#else
- msg_format("%s rewards you with an undead servant!",chaos_patrons[p_ptr->chaos_patron]);
-#endif
+ msg_format(_("%sは褒美としてアンデッドの使いをよこした。", "%s rewards you with an undead servant!"),chaos_patrons[p_ptr->chaos_patron]);
- if (!summon_specific(-1, py, px, dun_level, SUMMON_UNDEAD, PM_FORCE_PET))
-#ifdef JP
-msg_print("何も現れなかった...");
-#else
- msg_print("Nobody ever turns up...");
-#endif
+ if (!summon_specific(-1, p_ptr->y, p_ptr->x, dun_level, SUMMON_UNDEAD, PM_FORCE_PET))
+ msg_print(_("何も現れなかった...", "Nobody ever turns up..."));
else
-#ifdef JP
- reward = "アンデッドがペットになった。";
-#else
- reward = "an undead servant";
-#endif
+ reward = _("アンデッドがペットになった。", "an undead servant");
break;
+
default:
-#ifdef JP
-msg_format("%sの声がどもった:",
-#else
- msg_format("The voice of %s stammers:",
-#endif
+ msg_format(_("%sの声がどもった:", "The voice of %s stammers:"),
chaos_patrons[p_ptr->chaos_patron]);
-#ifdef JP
-msg_format("「あー、あー、答えは %d/%d。質問は何？」", type, effect);
-#else
- msg_format("'Uh... uh... the answer's %d/%d, what's the question?'", type, effect);
-#endif
+ msg_format(_("「あー、あー、答えは %d/%d。質問は何？」", "'Uh... uh... the answer's %d/%d, what's the question?'"), type, effect);
}
}
if (reward)
{
-#ifdef JP
- do_cmd_write_nikki(NIKKI_BUNSHOU, 0, format("パトロンの報酬で%s", reward));
-#else
- do_cmd_write_nikki(NIKKI_BUNSHOU, 0, format("The patron rewards you with %s.", reward));
-#endif
+ do_cmd_write_nikki(NIKKI_BUNSHOU, 0, format(_("パトロンの報酬で%s", "The patron rewards you with %s."), reward));
}
}
* XAngband: determine if a given location is "interesting"
* based on target_set_accept function.
*/
-static bool tgt_pt_accept(int y, int x)
+static bool tgt_pt_accept(POSITION y, POSITION x)
{
cave_type *c_ptr;
if (!(in_bounds(y, x))) return (FALSE);
/* Player grid is always interesting */
- if ((y == py) && (x == px)) return (TRUE);
+ if ((y == p_ptr->y) && (x == p_ptr->x)) return (TRUE);
/* Handle hallucination */
if (p_ptr->image) return (FALSE);
if (cave_have_flag_grid(c_ptr, FF_QUEST_EXIT)) return (TRUE);
}
- /* Nope */
return (FALSE);
}
*/
static void tgt_pt_prepare(void)
{
- int y, x;
+ POSITION y, x;
/* Reset "temp" array */
temp_n = 0;
/*
* old -- from PsiAngband.
*/
-bool tgt_pt(int *x_ptr, int *y_ptr)
+bool tgt_pt(POSITION *x_ptr, POSITION *y_ptr)
{
char ch = 0;
- int d, x, y, n;
+ int d, n = 0;
+ POSITION x, y;
bool success = FALSE;
int wid, hgt;
- /* Get size */
get_screen_size(&wid, &hgt);
- x = px;
- y = py;
+ x = p_ptr->x;
+ y = p_ptr->y;
if (expand_list)
{
tgt_pt_prepare();
- n = 0;
}
-#ifdef JP
- msg_print("場所を選んでスペースキーを押して下さい。");
-#else
- msg_print("Select a point and press space.");
-#endif
+ msg_print(_("場所を選んでスペースキーを押して下さい。", "Select a point and press space."));
msg_flag = FALSE; /* prevents "-more-" message. */
while ((ch != ESCAPE) && !success)
if (n == temp_n) /* Loop out taget list */
{
n = 0;
- y = py;
- x = px;
+ y = p_ptr->y;
+ x = p_ptr->x;
verify_panel(); /* Move cursor to player */
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
/* Handle stuff */
/* Recenter the map around the player */
verify_panel();
- /* Update stuff */
p_ptr->update |= (PU_MONSTERS);
- /* Redraw map */
p_ptr->redraw |= (PR_MAP);
- /* Window stuff */
p_ptr->window |= (PW_OVERHEAD);
/* Handle stuff */
}
-bool get_hack_dir(int *dp)
+bool get_hack_dir(DIRECTION *dp)
{
- int dir;
+ DIRECTION dir;
cptr p;
char command;
-
- /* Initialize */
(*dp) = 0;
/* Global direction */
/* Choose a prompt */
if (!target_okay())
{
-#ifdef JP
-p = "方向 ('*'でターゲット選択, ESCで中断)? ";
-#else
- p = "Direction ('*' to choose a target, Escape to cancel)? ";
-#endif
-
+ p = _("方向 ('*'でターゲット選択, ESCで中断)? ", "Direction ('*' to choose a target, Escape to cancel)? ");
}
else
{
-#ifdef JP
-p = "方向 ('5'でターゲットへ, '*'でターゲット再選択, ESCで中断)? ";
-#else
- p = "Direction ('5' for target, '*' to re-target, Escape to cancel)? ";
-#endif
-
+ p = _("方向 ('5'でターゲットへ, '*'でターゲット再選択, ESCで中断)? ", "Direction ('5' for target, '*' to re-target, Escape to cancel)? ");
}
/* Get a command (or Cancel) */
/* Check for confusion */
if (p_ptr->confused)
{
- /* XXX XXX XXX */
/* Random direction */
dir = ddd[randint0(8)];
}
if (command_dir != dir)
{
/* Warn the user */
-#ifdef JP
-msg_print("あなたは混乱している。");
-#else
- msg_print("You are confused.");
-#endif
-
+ msg_print(_("あなたは混乱している。", "You are confused."));
}
/* Save direction */
}
-/*
- * Return bow energy
+/*!
+ * @brief 射撃武器の攻撃に必要な基本消費エネルギーを返す/Return bow energy
+ * @param sval 射撃武器のアイテム副分類ID
+ * @return 消費する基本エネルギー
*/
-s16b bow_energy(int sval)
+ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval)
{
- int energy = 100;
+ ENERGY energy = 10000;
/* Analyze the launcher */
switch (sval)
/*
* Return bow tmul
*/
-int bow_tmul(int sval)
+int bow_tmul(OBJECT_SUBTYPE_VALUE sval)
{
int tmul = 0;
* Display a rumor and apply its effects
*/
-int rumor_num(char *zz, int max_idx)
+IDX rumor_num(char *zz, IDX max_idx)
{
if (strcmp(zz, "*") == 0) return randint1(max_idx - 1);
- return atoi(zz);
+ return (IDX)atoi(zz);
}
cptr rumor_bind_name(char *base, cptr fullname)
void display_rumor(bool ex)
{
- bool err;
+ errr err;
int section = 0;
char Rumor[1024];
if (randint0(3) == 0) section = 1;
}
-#ifdef JP
- err = get_rnd_line_jonly("rumors_j.txt", section, Rumor, 10);
- if (err) strcpy(Rumor, "嘘の噂もある。");
-#else
- err = get_rnd_line("rumors.txt", section, Rumor);
- if (err) strcpy(Rumor, "Some rumors are wrong.");
-#endif
+ err = _(get_rnd_line_jonly("rumors_j.txt", section, Rumor, 10),
+ get_rnd_line("rumors.txt", section, Rumor));
+ if (err) strcpy(Rumor, _("嘘の噂もある。", "Some rumors are wrong."));
err = TRUE;
{
if (strcmp(zz[0], "ARTIFACT") == 0)
{
- int a_idx, k_idx;
+ IDX a_idx, k_idx;
object_type forge;
object_type *q_ptr = &forge;
artifact_type *a_ptr;
}
else if (strcmp(zz[0], "MONSTER") == 0)
{
- int r_idx;
+ MONRACE_IDX r_idx;
monster_race *r_ptr;
while(1)
r_ptr->r_sights++;
}
}
- else if (strcmp(zz[0], "DUNGEON") == 0)
+ else if (strcmp(zz[0], "DUNGEON") == 0)
{
- int d_idx;
+ DUNGEON_IDX d_idx;
dungeon_info_type *d_ptr;
while (1)
}
else if (strcmp(zz[0], "TOWN") == 0)
{
- int t_idx;
+ IDX t_idx;
s32b visit;
while(1)
err = FALSE;
}
/* error */
-#ifdef JP
- if (err) msg_print("この情報は間違っている。");
-#else
- if (err) msg_print("This information is wrong.");
-#endif
+ if (err) msg_print(_("この情報は間違っている。", "This information is wrong."));
}
else
{
OSDN Git Service
