-/* File: autopick.c */
-
-/* Purpose: Object Auto-picker/Destroyer */
-
-/*
- * Copyright (c) 2002 Mogami
- *
- * This software may be copied and distributed for educational, research, and
- * not for profit purposes provided that this copyright and statement are
- * included in all such copies.
+/*!
+ * @file autopick.c
+ * @brief 自動拾い機能の実装 / Object Auto-picker/Destroyer
+ * @date 2014/01/02
+ * @author
+ * Copyright (c) 2002 Mogami\n
+ *\n
+ * This software may be copied and distributed for educational, research, and\n
+ * not for profit purposes provided that this copyright and statement are\n
+ * included in all such copies.\n
+ * 2014 Deskull rearranged comment for Doxygen.\n
*/
#include "angband.h"
-
+#include "store.h"
#define MAX_LINELEN 1024
/*
* Macros for Keywords
*/
-#define FLG_ALL 0
-#define FLG_COLLECTING 1
-#define FLG_UNAWARE 2
-#define FLG_UNIDENTIFIED 3
-#define FLG_IDENTIFIED 4
-#define FLG_STAR_IDENTIFIED 5
-#define FLG_BOOSTED 6
-#define FLG_MORE_THAN 7
-#define FLG_DICE 8
-#define FLG_MORE_BONUS 9
-#define FLG_MORE_BONUS2 10
-#define FLG_WORTHLESS 11
-#define FLG_ARTIFACT 12
-#define FLG_EGO 13
-#define FLG_NAMELESS 14
-#define FLG_WANTED 15
-#define FLG_UNIQUE 16
-#define FLG_HUMAN 17
-#define FLG_UNREADABLE 18
-#define FLG_REALM1 19
-#define FLG_REALM2 20
-#define FLG_FIRST 21
-#define FLG_SECOND 22
-#define FLG_THIRD 23
-#define FLG_FOURTH 24
-
-#define FLG_ITEMS 30
-#define FLG_WEAPONS 31
-#define FLG_ARMORS 32
-#define FLG_MISSILES 33
-#define FLG_DEVICES 34
-#define FLG_LIGHTS 35
-#define FLG_JUNKS 36
-#define FLG_SPELLBOOKS 37
-#define FLG_HAFTED 38
-#define FLG_SHIELDS 39
-#define FLG_BOWS 40
-#define FLG_RINGS 41
-#define FLG_AMULETS 42
-#define FLG_SUITS 43
-#define FLG_CLOAKS 44
-#define FLG_HELMS 45
-#define FLG_GLOVES 46
-#define FLG_BOOTS 47
-#define FLG_FAVORITE 48
+#define FLG_ALL 0
+#define FLG_UNAWARE 1
+#define FLG_UNIDENTIFIED 2
+#define FLG_IDENTIFIED 3
+#define FLG_STAR_IDENTIFIED 4
+#define FLG_COLLECTING 5
+#define FLG_ARTIFACT 6
+#define FLG_EGO 7
+#define FLG_GOOD 10
+#define FLG_NAMELESS 11
+#define FLG_AVERAGE 12
+#define FLG_WORTHLESS 13
+#define FLG_RARE 14
+#define FLG_COMMON 15
+#define FLG_BOOSTED 16
+#define FLG_MORE_DICE 17
+#define FLG_MORE_BONUS 18
+#define FLG_WANTED 19
+#define FLG_UNIQUE 20
+#define FLG_HUMAN 21
+#define FLG_UNREADABLE 22
+#define FLG_REALM1 23
+#define FLG_REALM2 24
+#define FLG_FIRST 25
+#define FLG_SECOND 26
+#define FLG_THIRD 27
+#define FLG_FOURTH 28
+
+#define FLG_ITEMS 30
+#define FLG_WEAPONS 31
+#define FLG_FAVORITE_WEAPONS 32
+#define FLG_ARMORS 33
+#define FLG_MISSILES 34
+#define FLG_DEVICES 35
+#define FLG_LIGHTS 36
+#define FLG_JUNKS 37
+#define FLG_CORPSES 38
+#define FLG_SPELLBOOKS 39
+#define FLG_HAFTED 40
+#define FLG_SHIELDS 41
+#define FLG_BOWS 42
+#define FLG_RINGS 43
+#define FLG_AMULETS 44
+#define FLG_SUITS 45
+#define FLG_CLOAKS 46
+#define FLG_HELMS 47
+#define FLG_GLOVES 48
+#define FLG_BOOTS 49
#define FLG_NOUN_BEGIN FLG_ITEMS
-#define FLG_NOUN_END FLG_FAVORITE
+#define FLG_NOUN_END FLG_BOOTS
#ifdef JP
-#define KEY_ALL "¤¹¤Ù¤Æ¤Î"
-
-#ifdef MAC_MPW
-/*
- * MEGA HACK -- MPW¤Î¥Ð¥°½ü¤±¡£
- * pre-processÃæ¤Ë¡Ö¼ý¡×¤Î»ú¤Î2¥Ð¥¤¥ÈÌܤ¬¾¡¼ê¤Ë¾Ã¤¨¤Æ¤·¤Þ¤¦¡£
- */
-#define KEY_COLLECTING "\x8e\xfb½¸Ãæ¤Î"
-#else
-#define KEY_COLLECTING "¼ý½¸Ãæ¤Î"
-#endif
-
-#define KEY_UNIDENTIFIED "̤´ÕÄê¤Î"
-#define KEY_IDENTIFIED "´ÕÄêºÑ¤ß¤Î"
-#define KEY_STAR_IDENTIFIED "*´ÕÄê*ºÑ¤ß¤Î"
-#define KEY_BOOSTED "¥À¥¤¥¹Ìܤΰ㤦"
-#define KEY_MORE_THAN "¥À¥¤¥¹ÌÜ"
-#define KEY_DICE "°Ê¾å¤Î"
-#define KEY_MORE_BONUS "½¤ÀµÃÍ"
-#define KEY_MORE_BONUS2 "°Ê¾å¤Î"
-#define KEY_WORTHLESS "̵²ÁÃͤÎ"
-#define KEY_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È"
-#define KEY_EGO "¥¨¥´"
-#define KEY_NAMELESS "̵ÌäÎ"
-#define KEY_UNAWARE "̤ȽÌÀ¤Î"
-#define KEY_WANTED "¾Þ¶â¼ó¤Î"
-#define KEY_UNIQUE "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î"
-#define KEY_HUMAN "¿Í´Ö¤Î"
-#define KEY_UNREADABLE "Æɤá¤Ê¤¤"
-#define KEY_REALM1 "Âè°ìÎΰè¤Î"
-#define KEY_REALM2 "ÂèÆóÎΰè¤Î"
-#define KEY_FIRST "1ºýÌܤÎ"
-#define KEY_SECOND "2ºýÌܤÎ"
-#define KEY_THIRD "3ºýÌܤÎ"
-#define KEY_FOURTH "4ºýÌܤÎ"
-#define KEY_ITEMS "¥¢¥¤¥Æ¥à"
-#define KEY_WEAPONS "Éð´ï"
-#define KEY_ARMORS "Ëɶñ"
-#define KEY_MISSILES "Ìð"
-#define KEY_DEVICES "ËâË¡¥¢¥¤¥Æ¥à"
-#define KEY_LIGHTS "¸÷¸»"
-#define KEY_JUNKS "¤¬¤é¤¯¤¿"
-#define KEY_SPELLBOOKS "ËâË¡½ñ"
-#define KEY_HAFTED "Æß´ï"
-#define KEY_SHIELDS "½â"
-#define KEY_BOWS "µÝ"
-#define KEY_RINGS "»ØÎØ"
-#define KEY_AMULETS "¥¢¥ß¥å¥ì¥Ã¥È"
-#define KEY_SUITS "³»"
-#define KEY_CLOAKS "¥¯¥í¡¼¥¯"
-#define KEY_HELMS "³õ"
-#define KEY_GLOVES "äƼê"
-#define KEY_BOOTS "·¤"
-#define KEY_FAVORITE "ÆÀ°ÕÉð´ï"
+static char KEY_ALL[] = "すべての";
+static char KEY_UNAWARE[] = "未判明の";
+static char KEY_UNIDENTIFIED[] = "未鑑定の";
+static char KEY_IDENTIFIED[] = "鑑定済みの";
+static char KEY_STAR_IDENTIFIED[] = "*鑑定*済みの";
+static char KEY_COLLECTING[] = "収集中の";
+static char KEY_ARTIFACT[] = "アーティファクト";
+static char KEY_EGO[] = "エゴ";
+static char KEY_GOOD[] = "上質の";
+static char KEY_NAMELESS[] = "無銘の";
+static char KEY_AVERAGE[] = "並の";
+static char KEY_WORTHLESS[] = "無価値の";
+static char KEY_RARE[] = "レアな";
+static char KEY_COMMON[] = "ありふれた";
+static char KEY_BOOSTED[] = "ダイス目の違う";
+static char KEY_MORE_THAN[] = "ダイス目";
+static char KEY_DICE[] = "以上の";
+static char KEY_MORE_BONUS[] = "修正値";
+static char KEY_MORE_BONUS2[] = "以上の";
+static char KEY_WANTED[] = "賞金首の";
+static char KEY_UNIQUE[] = "ユニーク・モンスターの";
+static char KEY_HUMAN[] = "人間の";
+static char KEY_UNREADABLE[] = "読めない";
+static char KEY_REALM1[] = "第一領域の";
+static char KEY_REALM2[] = "第二領域の";
+static char KEY_FIRST[] = "1冊目の";
+static char KEY_SECOND[] = "2冊目の";
+static char KEY_THIRD[] = "3冊目の";
+static char KEY_FOURTH[] = "4冊目の";
+static char KEY_ITEMS[] = "アイテム";
+static char KEY_WEAPONS[] = "武器";
+static char KEY_FAVORITE_WEAPONS[] = "得意武器";
+static char KEY_ARMORS[] = "防具";
+static char KEY_MISSILES[] = "矢";
+static char KEY_DEVICES[] = "魔法アイテム";
+static char KEY_LIGHTS[] = "光源";
+static char KEY_JUNKS[] = "がらくた";
+static char KEY_CORPSES[] = "死体や骨";
+static char KEY_SPELLBOOKS[] = "魔法書";
+static char KEY_HAFTED[] = "鈍器";
+static char KEY_SHIELDS[] = "盾";
+static char KEY_BOWS[] = "弓";
+static char KEY_RINGS[] = "指輪";
+static char KEY_AMULETS[] = "アミュレット";
+static char KEY_SUITS[] = "鎧";
+static char KEY_CLOAKS[] = "クローク";
+static char KEY_HELMS[] = "兜";
+static char KEY_GLOVES[] = "籠手";
+static char KEY_BOOTS[] = "靴";
#else
-#define KEY_ALL "all"
-#define KEY_COLLECTING "collecting"
-#define KEY_UNIDENTIFIED "unidentified"
-#define KEY_IDENTIFIED "identified"
-#define KEY_STAR_IDENTIFIED "*identified*"
-#define KEY_BOOSTED "dice boosted"
-#define KEY_MORE_THAN "more than"
-#define KEY_DICE " dice"
-#define KEY_MORE_BONUS "more bonus than"
-#define KEY_MORE_BONUS2 ""
-#define KEY_WORTHLESS "worthless"
-#define KEY_ARTIFACT "artifact"
-#define KEY_EGO "ego"
-#define KEY_NAMELESS "nameless"
-#define KEY_UNAWARE "unaware"
-#define KEY_WANTED "wanted"
-#define KEY_UNIQUE "unique monster's"
-#define KEY_HUMAN "human"
-#define KEY_UNREADABLE "unreadable"
-#define KEY_REALM1 "first realm's"
-#define KEY_REALM2 "second realm's"
-#define KEY_FIRST "first"
-#define KEY_SECOND "second"
-#define KEY_THIRD "third"
-#define KEY_FOURTH "fourth"
-#define KEY_ITEMS "items"
-#define KEY_WEAPONS "weapons"
-#define KEY_ARMORS "armors"
-#define KEY_MISSILES "missiles"
-#define KEY_DEVICES "magical devices"
-#define KEY_LIGHTS "lights"
-#define KEY_JUNKS "junks"
-#define KEY_SPELLBOOKS "spellbooks"
-#define KEY_HAFTED "hafted weapons"
-#define KEY_SHIELDS "shields"
-#define KEY_BOWS "bows"
-#define KEY_RINGS "rings"
-#define KEY_AMULETS "amulets"
-#define KEY_SUITS "suits"
-#define KEY_CLOAKS "cloaks"
-#define KEY_HELMS "helms"
-#define KEY_GLOVES "gloves"
-#define KEY_BOOTS "boots"
-#define KEY_FAVORITE "favorite weapons"
+static char KEY_ALL[] = "all";
+static char KEY_UNAWARE[] = "unaware";
+static char KEY_UNIDENTIFIED[] = "unidentified";
+static char KEY_IDENTIFIED[] = "identified";
+static char KEY_STAR_IDENTIFIED[] = "*identified*";
+static char KEY_COLLECTING[] = "collecting";
+static char KEY_ARTIFACT[] = "artifact";
+static char KEY_EGO[] = "ego";
+static char KEY_GOOD[] = "good";
+static char KEY_NAMELESS[] = "nameless";
+static char KEY_AVERAGE[] = "average";
+static char KEY_WORTHLESS[] = "worthless";
+static char KEY_RARE[] = "rare";
+static char KEY_COMMON[] = "common";
+static char KEY_BOOSTED[] = "dice boosted";
+static char KEY_MORE_THAN[] = "more than";
+static char KEY_DICE[] = " dice";
+static char KEY_MORE_BONUS[] = "more bonus than";
+static char KEY_MORE_BONUS2[] = "";
+static char KEY_WANTED[] = "wanted";
+static char KEY_UNIQUE[] = "unique monster's";
+static char KEY_HUMAN[] = "human";
+static char KEY_UNREADABLE[] = "unreadable";
+static char KEY_REALM1[] = "first realm's";
+static char KEY_REALM2[] = "second realm's";
+static char KEY_FIRST[] = "first";
+static char KEY_SECOND[] = "second";
+static char KEY_THIRD[] = "third";
+static char KEY_FOURTH[] = "fourth";
+static char KEY_ITEMS[] = "items";
+static char KEY_WEAPONS[] = "weapons";
+static char KEY_FAVORITE_WEAPONS[] = "favorite weapons";
+static char KEY_ARMORS[] = "armors";
+static char KEY_MISSILES[] = "missiles";
+static char KEY_DEVICES[] = "magical devices";
+static char KEY_LIGHTS[] = "lights";
+static char KEY_JUNKS[] = "junks";
+static char KEY_CORPSES[] = "corpses or skeletons";
+static char KEY_SPELLBOOKS[] = "spellbooks";
+static char KEY_HAFTED[] = "hafted weapons";
+static char KEY_SHIELDS[] = "shields";
+static char KEY_BOWS[] = "bows";
+static char KEY_RINGS[] = "rings";
+static char KEY_AMULETS[] = "amulets";
+static char KEY_SUITS[] = "suits";
+static char KEY_CLOAKS[] = "cloaks";
+static char KEY_HELMS[] = "helms";
+static char KEY_GLOVES[] = "gloves";
+static char KEY_BOOTS[] = "boots";
#endif /* JP */
#define IS_FLG(FLG) (entry->flag[FLG / 32] & (1L << (FLG % 32)))
#ifdef JP
- static char kanji_colon[] = "¡§";
+ static char kanji_colon[] = "：";
#endif
cptr prev_ptr, ptr, old_ptr;
int prev_flg;
- if (str[1] == ':') switch (str[0])
+ if (str[0] && str[1] == ':') switch (str[0])
{
case '?': case '%':
case 'A': case 'P': case 'C':
entry->flag[0] = entry->flag[1] = 0L;
entry->dice = 0;
+ entry->bonus = 0;
act = DO_AUTOPICK | DO_DISPLAY;
- while (1)
+ while (TRUE)
{
if ((act & DO_AUTOPICK) && *str == '!')
{
break;
}
- if (isupper(c)) c = tolower(c);
+ if (isupper(c)) c = (char)tolower(c);
buf[i] = c;
}
if (MATCH_KEY(KEY_ALL)) ADD_FLG(FLG_ALL);
if (MATCH_KEY(KEY_COLLECTING)) ADD_FLG(FLG_COLLECTING);
+ if (MATCH_KEY(KEY_UNAWARE)) ADD_FLG(FLG_UNAWARE);
if (MATCH_KEY(KEY_UNIDENTIFIED)) ADD_FLG(FLG_UNIDENTIFIED);
if (MATCH_KEY(KEY_IDENTIFIED)) ADD_FLG(FLG_IDENTIFIED);
if (MATCH_KEY(KEY_STAR_IDENTIFIED)) ADD_FLG(FLG_STAR_IDENTIFIED);
if (k > 0 && k <= 2)
{
(void)MATCH_KEY(KEY_DICE);
- ADD_FLG(FLG_MORE_THAN);
+ ADD_FLG(FLG_MORE_DICE);
}
else
ptr = prev_ptr;
if (k > 0 && k <= 2)
{
+#ifdef JP
(void)MATCH_KEY(KEY_MORE_BONUS2);
+#else
+ if (' ' == *ptr) ptr++;
+#endif
ADD_FLG(FLG_MORE_BONUS);
}
else
if (MATCH_KEY(KEY_WORTHLESS)) ADD_FLG(FLG_WORTHLESS);
if (MATCH_KEY(KEY_EGO)) ADD_FLG(FLG_EGO);
+ if (MATCH_KEY(KEY_GOOD)) ADD_FLG(FLG_GOOD);
if (MATCH_KEY(KEY_NAMELESS)) ADD_FLG(FLG_NAMELESS);
- if (MATCH_KEY(KEY_UNAWARE)) ADD_FLG(FLG_UNAWARE);
+ if (MATCH_KEY(KEY_AVERAGE)) ADD_FLG(FLG_AVERAGE);
+ if (MATCH_KEY(KEY_RARE)) ADD_FLG(FLG_RARE);
+ if (MATCH_KEY(KEY_COMMON)) ADD_FLG(FLG_COMMON);
if (MATCH_KEY(KEY_WANTED)) ADD_FLG(FLG_WANTED);
if (MATCH_KEY(KEY_UNIQUE)) ADD_FLG(FLG_UNIQUE);
if (MATCH_KEY(KEY_HUMAN)) ADD_FLG(FLG_HUMAN);
if (MATCH_KEY2(KEY_ITEMS)) ADD_FLG_NOUN(FLG_ITEMS);
else if (MATCH_KEY2(KEY_WEAPONS)) ADD_FLG_NOUN(FLG_WEAPONS);
+ else if (MATCH_KEY2(KEY_FAVORITE_WEAPONS)) ADD_FLG_NOUN(FLG_FAVORITE_WEAPONS);
else if (MATCH_KEY2(KEY_ARMORS)) ADD_FLG_NOUN(FLG_ARMORS);
else if (MATCH_KEY2(KEY_MISSILES)) ADD_FLG_NOUN(FLG_MISSILES);
else if (MATCH_KEY2(KEY_DEVICES)) ADD_FLG_NOUN(FLG_DEVICES);
else if (MATCH_KEY2(KEY_LIGHTS)) ADD_FLG_NOUN(FLG_LIGHTS);
else if (MATCH_KEY2(KEY_JUNKS)) ADD_FLG_NOUN(FLG_JUNKS);
+ else if (MATCH_KEY2(KEY_CORPSES)) ADD_FLG_NOUN(FLG_CORPSES);
else if (MATCH_KEY2(KEY_SPELLBOOKS)) ADD_FLG_NOUN(FLG_SPELLBOOKS);
else if (MATCH_KEY2(KEY_HAFTED)) ADD_FLG_NOUN(FLG_HAFTED);
else if (MATCH_KEY2(KEY_SHIELDS)) ADD_FLG_NOUN(FLG_SHIELDS);
else if (MATCH_KEY2(KEY_HELMS)) ADD_FLG_NOUN(FLG_HELMS);
else if (MATCH_KEY2(KEY_GLOVES)) ADD_FLG_NOUN(FLG_GLOVES);
else if (MATCH_KEY2(KEY_BOOTS)) ADD_FLG_NOUN(FLG_BOOTS);
- else if (MATCH_KEY2(KEY_FAVORITE)) ADD_FLG_NOUN(FLG_FAVORITE);
/* Last 'keyword' must be at the correct location */
if (*ptr == ':')
/*
- * Favorite weapons
- */
-static bool is_favorite(object_type *o_ptr)
-{
- /* Only weapons match */
- if (!(TV_WEAPON_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_WEAPON_END))
- return FALSE;
-
- /* Favorite weapons are varied depend on the class */
- switch (p_ptr->pclass)
- {
- case CLASS_PRIEST:
- {
- u32b flgs[TR_FLAG_SIZE];
- object_flags_known(o_ptr, flgs);
-
- if (!have_flag(flgs, TR_BLESSED) &&
- !(o_ptr->tval == TV_HAFTED))
- return FALSE;
- break;
- }
-
- case CLASS_MONK:
- case CLASS_FORCETRAINER:
- /* Icky to wield? */
- if (!(s_info[p_ptr->pclass].w_max[o_ptr->tval-TV_WEAPON_BEGIN][o_ptr->sval]))
- return FALSE;
- break;
-
- case CLASS_BEASTMASTER:
- case CLASS_CAVALRY:
- {
- u32b flgs[TR_FLAG_SIZE];
- object_flags_known(o_ptr, flgs);
-
- /* Is it known to be suitable to using while riding? */
- if (!(have_flag(flgs, TR_RIDING)))
- return FALSE;
-
- break;
- }
-
- case CLASS_NINJA:
- /* Icky to wield? */
- if (s_info[p_ptr->pclass].w_max[o_ptr->tval-TV_WEAPON_BEGIN][o_ptr->sval] <= WEAPON_EXP_BEGINNER)
- return FALSE;
- break;
-
- default:
- /* All weapons are okay for non-special classes */
- return TRUE;
- }
-
- return TRUE;
-}
-
-
-/*
* Get auto-picker entry from o_ptr.
*/
static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr)
/* Assume that object name is to be added */
bool name = TRUE;
- entry->name = NULL;
+#ifdef JP
+ /* エゴ銘が邪魔かもしれないので、デフォルトで「^」は付けない */
+ bool bol_mark = FALSE;
+#else
+ /* We can always use the ^ mark in English */
+ bool bol_mark = TRUE;
+#endif
+
+ char name_str[MAX_NLEN];
+
+ /* Initialize name string */
+ name_str[0] = '\0';
+
entry->insc = string_make(quark_str(o_ptr->inscription));
entry->action = DO_AUTOPICK | DO_DISPLAY;
entry->flag[0] = entry->flag[1] = 0L;
entry->dice = 0;
/* Unaware */
- if (!object_aware_p(o_ptr))
+ if (!object_is_aware(o_ptr))
{
ADD_FLG(FLG_UNAWARE);
+ bol_mark = TRUE;
}
/* Not really identified */
- else if (!object_known_p(o_ptr))
+ else if (!object_is_known(o_ptr))
{
if (!(o_ptr->ident & IDENT_SENSE))
{
ADD_FLG(FLG_UNIDENTIFIED);
+ bol_mark = TRUE;
}
else
{
case FEEL_AVERAGE:
case FEEL_GOOD:
ADD_FLG(FLG_NAMELESS);
+ bol_mark = TRUE;
break;
case FEEL_BROKEN:
case FEEL_CURSED:
ADD_FLG(FLG_NAMELESS);
ADD_FLG(FLG_WORTHLESS);
+ bol_mark = TRUE;
break;
case FEEL_TERRIBLE:
ADD_FLG(FLG_EGO);
break;
+ case FEEL_UNCURSED:
+ /* XXX No appropriate flag */
+ /* ADD_FLG(); */
+ break;
+
default:
- /* It's not known to be useless so... */
- ADD_FLG(FLG_UNIDENTIFIED);
+ /* Never reach here */
break;
}
}
else
{
/* Ego objects */
- if (o_ptr->name2)
-
+ if (object_is_ego(o_ptr))
{
- ego_item_type *e_ptr = &e_info[o_ptr->name2];
- entry->name = string_make(e_name + e_ptr->name);
-
- if (TV_WEAPON_BEGIN <= o_ptr->tval &&
- o_ptr->tval <= TV_ARMOR_END)
+ if (object_is_weapon_armour_ammo(o_ptr))
{
/*
* Base name of ego weapons and armors
- * are almost meaningless. Ignore it.
+ * are almost meaningless.
+ * Register the ego type only.
*/
+ ego_item_type *e_ptr = &e_info[o_ptr->name2];
+#ifdef JP
+ /* エゴ銘には「^」マークが使える */
+ sprintf(name_str, "^%s", e_name + e_ptr->name);
+#else
+ /* We ommit the basename and cannot use the ^ mark */
+ strcpy(name_str, e_name + e_ptr->name);
+#endif
+
+ /* Don't use the object description */
name = FALSE;
+
+ /* Restrict to 'common' equipments */
+ if (!object_is_rare(o_ptr)) ADD_FLG(FLG_COMMON);
}
ADD_FLG(FLG_EGO);
}
/* Artifact */
- else if (o_ptr->name1 || o_ptr->art_name)
+ else if (object_is_artifact(o_ptr))
ADD_FLG(FLG_ARTIFACT);
/* Non-ego, non-artifact */
else
{
/* Wearable nameless object */
- if ((TV_EQUIP_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_EQUIP_END))
+ if (object_is_equipment(o_ptr))
ADD_FLG(FLG_NAMELESS);
+
+ bol_mark = TRUE;
}
}
-
- switch(o_ptr->tval)
+ /* Melee weapon with boosted dice */
+ if (object_is_melee_weapon(o_ptr))
{
- object_kind *k_ptr;
- case TV_HAFTED: case TV_POLEARM: case TV_SWORD: case TV_DIGGING:
- k_ptr = &k_info[o_ptr->k_idx];
+ object_kind *k_ptr = &k_info[o_ptr->k_idx];
+
if ((o_ptr->dd != k_ptr->dd) || (o_ptr->ds != k_ptr->ds))
ADD_FLG(FLG_BOOSTED);
}
- if (o_ptr->tval == TV_CORPSE && object_is_shoukinkubi(o_ptr))
+ /* Wanted monster's corpse */
+ if (object_is_shoukinkubi(o_ptr))
{
REM_FLG(FLG_WORTHLESS);
ADD_FLG(FLG_WANTED);
ADD_FLG(FLG_UNIQUE);
}
- if (o_ptr->tval == TV_CORPSE && strchr("pht", r_info[o_ptr->pval].d_char))
+ if (o_ptr->tval == TV_CORPSE && my_strchr("pht", r_info[o_ptr->pval].d_char))
{
ADD_FLG(FLG_HUMAN);
}
if (o_ptr->tval >= TV_LIFE_BOOK && 3 == o_ptr->sval)
ADD_FLG(FLG_FOURTH);
- if (o_ptr->tval == TV_SHOT || o_ptr->tval == TV_BOLT
- || o_ptr->tval == TV_ARROW)
+ if (object_is_ammo(o_ptr))
ADD_FLG(FLG_MISSILES);
else if (o_ptr->tval == TV_SCROLL || o_ptr->tval == TV_STAFF
|| o_ptr->tval == TV_WAND || o_ptr->tval == TV_ROD)
else if (o_ptr->tval == TV_SKELETON || o_ptr->tval == TV_BOTTLE
|| o_ptr->tval == TV_JUNK || o_ptr->tval == TV_STATUE)
ADD_FLG(FLG_JUNKS);
+ else if (o_ptr->tval == TV_CORPSE)
+ ADD_FLG(FLG_CORPSES);
else if (o_ptr->tval >= TV_LIFE_BOOK)
ADD_FLG(FLG_SPELLBOOKS);
else if (o_ptr->tval == TV_POLEARM || o_ptr->tval == TV_SWORD
else if (o_ptr->tval == TV_BOOTS)
ADD_FLG(FLG_BOOTS);
-
+ /* Prepare the object description */
if (name)
{
char o_name[MAX_NLEN];
- object_desc(o_name, o_ptr, FALSE, 0);
- entry->name = string_make(o_name);
- }
+ object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL | OD_NAME_ONLY));
- else if (!entry->name)
- {
- entry->name = string_make("");
+ /*
+ * If necessary, add a '^' which indicates the
+ * beginning of line.
+ */
+ sprintf(name_str, "%s%s", bol_mark ? "^" : "", o_name);
}
+ /* Register the name in lowercase */
+ str_tolower(name_str);
+ entry->name = string_make(name_str);
+
return;
}
{
string_free(entry->name);
string_free(entry->insc);
+ entry->name = NULL;
+ entry->insc = NULL;
}
-/*
- * Initialize auto-picker preference
- */
#define MAX_AUTOPICK_DEFAULT 200
-void init_autopicker(void)
+/*
+ * Initialize the autopick
+ */
+static void init_autopick(void)
{
static const char easy_autopick_inscription[] = "(:=g";
autopick_type entry;
}
+#define PT_DEFAULT 0
+#define PT_WITH_PNAME 1
+
+/*
+ * Get file name for autopick preference
+ */
+static cptr pickpref_filename(int filename_mode)
+{
+ static const char namebase[] = _("picktype", "pickpref");
+
+ switch (filename_mode)
+ {
+ case PT_DEFAULT:
+ return format("%s.prf", namebase);
+
+ case PT_WITH_PNAME:
+ return format("%s-%s.prf", namebase, player_base);
+
+ default:
+ return NULL;
+ }
+}
+
+
+/*
+ * Load an autopick preference file
+ */
+void autopick_load_pref(bool disp_mes)
+{
+ char buf[80];
+ errr err;
+
+ /* Free old entries */
+ init_autopick();
+
+ /* Try a filename with player name */
+ my_strcpy(buf, pickpref_filename(PT_WITH_PNAME), sizeof(buf));
+
+ /* Load the file */
+ err = process_autopick_file(buf);
+
+ if (err == 0 && disp_mes)
+ {
+ /* Success */
+ msg_format(_("%sを読み込みました。", "Loaded '%s'."), buf);
+ }
+
+ /* No file found */
+ if (0 > err)
+ {
+ /* Use default name */
+ my_strcpy(buf, pickpref_filename(PT_DEFAULT), sizeof(buf));
+
+ /* Load the file */
+ err = process_autopick_file(buf);
+
+ if (err == 0 && disp_mes)
+ {
+ /* Success */
+ msg_format(_("%sを読み込みました。", "Loaded '%s'."), buf);
+ }
+ }
+
+ if (err && disp_mes)
+ {
+ /* Failed */
+ msg_print(_("自動拾い設定ファイルの読み込みに失敗しました。", "Failed to reload autopick preference."));
+ }
+}
+
+
/*
* Add one line to autopick_list[]
*/
C_MAKE(autopick_list, max_max_autopick, autopick_type);
/* Copy from old list to new list */
- C_COPY(autopick_list, old_autopick_list, old_max_max_autopick, autopick_type);
+ (void)C_COPY(autopick_list, old_autopick_list, old_max_max_autopick, autopick_type);
/* Kill old list */
- C_FREE(old_autopick_list, old_max_max_autopick, autopick_type);
+ C_KILL(old_autopick_list, old_max_max_autopick, autopick_type);
}
/* Add one line */
/*
* Process line for auto picker/destroyer.
*/
-errr process_pickpref_file_line(char *buf)
+errr process_autopick_file_command(char *buf)
{
autopick_type an_entry, *entry = &an_entry;
int i;
continue;
}
#endif
- if (isspace(buf[i]) && buf[i] != ' ')
+ if (iswspace(buf[i]) && buf[i] != ' ')
break;
}
buf[i] = 0;
&& entry->flag[0] == autopick_list[i].flag[0]
&& entry->flag[1] == autopick_list[i].flag[1]
&& entry->dice == autopick_list[i].dice
- && entry->bonus == autopick_list[i].bonus) return 0;
+ && entry->bonus == autopick_list[i].bonus)
+ {
+ autopick_free_entry(entry);
+ return 0;
+ }
add_autopick_list(entry);
return 0;
if (IS_FLG(FLG_ALL)) ADD_KEY(KEY_ALL);
if (IS_FLG(FLG_COLLECTING)) ADD_KEY(KEY_COLLECTING);
+ if (IS_FLG(FLG_UNAWARE)) ADD_KEY(KEY_UNAWARE);
if (IS_FLG(FLG_UNIDENTIFIED)) ADD_KEY(KEY_UNIDENTIFIED);
if (IS_FLG(FLG_IDENTIFIED)) ADD_KEY(KEY_IDENTIFIED);
if (IS_FLG(FLG_STAR_IDENTIFIED)) ADD_KEY(KEY_STAR_IDENTIFIED);
- if (IS_FLG(FLG_UNAWARE)) ADD_KEY(KEY_UNAWARE);
if (IS_FLG(FLG_BOOSTED)) ADD_KEY(KEY_BOOSTED);
- if (IS_FLG(FLG_MORE_THAN))
+ if (IS_FLG(FLG_MORE_DICE))
{
ADD_KEY(KEY_MORE_THAN);
strcat(ptr, format("%d", entry->dice));
if (IS_FLG(FLG_UNIQUE)) ADD_KEY(KEY_UNIQUE);
if (IS_FLG(FLG_HUMAN)) ADD_KEY(KEY_HUMAN);
if (IS_FLG(FLG_WORTHLESS)) ADD_KEY(KEY_WORTHLESS);
+ if (IS_FLG(FLG_GOOD)) ADD_KEY(KEY_GOOD);
if (IS_FLG(FLG_NAMELESS)) ADD_KEY(KEY_NAMELESS);
+ if (IS_FLG(FLG_AVERAGE)) ADD_KEY(KEY_AVERAGE);
+ if (IS_FLG(FLG_RARE)) ADD_KEY(KEY_RARE);
+ if (IS_FLG(FLG_COMMON)) ADD_KEY(KEY_COMMON);
if (IS_FLG(FLG_EGO)) ADD_KEY(KEY_EGO);
if (IS_FLG(FLG_ARTIFACT)) ADD_KEY(KEY_ARTIFACT);
if (IS_FLG(FLG_ITEMS)) ADD_KEY2(KEY_ITEMS);
else if (IS_FLG(FLG_WEAPONS)) ADD_KEY2(KEY_WEAPONS);
+ else if (IS_FLG(FLG_FAVORITE_WEAPONS)) ADD_KEY2(KEY_FAVORITE_WEAPONS);
else if (IS_FLG(FLG_ARMORS)) ADD_KEY2(KEY_ARMORS);
else if (IS_FLG(FLG_MISSILES)) ADD_KEY2(KEY_MISSILES);
else if (IS_FLG(FLG_DEVICES)) ADD_KEY2(KEY_DEVICES);
else if (IS_FLG(FLG_LIGHTS)) ADD_KEY2(KEY_LIGHTS);
else if (IS_FLG(FLG_JUNKS)) ADD_KEY2(KEY_JUNKS);
+ else if (IS_FLG(FLG_CORPSES)) ADD_KEY2(KEY_CORPSES);
else if (IS_FLG(FLG_SPELLBOOKS)) ADD_KEY2(KEY_SPELLBOOKS);
else if (IS_FLG(FLG_HAFTED)) ADD_KEY2(KEY_HAFTED);
else if (IS_FLG(FLG_SHIELDS)) ADD_KEY2(KEY_SHIELDS);
else if (IS_FLG(FLG_HELMS)) ADD_KEY2(KEY_HELMS);
else if (IS_FLG(FLG_GLOVES)) ADD_KEY2(KEY_GLOVES);
else if (IS_FLG(FLG_BOOTS)) ADD_KEY2(KEY_BOOTS);
- else if (IS_FLG(FLG_FAVORITE)) ADD_KEY2(KEY_FAVORITE);
/* You don't need sepalator after adjective */
/* 'artifact' is not true adjective */
int j;
cptr ptr = entry->name;
+ /*** Unaware items ***/
+ if (IS_FLG(FLG_UNAWARE) && object_is_aware(o_ptr))
+ return FALSE;
+
/*** Unidentified ***/
if (IS_FLG(FLG_UNIDENTIFIED)
- && (object_known_p(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
+ && (object_is_known(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
return FALSE;
/*** Identified ***/
- if (IS_FLG(FLG_IDENTIFIED) && !object_known_p(o_ptr))
+ if (IS_FLG(FLG_IDENTIFIED) && !object_is_known(o_ptr))
return FALSE;
/*** *Identified* ***/
if (IS_FLG(FLG_STAR_IDENTIFIED) &&
- (!object_known_p(o_ptr) || !(o_ptr->ident & IDENT_MENTAL)))
+ (!object_is_known(o_ptr) || !(o_ptr->ident & IDENT_MENTAL)))
return FALSE;
/*** Dice boosted (weapon of slaying) ***/
if (IS_FLG(FLG_BOOSTED))
{
object_kind *k_ptr = &k_info[o_ptr->k_idx];
-
- switch( o_ptr->tval )
+
+ /* Require melee weapon */
+ if (!object_is_melee_weapon(o_ptr))
+ return FALSE;
+
+ /* Require boosted dice */
+ if ((o_ptr->dd == k_ptr->dd) && (o_ptr->ds == k_ptr->ds))
+ return FALSE;
+
+ /* In Vault Quest, Dice must be hide.*/
+ if(!object_is_known(o_ptr) && object_is_quest_target(o_ptr))
{
- case TV_HAFTED:
- case TV_POLEARM:
- case TV_SWORD:
- case TV_DIGGING:
- if ((o_ptr->dd != k_ptr->dd) || (o_ptr->ds != k_ptr->ds))
- break;
- else
- return FALSE;
- default:
return FALSE;
}
}
/*** Weapons which dd*ds is more than nn ***/
- if (IS_FLG(FLG_MORE_THAN))
+ if (IS_FLG(FLG_MORE_DICE))
{
if (o_ptr->dd * o_ptr->ds < entry->dice)
return FALSE;
/*** Weapons whic dd*ds is more than nn ***/
if (IS_FLG(FLG_MORE_BONUS))
{
- if (!object_known_p(o_ptr)) return FALSE;
+ if (!object_is_known(o_ptr)) return FALSE;
if (o_ptr->pval)
{
/*** Artifact object ***/
if (IS_FLG(FLG_ARTIFACT))
{
- if (!object_known_p(o_ptr) || (!o_ptr->name1 && !o_ptr->art_name))
+ if (!object_is_known(o_ptr) || !object_is_artifact(o_ptr))
return FALSE;
}
if (IS_FLG(FLG_EGO))
{
/* Need to be an ego item */
- if (!o_ptr->name2) return FALSE;
+ if (!object_is_ego(o_ptr)) return FALSE;
/* Need to be known to be an ego */
- if (!object_known_p(o_ptr) &&
+ if (!object_is_known(o_ptr) &&
!((o_ptr->ident & IDENT_SENSE) && o_ptr->feeling == FEEL_EXCELLENT))
return FALSE;
}
- /*** Nameless ***/
- if (IS_FLG(FLG_NAMELESS))
+ /*** Good ***/
+ if (IS_FLG(FLG_GOOD))
{
- if (!(TV_EQUIP_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_EQUIP_END))
+ if (!object_is_equipment(o_ptr)) return FALSE;
+
+ /* Identified */
+ if (object_is_known(o_ptr))
+ {
+ /* Artifacts and Ego objects are not okay */
+ if (!object_is_nameless(o_ptr))
+ return FALSE;
+
+ /* Average are not okay */
+ if (o_ptr->to_a <= 0 && (o_ptr->to_h + o_ptr->to_d) <= 0)
+ return FALSE;
+ }
+
+ /* Pseudo-identified */
+ else if (o_ptr->ident & IDENT_SENSE)
+ {
+ switch (o_ptr->feeling)
+ {
+ case FEEL_GOOD:
+ /* It's good */
+ break;
+
+ default:
+ /* It's not good */
+ return FALSE;
+ }
+ }
+
+ /* Unidentified */
+ else
+ {
+ /* Not known to be good */
return FALSE;
+ }
+ }
- /* Inscription is a some sort of 'name' */
- if (o_ptr->inscription) return FALSE;
+ /*** Nameless ***/
+ if (IS_FLG(FLG_NAMELESS))
+ {
+ if (!object_is_equipment(o_ptr)) return FALSE;
/* Identified */
- if (object_known_p(o_ptr))
+ if (object_is_known(o_ptr))
{
/* Artifacts and Ego objects are not okay */
- if (o_ptr->name1 || o_ptr->art_name || o_ptr->name2)
+ if (!object_is_nameless(o_ptr))
return FALSE;
}
}
}
- /*** Unaware items ***/
- if (IS_FLG(FLG_UNAWARE) && object_aware_p(o_ptr))
+ /*** Average ***/
+ if (IS_FLG(FLG_AVERAGE))
+ {
+ if (!object_is_equipment(o_ptr)) return FALSE;
+
+ /* Identified */
+ if (object_is_known(o_ptr))
+ {
+ /* Artifacts and Ego objects are not okay */
+ if (!object_is_nameless(o_ptr))
+ return FALSE;
+
+ /* Cursed or broken objects are not okay */
+ if (object_is_cursed(o_ptr) || object_is_broken(o_ptr))
+ return FALSE;
+
+ /* Good are not okay */
+ if (o_ptr->to_a > 0 || (o_ptr->to_h + o_ptr->to_d) > 0)
+ return FALSE;
+ }
+
+ /* Pseudo-identified */
+ else if (o_ptr->ident & IDENT_SENSE)
+ {
+ switch (o_ptr->feeling)
+ {
+ case FEEL_AVERAGE:
+ /* It's average */
+ break;
+
+ default:
+ /* It's not average */
+ return FALSE;
+ }
+ }
+
+ /* Unidentified */
+ else
+ {
+ /* Not known to be average */
+ return FALSE;
+ }
+ }
+
+ /*** Rere equipments ***/
+ if (IS_FLG(FLG_RARE) && !object_is_rare(o_ptr))
+ return FALSE;
+
+ /*** Common equipments ***/
+ if (IS_FLG(FLG_COMMON) && object_is_rare(o_ptr))
return FALSE;
/*** Wanted monster's corpse/skeletons ***/
- if (IS_FLG(FLG_WANTED) &&
- (o_ptr->tval != TV_CORPSE || !object_is_shoukinkubi(o_ptr)))
+ if (IS_FLG(FLG_WANTED) && !object_is_shoukinkubi(o_ptr))
return FALSE;
/*** Unique monster's corpse/skeletons/statues ***/
/*** Human corpse/skeletons (for Daemon magic) ***/
if (IS_FLG(FLG_HUMAN) &&
(o_ptr->tval != TV_CORPSE ||
- !strchr("pht", r_info[o_ptr->pval].d_char)))
+ !my_strchr("pht", r_info[o_ptr->pval].d_char)))
return FALSE;
/*** Unreadable spellbooks ***/
/*** Items ***/
if (IS_FLG(FLG_WEAPONS))
{
- if (!(TV_WEAPON_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_WEAPON_END))
+ if (!object_is_weapon(o_ptr))
+ return FALSE;
+ }
+ else if (IS_FLG(FLG_FAVORITE_WEAPONS))
+ {
+ if (!object_is_favorite(o_ptr))
return FALSE;
}
else if (IS_FLG(FLG_ARMORS))
{
- if (!(TV_ARMOR_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_ARMOR_END))
+ if (!object_is_armour(o_ptr))
return FALSE;
}
else if (IS_FLG(FLG_MISSILES))
{
- switch(o_ptr->tval)
- {
- case TV_SHOT: case TV_BOLT: case TV_ARROW:
- break;
- default: return FALSE;
- }
+ if (!object_is_ammo(o_ptr)) return FALSE;
}
else if (IS_FLG(FLG_DEVICES))
{
default: return FALSE;
}
}
+ else if (IS_FLG(FLG_CORPSES))
+ {
+ if (o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_SKELETON)
+ return FALSE;
+ }
else if (IS_FLG(FLG_SPELLBOOKS))
{
if (!(o_ptr->tval >= TV_LIFE_BOOK))
if (!(o_ptr->tval == TV_BOOTS))
return FALSE;
}
- else if (IS_FLG(FLG_FAVORITE))
- {
- if (!is_favorite(o_ptr))
- return FALSE;
- }
/* Keyword don't match */
if (*ptr == '^')
}
else
{
-#ifdef JP
- if (!strstr_j(o_name, ptr)) return FALSE;
-#else
- if (!strstr(o_name, ptr)) return FALSE;
-#endif
+ if (!my_strstr(o_name, ptr)) return FALSE;
}
/* TRUE when it need not to be 'collecting' */
char o_name[MAX_NLEN];
if (o_ptr->tval == TV_GOLD) return -1;
-
- object_desc(o_name, o_ptr, FALSE, 3);
- /* Force to be lower case string */
- for (i = 0; o_name[i]; i++)
- {
-#ifdef JP
- if (iskanji(o_name[i]))
- i++;
- else
-#endif
- if (isupper(o_name[i]))
- o_name[i] = tolower(o_name[i]);
- }
-
+ /* Prepare object name string first */
+ object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
+
+ /* Convert the string to lower case */
+ str_tolower(o_name);
+
+ /* Look for a matching entry in the list */
for (i=0; i < max_autopick; i++)
{
autopick_type *entry = &autopick_list[i];
/*
* Auto inscription
*/
-void auto_inscribe_item(int item, int idx)
+static void auto_inscribe_item(object_type *o_ptr, int idx)
{
- object_type *o_ptr;
-
- /* Get the item (in the pack) */
- if (item >= 0) o_ptr = &inventory[item];
-
- /* Get the item (on the floor) */
- else o_ptr = &o_list[0 - item];
-
- /* Auto-inscription or Re-inscribe for resistances {%} */
- if ((idx < 0 || !autopick_list[idx].insc) && !o_ptr->inscription)
- return;
+ /* Are there auto-inscription? */
+ if (idx < 0 || !autopick_list[idx].insc) return;
if (!o_ptr->inscription)
o_ptr->inscription = quark_add(autopick_list[idx].insc);
- if (item > INVEN_PACK)
- {
- /* Redraw inscription */
- p_ptr->window |= (PW_EQUIP);
+ /* Redraw inscription */
+ p_ptr->window |= (PW_EQUIP | PW_INVEN);
- /* {.} and {$} effect p_ptr->warning and TRC_TELEPORT_SELF */
- p_ptr->update |= (PU_BONUS);
- }
- else if (item >= 0)
- {
- /* Redraw inscription */
- p_ptr->window |= (PW_INVEN);
- }
+ /* {.} and {$} effect p_ptr->warning and TRC_TELEPORT_SELF */
+ p_ptr->update |= (PU_BONUS);
}
/* Known to be worthless? */
if (leave_worth)
if (object_value(o_ptr) > 0) return FALSE;
-
+
if (leave_equip)
- if ((o_ptr->tval >= TV_MISSILE_BEGIN) && (o_ptr->tval <= TV_ARMOR_END)) return FALSE;
-
+ if (object_is_weapon_armour_ammo(o_ptr)) return FALSE;
+
if (leave_chest)
if ((o_ptr->tval == TV_CHEST) && o_ptr->pval) return FALSE;
-
+
if (leave_wanted)
{
- if (o_ptr->tval == TV_CORPSE
- && object_is_shoukinkubi(o_ptr)) return FALSE;
+ if (object_is_shoukinkubi(o_ptr)) return FALSE;
}
-
+
if (leave_corpse)
if (o_ptr->tval == TV_CORPSE) return FALSE;
-
+
if (leave_junk)
if ((o_ptr->tval == TV_SKELETON) || (o_ptr->tval == TV_BOTTLE) || (o_ptr->tval == TV_JUNK) || (o_ptr->tval == TV_STATUE)) return FALSE;
{
if (o_ptr->tval == TV_CORPSE &&
o_ptr->sval == SV_CORPSE &&
- strchr("pht", r_info[o_ptr->pval].d_char))
+ my_strchr("pht", r_info[o_ptr->pval].d_char))
return FALSE;
}
else if (p_ptr->pclass == CLASS_NINJA)
{
if (o_ptr->tval == TV_LITE &&
- o_ptr->name2 == EGO_LITE_DARKNESS)
+ o_ptr->name2 == EGO_LITE_DARKNESS && object_is_known(o_ptr))
return FALSE;
}
else if (p_ptr->pclass == CLASS_BEASTMASTER ||
p_ptr->pclass == CLASS_CAVALRY)
{
if (o_ptr->tval == TV_WAND &&
- o_ptr->sval == SV_WAND_HEAL_MONSTER)
+ o_ptr->sval == SV_WAND_HEAL_MONSTER && object_is_aware(o_ptr))
return FALSE;
}
}
-
+
if (o_ptr->tval == TV_GOLD) return FALSE;
-
+
return TRUE;
}
/*
* Automatically destroy an item if it is to be destroyed
+ *
+ * When always_pickup is 'yes', we disable auto-destroyer function of
+ * auto-picker/destroyer, and do only easy-auto-destroyer.
*/
static object_type autopick_last_destroyed_object;
-bool auto_destroy_item(int item, int autopick_idx)
+static void auto_destroy_item(object_type *o_ptr, int autopick_idx)
{
bool destroy = FALSE;
- object_type *o_ptr;
-
- /* Don't destroy equipped items */
- if (item > INVEN_PACK) return FALSE;
-
- /* Get the item (in the pack) */
- if (item >= 0) o_ptr = &inventory[item];
-
- /* Get the item (on the floor) */
- else o_ptr = &o_list[0 - item];
- /* Easy-Auto-Destroyer */
+ /* Easy-Auto-Destroyer (3rd priority) */
if (is_opt_confirm_destroy(o_ptr)) destroy = TRUE;
- /* Protected by auto-picker */
+ /* Protected by auto-picker (2nd priotity) */
if (autopick_idx >= 0 &&
!(autopick_list[autopick_idx].action & DO_AUTODESTROY))
destroy = FALSE;
+ /* Auto-destroyer works only when !always_pickup */
if (!always_pickup)
{
- /* Auto-picker/destroyer */
+ /* Auto-picker/destroyer (1st priority) */
if (autopick_idx >= 0 &&
(autopick_list[autopick_idx].action & DO_AUTODESTROY))
destroy = TRUE;
}
/* Not to be destroyed */
- if (!destroy) return FALSE;
+ if (!destroy) return;
/* Now decided to destroy */
- disturb(0,0);
+ disturb(FALSE, FALSE);
/* Artifact? */
if (!can_player_destroy_object(o_ptr))
char o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
- /* Message */
-#ifdef JP
- msg_format("%s¤ÏÇ˲õÉÔǽ¤À¡£", o_name);
-#else
- msg_format("You cannot auto-destroy %s.", o_name);
-#endif
+ msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name);
- /* Done */
- return TRUE;
+ return;
}
/* Record name of destroyed item */
- COPY(&autopick_last_destroyed_object, o_ptr, object_type);
+ (void)COPY(&autopick_last_destroyed_object, o_ptr, object_type);
/* Destroy Later */
o_ptr->marked |= OM_AUTODESTROY;
p_ptr->notice |= PN_AUTODESTROY;
- return TRUE;
+ return;
}
/*
* Auto-destroy marked item
*/
-static void delayed_auto_destroy_aux(int item)
+static void autopick_delayed_alter_aux(INVENTORY_IDX item)
{
object_type *o_ptr;
/* Get the item (on the floor) */
else o_ptr = &o_list[0 - item];
- if (o_ptr->k_idx && o_ptr->marked & OM_AUTODESTROY)
+ if (o_ptr->k_idx && (o_ptr->marked & OM_AUTODESTROY))
{
char o_name[MAX_NLEN];
/* Describe the object (with {terrible/special}) */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
/* Eliminate the item (from the pack) */
if (item >= 0)
delete_object_idx(0 - item);
}
- /* Print a message */
-#ifdef JP
- msg_format("%s¤ò¼«Æ°Ç˲õ¤·¤Þ¤¹¡£", o_name);
-#else
- msg_format("Auto-destroying %s.", o_name);
-#endif
+ msg_format(_("%sを自動破壊します。", "Auto-destroying %s."), o_name);
}
}
/*
- * Auto-destroy marked item in inventry and on floor
+ * Auto-destroy marked items in inventry and on floor
*/
-void delayed_auto_destroy(void)
+void autopick_delayed_alter(void)
{
- int item;
+ INVENTORY_IDX item;
/*
* Scan inventry in reverse order to prevent
* skipping after inven_item_optimize()
*/
for (item = INVEN_TOTAL - 1; item >= 0 ; item--)
- delayed_auto_destroy_aux(item);
+ autopick_delayed_alter_aux(item);
/* Scan the pile of objects */
- item = cave[py][px].o_idx;
+ item = cave[p_ptr->y][p_ptr->x].o_idx;
while (item)
{
- int next = o_list[item].next_o_idx;
- delayed_auto_destroy_aux(-item);
+ OBJECT_IDX next = o_list[item].next_o_idx;
+ autopick_delayed_alter_aux(-item);
item = next;
}
}
/*
+ * Auto-inscription and/or destroy
+ *
+ * Auto-destroyer works only on inventory or on floor stack only when
+ * requested.
+ */
+void autopick_alter_item(INVENTORY_IDX item, bool destroy)
+{
+ object_type *o_ptr;
+ int idx;
+
+ /* Get the item (in the pack) */
+ if (item >= 0) o_ptr = &inventory[item];
+
+ /* Get the item (on the floor) */
+ else o_ptr = &o_list[0 - item];
+
+ /* Get the index in the auto-pick/destroy list */
+ idx = is_autopick(o_ptr);
+
+ /* Do auto-inscription */
+ auto_inscribe_item(o_ptr, idx);
+
+ /* Do auto-destroy if needed */
+ if (destroy && item <= INVEN_PACK)
+ auto_destroy_item(o_ptr, idx);
+}
+
+
+/*
* Automatically pickup/destroy items in this grid.
*/
-void auto_pickup_items(cave_type *c_ptr)
+void autopick_pickup_items(cave_type *c_ptr)
{
- s16b this_o_idx, next_o_idx = 0;
+ OBJECT_IDX this_o_idx, next_o_idx = 0;
/* Scan the pile of objects */
for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
{
int idx;
-
- /* Acquire object */
- object_type *o_ptr = &o_list[this_o_idx];
+ object_type *o_ptr = &o_list[this_o_idx];
/* Acquire next object */
next_o_idx = o_ptr->next_o_idx;
idx = is_autopick(o_ptr);
/* Item index for floor -1,-2,-3,... */
- auto_inscribe_item((-this_o_idx), idx);
+ auto_inscribe_item(o_ptr, idx);
if (idx >= 0 &&
(autopick_list[idx].action & (DO_AUTOPICK | DO_QUERY_AUTOPICK)))
{
- disturb(0,0);
+ disturb(FALSE, FALSE);
if (!inven_carry_okay(o_ptr))
{
char o_name[MAX_NLEN];
- /* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
- /* Message */
-#ifdef JP
- msg_format("¥¶¥Ã¥¯¤Ë¤Ï%s¤òÆþ¤ì¤ë·ä´Ö¤¬¤Ê¤¤¡£", o_name);
-#else
- msg_format("You have no room for %s.", o_name);
-#endif
+ msg_format(_("ザックには%sを入れる隙間がない。", "You have no room for %s."), o_name);
/* Hack - remember that the item has given a message here. */
o_ptr->marked |= OM_NOMSG;
continue;
}
- /* Describe the object */
- object_desc(o_name, o_ptr, TRUE, 3);
+ object_desc(o_name, o_ptr, 0);
-#ifdef JP
- sprintf(out_val, "%s¤ò½¦¤¤¤Þ¤¹¤«? ", o_name);
-#else
- sprintf(out_val, "Pick up %s? ", o_name);
-#endif
+ sprintf(out_val, _("%sを拾いますか? ", "Pick up %s? "), o_name);
if (!get_check(out_val))
{
}
py_pickup_aux(this_o_idx);
-
- continue;
}
/*
*/
else
{
- if (auto_destroy_item((-this_o_idx), idx))
- continue;
+ auto_destroy_item(o_ptr, idx);
}
- }
-}
-
-
-#define PT_DEFAULT 0
-#define PT_WITH_PNAME 1
-
-/*
- * Get file name for autopick preference
- */
-static cptr pickpref_filename(int filename_mode)
-{
-#ifdef JP
- static const char namebase[] = "picktype";
-#else
- static const char namebase[] = "pickpref";
-#endif
-
- switch (filename_mode)
- {
- case PT_DEFAULT:
- return format("%s.prf", namebase);
-
- case PT_WITH_PNAME:
- return format("%s-%s.prf", namebase, player_name);
-
- default:
- return NULL;
- }
+ } /* for () */
}
{
/* Close the preference file */
fclose(pref_fff);
-
-#ifdef JP
- msg_format("°ì»þ¥Õ¥¡¥¤¥ë %s ¤òºîÀ®¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£", tmp_file);
-#else
- msg_format("Failed to create temporary file %s.", tmp_file);
-#endif
+ msg_format(_("一時ファイル %s を作成できませんでした。", "Failed to create temporary file %s."), tmp_file);
msg_print(NULL);
return FALSE;
}
if (num)
{
-#ifdef JP
- msg_format("°ÊÁ°¤Î¥¥ã¥é¥¯¥¿¡¼ÍѤμ«Æ°ÀßÄê(%d¹Ô)¤¬»Ä¤Ã¤Æ¤¤¤Þ¤¹¡£", num);
- strcpy(buf, "¸Å¤¤ÀßÄê¹Ô¤Ïºï½ü¤·¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡©");
-#else
- msg_format("Auto registered lines (%d lines) for previous character are remaining.", num);
- strcpy(buf, "These lines will be deleted. Are you sure? ");
-#endif
+ msg_format(_("以前のキャラクター用の自動設定(%d行)が残っています。",
+ "Auto registered lines (%d lines) for previous character are remaining."), num);
+ strcpy(buf, _("古い設定行は削除します。よろしいですか？", "These lines will be deleted. Are you sure? "));
/* You can cancel it */
if (!get_check(buf))
okay = FALSE;
autoregister = FALSE;
-#ifdef JP
- msg_print("¥¨¥Ç¥£¥¿¤Î¥«¥Ã¥È&¥Ú¡¼¥¹¥ÈÅù¤ò»È¤Ã¤ÆɬÍפʹԤòÈòÆñ¤·¤Æ¤¯¤À¤µ¤¤¡£");
-#else
- msg_print("Use cut & paste of auto picker editor (_) to keep old prefs.");
-#endif
+ msg_print(_("エディタのカット&ペースト等を使って必要な行を避難してください。",
+ "Use cut & paste of auto picker editor (_) to keep old prefs."));
}
}
/*
* Automatically register an auto-destroy preference line
*/
-bool add_auto_register(object_type *o_ptr)
+bool autopick_autoregister(object_type *o_ptr)
{
char buf[1024];
char pref_file[1024];
cptr what;
byte act = autopick_list[match_autopick].action;
-#ifdef JP
- if (act & DO_AUTOPICK) what = "¼«Æ°¤Ç½¦¤¦";
- else if (act & DO_AUTODESTROY) what = "¼«Æ°Ç˲õ¤¹¤ë";
- else if (act & DONT_AUTOPICK) what = "ÊüÃÖ¤¹¤ë";
- else /* if (act & DO_QUERY_AUTOPICK) */ what = "³Îǧ¤·¤Æ½¦¤¦";
+ if (act & DO_AUTOPICK) what = _("自動で拾う", "auto-pickup");
+ else if (act & DO_AUTODESTROY) what = _("自動破壊する", "auto-destroy");
+ else if (act & DONT_AUTOPICK) what = _("放置する", "leave on floor");
+ else /* if (act & DO_QUERY_AUTOPICK) */ what = _("確認して拾う", "query auto-pickup");
- msg_format("¤½¤Î¥¢¥¤¥Æ¥à¤Ï´û¤Ë%s¤è¤¦¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£", what);
-#else
- if (act & DO_AUTOPICK) what = "auto-pickup";
- else if (act & DO_AUTODESTROY) what = "auto-destroy";
- else if (act & DONT_AUTOPICK) what = "leave on floor";
- else /* if (act & DO_QUERY_AUTOPICK) */ what = "query auto-pickup";
+ msg_format(_("そのアイテムは既に%sように設定されています。", "The object is already registered to %s."), what);
+ return FALSE;
+ }
+
+ /* Known to be an artifact? */
+ if ((object_is_known(o_ptr) && object_is_artifact(o_ptr)) ||
+ ((o_ptr->ident & IDENT_SENSE) &&
+ (o_ptr->feeling == FEEL_TERRIBLE || o_ptr->feeling == FEEL_SPECIAL)))
+ {
+ char o_name[MAX_NLEN];
+
+ /* Describe the object (with {terrible/special}) */
+ object_desc(o_name, o_ptr, 0);
+
+ msg_format(_("%sは破壊不能だ。", "You cannot auto-destroy %s."), o_name);
- msg_format("The object is already registered to %s.", what);
-#endif
-
return FALSE;
}
/* Failure */
if (!pref_fff) {
-#ifdef JP
- msg_format("%s ¤ò³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£", pref_file);
-#else
- msg_format("Failed to open %s.", pref_file);
-#endif
+ msg_format(_("%s を開くことができませんでした。", "Failed to open %s."), pref_file);
msg_print(NULL);
/* Failed */
/* Add the header */
fprintf(pref_fff, "%s\n", autoregister_header);
-#ifdef JP
- fprintf(pref_fff, "%s\n", "# *·Ù¹ð!!* °Ê¹ß¤Î¹Ô¤Ï¼«Æ°ÅÐÏ¿¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£");
- fprintf(pref_fff, "%s\n", "# ¸å¤Ç¼«Æ°Åª¤Ëºï½ü¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢É¬ÍפʹԤϾå¤ÎÊý¤Ø°ÜÆ°¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£");
-#else
- fprintf(pref_fff, "%s\n", "# *Waring!* The lines below will be deleated later.");
- fprintf(pref_fff, "%s\n", "# Keep it by cut & paste if you need these lines for future characters.");
-#endif
+ fprintf(pref_fff, "%s\n", _("# *警告!!* 以降の行は自動登録されたものです。",
+ "# *Waring!* The lines below will be deleated later."));
+ fprintf(pref_fff, "%s\n", _("# 後で自動的に削除されますので、必要な行は上の方へ移動しておいてください。",
+ "# Keep it by cut & paste if you need these lines for future characters."));
/* Now auto register is in-use */
p_ptr->autopick_autoregister = TRUE;
cptr *lines_list;
byte states[MAX_LINES];
- byte dirty_flags;
+ u16b dirty_flags;
int dirty_line;
int filename_mode;
int old_com_id;
/*
* Dirty flag for text editor
*/
-#define DIRTY_ALL 0x01
-#define DIRTY_MODE 0x04
-#define DIRTY_SCREEN 0x08
-#define DIRTY_NOT_FOUND 0x10
-#define DIRTY_NO_SEARCH 0x20
-#define DIRTY_EXPRESSION 0x40
-
+#define DIRTY_ALL 0x0001
+#define DIRTY_MODE 0x0004
+#define DIRTY_SCREEN 0x0008
+#define DIRTY_NOT_FOUND 0x0010
+#define DIRTY_NO_SEARCH 0x0020
+#define DIRTY_EXPRESSION 0x0040
+#define DIRTY_SKIP_INACTIVE 0x0080
+#define DIRTY_INACTIVE 0x0100
/*
* Describe which kind of object is Auto-picked/destroyed
cptr before_str[100], body_str;
int before_n = 0;
- body_str = "¥¢¥¤¥Æ¥à";
+ body_str = "アイテム";
/*** Collecting items ***/
/*** Which can be absorbed into a slot as a bundle ***/
if (IS_FLG(FLG_COLLECTING))
- before_str[before_n++] = "¼ý½¸Ãæ¤Ç´û¤Ë»ý¤Ã¤Æ¤¤¤ë¥¹¥í¥Ã¥È¤Ë¤Þ¤È¤á¤é¤ì¤ë";
+ before_str[before_n++] = "収集中で既に持っているスロットにまとめられる";
+ /*** Unaware items ***/
+ if (IS_FLG(FLG_UNAWARE))
+ before_str[before_n++] = "未鑑定でその効果も判明していない";
+
/*** Unidentified ***/
if (IS_FLG(FLG_UNIDENTIFIED))
- before_str[before_n++] = "̤´ÕÄê¤Î";
+ before_str[before_n++] = "未鑑定の";
/*** Identified ***/
if (IS_FLG(FLG_IDENTIFIED))
- before_str[before_n++] = "´ÕÄêºÑ¤ß¤Î";
+ before_str[before_n++] = "鑑定済みの";
/*** *Identified* ***/
if (IS_FLG(FLG_STAR_IDENTIFIED))
- before_str[before_n++] = "´°Á´¤Ë´ÕÄêºÑ¤ß¤Î";
+ before_str[before_n++] = "完全に鑑定済みの";
/*** Dice boosted (weapon of slaying) ***/
if (IS_FLG(FLG_BOOSTED))
{
- before_str[before_n++] = "¥À¥á¡¼¥¸¥À¥¤¥¹¤¬Ä̾ï¤è¤êÂ礤¤";
- body_str = "Éð´ï";
+ before_str[before_n++] = "ダメージダイスが通常より大きい";
+ body_str = "武器";
}
/*** Weapons whose dd*ds is more than nn ***/
- if (IS_FLG(FLG_MORE_THAN))
+ if (IS_FLG(FLG_MORE_DICE))
{
static char more_than_desc_str[] = "___";
- before_str[before_n++] = "¥À¥á¡¼¥¸¥À¥¤¥¹¤ÎºÇÂçÃͤ¬";
- body_str = "Éð´ï";
+ before_str[before_n++] = "ダメージダイスの最大値が";
+ body_str = "武器";
sprintf(more_than_desc_str,"%d", entry->dice);
before_str[before_n++] = more_than_desc_str;
- before_str[before_n++] = "°Ê¾å¤Î";
+ before_str[before_n++] = "以上の";
}
/*** Items whose magical bonus is more than nn ***/
if (IS_FLG(FLG_MORE_BONUS))
{
static char more_bonus_desc_str[] = "___";
- before_str[before_n++] = "½¤ÀµÃͤ¬(+";
+ before_str[before_n++] = "修正値が(+";
sprintf(more_bonus_desc_str,"%d", entry->bonus);
before_str[before_n++] = more_bonus_desc_str;
- before_str[before_n++] = ")°Ê¾å¤Î";
+ before_str[before_n++] = ")以上の";
}
/*** Worthless items ***/
if (IS_FLG(FLG_WORTHLESS))
- before_str[before_n++] = "Ź¤Ç̵²ÁÃͤÈȽÄꤵ¤ì¤ë";
+ before_str[before_n++] = "店で無価値と判定される";
/*** Artifact ***/
if (IS_FLG(FLG_ARTIFACT))
{
- before_str[before_n++] = "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Î";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "アーティファクトの";
+ body_str = "装備";
+ }
+
+ /*** Ego ***/
+ if (IS_FLG(FLG_EGO))
+ {
+ before_str[before_n++] = "エゴアイテムの";
+ body_str = "装備";
+ }
+
+ /*** Good ***/
+ if (IS_FLG(FLG_GOOD))
+ {
+ before_str[before_n++] = "上質の";
+ body_str = "装備";
+ }
+
+ /*** Nameless ***/
+ if (IS_FLG(FLG_NAMELESS))
+ {
+ before_str[before_n++] = "エゴでもアーティファクトでもない";
+ body_str = "装備";
}
- /*** Ego ***/
- if (IS_FLG(FLG_EGO))
+ /*** Average ***/
+ if (IS_FLG(FLG_AVERAGE))
{
- before_str[before_n++] = "¥¨¥´¥¢¥¤¥Æ¥à¤Î";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "並の";
+ body_str = "装備";
}
- /*** Nameless ***/
- if (IS_FLG(FLG_NAMELESS))
+ /*** Rare equipments ***/
+ if (IS_FLG(FLG_RARE))
{
- before_str[before_n++] = "¥¨¥´¤Ç¤â¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È¤Ç¤â¤Ê¤¤";
- body_str = "ÁõÈ÷";
+ before_str[before_n++] = "ドラゴン装備やカオス・ブレード等を含む珍しい";
+ body_str = "装備";
}
- /*** Unaware items ***/
- if (IS_FLG(FLG_UNAWARE))
- before_str[before_n++] = "̤´ÕÄê¤Ç¤½¤Î¸ú²Ì¤âȽÌÀ¤·¤Æ¤¤¤Ê¤¤";
+ /*** Common equipments ***/
+ if (IS_FLG(FLG_COMMON))
+ {
+ before_str[before_n++] = "ありふれた(ドラゴン装備やカオス・ブレード等の珍しい物ではない)";
+ body_str = "装備";
+ }
/*** Wanted monster's corpse/skeletons ***/
if (IS_FLG(FLG_WANTED))
{
- before_str[before_n++] = "¥Ï¥ó¥¿¡¼»ö̳½ê¤Ç¾Þ¶â¼ó¤È¤µ¤ì¤Æ¤¤¤ë";
- body_str = "»àÂΤä¹ü";
+ before_str[before_n++] = "ハンター事務所で賞金首とされている";
+ body_str = "死体や骨";
}
/*** Human corpse/skeletons (for Daemon magic) ***/
if (IS_FLG(FLG_HUMAN))
{
- before_str[before_n++] = "°ËâËâË¡¤Ç»È¤¦¤¿¤á¤Î¿Í´Ö¤ä¥Ò¥å¡¼¥Þ¥Î¥¤¥É¤Î";
- body_str = "»àÂΤä¹ü";
+ before_str[before_n++] = "悪魔魔法で使うための人間やヒューマノイドの";
+ body_str = "死体や骨";
}
/*** Unique monster's corpse/skeletons/statues ***/
if (IS_FLG(FLG_UNIQUE))
{
- before_str[before_n++] = "¥æ¥Ë¡¼¥¯¥â¥ó¥¹¥¿¡¼¤Î";
- body_str = "»àÂΤä¹ü";
+ before_str[before_n++] = "ユニークモンスターの";
+ body_str = "死体や骨";
}
/*** Unreadable spellbooks ***/
if (IS_FLG(FLG_UNREADABLE))
{
- before_str[before_n++] = "¤¢¤Ê¤¿¤¬Æɤá¤Ê¤¤Îΰè¤Î";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "あなたが読めない領域の";
+ body_str = "魔法書";
}
/*** First realm spellbooks ***/
if (IS_FLG(FLG_REALM1))
{
- before_str[before_n++] = "Âè°ìÎΰè¤Î";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "第一領域の";
+ body_str = "魔法書";
}
/*** Second realm spellbooks ***/
if (IS_FLG(FLG_REALM2))
{
- before_str[before_n++] = "ÂèÆóÎΰè¤Î";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "第二領域の";
+ body_str = "魔法書";
}
/*** First rank spellbooks ***/
if (IS_FLG(FLG_FIRST))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î1ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の1冊目の";
+ body_str = "魔法書";
}
/*** Second rank spellbooks ***/
if (IS_FLG(FLG_SECOND))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î2ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の2冊目の";
+ body_str = "魔法書";
}
/*** Third rank spellbooks ***/
if (IS_FLG(FLG_THIRD))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î3ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の3冊目の";
+ body_str = "魔法書";
}
/*** Fourth rank spellbooks ***/
if (IS_FLG(FLG_FOURTH))
{
- before_str[before_n++] = "Á´4ºý¤ÎÆâ¤Î4ºýÌܤÎ";
- body_str = "ËâË¡½ñ";
+ before_str[before_n++] = "全4冊の内の4冊目の";
+ body_str = "魔法書";
}
/*** Items ***/
if (IS_FLG(FLG_ITEMS))
; /* Nothing to do */
else if (IS_FLG(FLG_WEAPONS))
- body_str = "Éð´ï";
+ body_str = "武器";
+ else if (IS_FLG(FLG_FAVORITE_WEAPONS))
+ body_str = "得意武器";
else if (IS_FLG(FLG_ARMORS))
- body_str = "Ëɶñ";
+ body_str = "防具";
else if (IS_FLG(FLG_MISSILES))
- body_str = "ÃƤäÌð¤ä¥¯¥í¥¹¥Ü¥¦¤ÎÌð";
+ body_str = "弾や矢やクロスボウの矢";
else if (IS_FLG(FLG_DEVICES))
- body_str = "´¬Êª¤äËâË¡ËÀ¤ä¾ó¤ä¥í¥Ã¥É";
+ body_str = "巻物や魔法棒や杖やロッド";
else if (IS_FLG(FLG_LIGHTS))
- body_str = "¸÷¸»ÍѤΥ¢¥¤¥Æ¥à";
+ body_str = "光源用のアイテム";
else if (IS_FLG(FLG_JUNKS))
- body_str = "Àޤ줿ËÀÅù¤Î¥¬¥é¥¯¥¿";
+ body_str = "折れた棒等のガラクタ";
+ else if (IS_FLG(FLG_CORPSES))
+ body_str = "死体や骨";
else if (IS_FLG(FLG_SPELLBOOKS))
- body_str = "ËâË¡½ñ";
+ body_str = "魔法書";
else if (IS_FLG(FLG_HAFTED))
- body_str = "Æß´ï";
+ body_str = "鈍器";
else if (IS_FLG(FLG_SHIELDS))
- body_str = "½â";
+ body_str = "盾";
else if (IS_FLG(FLG_BOWS))
- body_str = "¥¹¥ê¥ó¥°¤äµÝ¤ä¥¯¥í¥¹¥Ü¥¦";
+ body_str = "ã\82¹ã\83ªã\83³ã\82°ã\82\84å¼\93ã\82\84ã\82¯ã\83ã\82¹ã\83\9cã\82¦";
else if (IS_FLG(FLG_RINGS))
- body_str = "»ØÎØ";
+ body_str = "指輪";
else if (IS_FLG(FLG_AMULETS))
- body_str = "¥¢¥ß¥å¥ì¥Ã¥È";
+ body_str = "アミュレット";
else if (IS_FLG(FLG_SUITS))
- body_str = "³»";
+ body_str = "鎧";
else if (IS_FLG(FLG_CLOAKS))
- body_str = "¥¯¥í¡¼¥¯";
+ body_str = "ã\82¯ã\83ã\83¼ã\82¯";
else if (IS_FLG(FLG_HELMS))
- body_str = "¥Ø¥ë¥á¥Ã¥È¤ä´§";
+ body_str = "ヘルメットや冠";
else if (IS_FLG(FLG_GLOVES))
- body_str = "äƼê";
+ body_str = "籠手";
else if (IS_FLG(FLG_BOOTS))
- body_str = "¥Ö¡¼¥Ä";
- else if (IS_FLG(FLG_FAVORITE))
- body_str = "ÆÀ°ÕÉð´ï";
+ body_str = "ブーツ";
*buff = '\0';
if (!before_n)
- strcat(buff, "Á´¤Æ¤Î");
+ strcat(buff, "全ての");
else for (i = 0; i < before_n && before_str[i]; i++)
strcat(buff, before_str[i]);
top = TRUE;
}
- strcat(buff, "¤Ç¡¢Ì¾Á°¤¬¡Ö");
+ strcat(buff, "で、名前が「");
strncat(buff, str, 80);
if (top)
- strcat(buff, "¡×¤Ç»Ï¤Þ¤ë¤â¤Î");
+ strcat(buff, "」で始まるもの");
else
- strcat(buff, "¡×¤ò´Þ¤à¤â¤Î");
+ strcat(buff, "」を含むもの");
}
if (insc)
{
- strncat(buff, format("¤Ë¡Ö%s¡×", insc), 80);
+ strncat(buff, format("に「%s」", insc), 80);
- if (strstr(insc, "%%all"))
- strcat(buff, "(%%all¤ÏÁ´Ç½ÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
- else if (strstr(insc, "%all"))
- strcat(buff, "(%all¤ÏÁ´Ç½ÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
- else if (strstr(insc, "%%"))
- strcat(buff, "(%%¤ÏÄɲÃǽÎϤòɽ¤¹±Ñ»ú¤Îµ¹æ¤ÇÃÖ´¹)");
- else if (strstr(insc, "%"))
- strcat(buff, "(%¤ÏÄɲÃǽÎϤòɽ¤¹µ¹æ¤ÇÃÖ´¹)");
+ if (my_strstr(insc, "%%all"))
+ strcat(buff, "(%%allは全能力を表す英字の記号で置換)");
+ else if (my_strstr(insc, "%all"))
+ strcat(buff, "(%allは全能力を表す記号で置換)");
+ else if (my_strstr(insc, "%%"))
+ strcat(buff, "(%%は追加能力を表す英字の記号で置換)");
+ else if (my_strstr(insc, "%"))
+ strcat(buff, "(%は追加能力を表す記号で置換)");
- strcat(buff, "¤È¹ï¤ó¤Ç");
+ strcat(buff, "と刻んで");
}
else
- strcat(buff, "¤ò");
+ strcat(buff, "を");
if (act & DONT_AUTOPICK)
- strcat(buff, "ÊüÃÖ¤¹¤ë¡£");
+ strcat(buff, "放置する。");
else if (act & DO_AUTODESTROY)
- strcat(buff, "Ç˲õ¤¹¤ë¡£");
+ strcat(buff, "破壊する。");
else if (act & DO_QUERY_AUTOPICK)
- strcat(buff, "³Îǧ¤Î¸å¤Ë½¦¤¦¡£");
+ strcat(buff, "確認の後に拾う。");
else
- strcat(buff, "½¦¤¦¡£");
+ strcat(buff, "拾う。");
if (act & DO_DISPLAY)
{
if (act & DONT_AUTOPICK)
- strcat(buff, "Á´ÂΥޥå×('M')¤Ç'N'¤ò²¡¤·¤¿¤È¤¤Ëɽ¼¨¤¹¤ë¡£");
+ strcat(buff, "全体マップ('M')で'N'を押したときに表示する。");
else if (act & DO_AUTODESTROY)
- strcat(buff, "Á´ÂΥޥå×('M')¤Ç'K'¤ò²¡¤·¤¿¤È¤¤Ëɽ¼¨¤¹¤ë¡£");
+ strcat(buff, "全体マップ('M')で'K'を押したときに表示する。");
else
- strcat(buff, "Á´ÂΥޥå×('M')¤Ç'M'¤ò²¡¤·¤¿¤È¤¤Ëɽ¼¨¤¹¤ë¡£");
+ strcat(buff, "全体マップ('M')で'M'を押したときに表示する。");
}
else
- strcat(buff, "Á´ÂΥޥåפˤÏɽ¼¨¤·¤Ê¤¤¡£");
+ strcat(buff, "全体マップには表示しない。");
#else /* JP */
if (IS_FLG(FLG_COLLECTING))
which_str[which_n++] = "can be absorbed into an existing inventory slot";
+ /*** Unaware items ***/
+ if (IS_FLG(FLG_UNAWARE))
+ {
+ before_str[before_n++] = "unidentified";
+ whose_str[whose_n++] = "basic abilities are not known";
+ }
+
/*** Unidentified ***/
if (IS_FLG(FLG_UNIDENTIFIED))
before_str[before_n++] = "unidentified";
if (IS_FLG(FLG_STAR_IDENTIFIED))
before_str[before_n++] = "fully identified";
+ /*** Rare equipments ***/
+ if (IS_FLG(FLG_RARE))
+ {
+ before_str[before_n++] = "very rare";
+ body_str = "equipments";
+ after_str[after_n++] = "such like Dragon armors, Blades of Chaos, etc.";
+ }
+
+ /*** Common equipments ***/
+ if (IS_FLG(FLG_COMMON))
+ {
+ before_str[before_n++] = "relatively common";
+ body_str = "equipments";
+ after_str[after_n++] = "compared to very rare Dragon armors, Blades of Chaos, etc.";
+ }
+
/*** Worthless items ***/
if (IS_FLG(FLG_WORTHLESS))
{
before_str[before_n++] = "ego";
}
+ /*** Good ***/
+ if (IS_FLG(FLG_GOOD))
+ {
+ body_str = "equipment";
+ which_str[which_n++] = "have good quality";
+ }
+
/*** Nameless ***/
if (IS_FLG(FLG_NAMELESS))
{
which_str[which_n++] = "is neither ego-item nor artifact";
}
- /*** Unaware items ***/
- if (IS_FLG(FLG_UNAWARE))
+ /*** Average ***/
+ if (IS_FLG(FLG_AVERAGE))
{
- before_str[before_n++] = "unidentified";
- whose_str[whose_n++] = "basic abilities are not known";
+ body_str = "equipment";
+ which_str[which_n++] = "have average quality";
}
/*** Dice boosted (weapon of slaying) ***/
}
/*** Weapons whose dd*ds is more than nn ***/
- if (IS_FLG(FLG_MORE_THAN))
+ if (IS_FLG(FLG_MORE_DICE))
{
static char more_than_desc_str[] =
"maximum damage from dice is bigger than __";
; /* Nothing to do */
else if (IS_FLG(FLG_WEAPONS))
body_str = "weapons";
+ else if (IS_FLG(FLG_FAVORITE_WEAPONS))
+ body_str = "favorite weapons";
else if (IS_FLG(FLG_ARMORS))
body_str = "armors";
else if (IS_FLG(FLG_MISSILES))
body_str = "light sources";
else if (IS_FLG(FLG_JUNKS))
body_str = "junk such as broken sticks";
+ else if (IS_FLG(FLG_CORPSES))
+ body_str = "corpses or skeletons";
else if (IS_FLG(FLG_SPELLBOOKS))
body_str = "spellbooks";
else if (IS_FLG(FLG_HAFTED))
body_str = "gloves";
else if (IS_FLG(FLG_BOOTS))
body_str = "boots";
- else if (IS_FLG(FLG_FAVORITE))
- body_str = "favorite weapons";
/* Prepare a string for item name */
if (*str)
{
strncat(buff, format("and inscribe \"%s\"", insc), 80);
- if (strstr(insc, "%all"))
+ if (my_strstr(insc, "%all"))
strcat(buff, ", replacing %all with code string representing all abilities,");
- else if (strstr(insc, "%"))
+ else if (my_strstr(insc, "%"))
strcat(buff, ", replacing % with code string representing extra random abilities,");
strcat(buff, " on ");
/*
* Read whole lines of a file to memory
*/
-static cptr *read_text_lines(cptr filename, bool user)
+static cptr *read_text_lines(cptr filename)
{
cptr *lines_list = NULL;
FILE *fff;
int lines = 0;
char buf[1024];
- if (user)
- {
- path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename);
- }
- else
- {
- path_build(buf, sizeof(buf), ANGBAND_DIR_PREF, filename);
- }
+ path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename);
/* Open the file */
fff = my_fopen(buf, "r");
}
+/*
+ * Copy the default autopick file to the user directory
+ */
+static void prepare_default_pickpref(void)
+{
+ const cptr messages[] = {
+ _("あなたは「自動拾いエディタ」を初めて起動しました。", "You have activated the Auto-Picker Editor for the first time."),
+ _("自動拾いのユーザー設定ファイルがまだ書かれていないので、", "Since user pref file for autopick is not yet created,"),
+ _("基本的な自動拾い設定ファイルをlib/pref/picktype.prfからコピーします。", "the default setting is loaded from lib/pref/pickpref.prf ."),
+ NULL
+ };
+
+ char buf[1024];
+ FILE *pref_fp;
+ FILE *user_fp;
+ int i;
+ cptr filename = pickpref_filename(PT_DEFAULT);
+
+ /* Display messages */
+ for (i = 0; messages[i]; i++) msg_print(messages[i]);
+ msg_print(NULL);
+
+
+ /* Open new file */
+ path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename);
+ user_fp = my_fopen(buf, "w");
+
+ /* Failed */
+ if (!user_fp) return;
+
+ /* Write header messages for a notification */
+ fprintf(user_fp, "#***\n");
+ for (i = 0; messages[i]; i++)
+ {
+ fprintf(user_fp, "#*** %s\n", messages[i]);
+ }
+ fprintf(user_fp, "#***\n\n\n");
+
+
+ /* Open the default file */
+ path_build(buf, sizeof(buf), ANGBAND_DIR_PREF, filename);
+ pref_fp = my_fopen(buf, "r");
+
+ /* Failed */
+ if (!pref_fp)
+ {
+ my_fclose(user_fp);
+ return;
+ }
+
+ /* Copy the contents of default file */
+ while (!my_fgets(pref_fp, buf, sizeof(buf)))
+ fprintf(user_fp, "%s\n", buf);
+
+ my_fclose(user_fp);
+ my_fclose(pref_fp);
+}
+
+/*
+ * Read an autopick prefence file to memory
+ * Prepare default if no user file is found
+ */
static cptr *read_pickpref_text_lines(int *filename_mode_p)
{
char buf[1024];
cptr *lines_list;
+ /* Try a filename with player name */
*filename_mode_p = PT_WITH_PNAME;
strcpy(buf, pickpref_filename(*filename_mode_p));
- lines_list = read_text_lines(buf, TRUE);
+ lines_list = read_text_lines(buf);
if (!lines_list)
{
+ /* Use default name */
*filename_mode_p = PT_DEFAULT;
strcpy(buf, pickpref_filename(*filename_mode_p));
- lines_list = read_text_lines(buf, TRUE);
+ lines_list = read_text_lines(buf);
}
if (!lines_list)
{
- strcpy(buf, pickpref_filename(*filename_mode_p));
- lines_list = read_text_lines(buf, FALSE);
+ /* There is no preference file in the user directory */
+
+ /* Copy the default autopick file to the user directory */
+ prepare_default_pickpref();
+
+ /* Use default name again */
+ lines_list = read_text_lines(buf);
}
if (!lines_list)
string_free(lines_list[lines]);
/* free list of pointers */
- C_FREE((char **)lines_list, MAX_LINES, char *);
+ C_KILL(lines_list, MAX_LINES, cptr);
}
/*
* Delete or insert string
*/
-static void toggle_keyword(text_body_type *tb, int flg)
+static void toggle_keyword(text_body_type *tb, BIT_FLAGS flg)
{
- int by1, by2, bx1, bx2, y;
+ int by1, by2, y;
bool add = TRUE;
bool fixed = FALSE;
- /* Select this line */
- if (!tb->mark)
+ /* Some lines are selected */
+ if (tb->mark)
{
- tb->my = tb->cy;
- tb->mx = 0;
+ by1 = MIN(tb->my, tb->cy);
+ by2 = MAX(tb->my, tb->cy);
}
- if (tb->my < tb->cy)
- {
- by1 = tb->my;
- by2 = tb->cy;
- bx1 = tb->mx;
- bx2 = tb->cx;
- }
- else
+ /* No mark -- Select current line */
+ else /* if (!tb->mark) */
{
- by2 = tb->my;
- by1 = tb->cy;
- bx2 = tb->mx;
- bx1 = tb->cx;
+ by1 = by2 = tb->cy;
}
- /* String on these lines are not really selected */
- if (tb->lines_list[by1][bx1] == '\0' && by1 < tb->cy) by1++;
- if (bx2 == 0 && by1 < by2) by2--;
-
/* Set/Reset flag of each line */
for (y = by1; y <= by2; y++)
}
/* You can use only one flag in artifact/ego/nameless */
- else if (FLG_ARTIFACT <= flg && flg <= FLG_NAMELESS)
+ else if (FLG_ARTIFACT <= flg && flg <= FLG_AVERAGE)
+ {
+ int i;
+ for (i = FLG_ARTIFACT; i <= FLG_AVERAGE; i++)
+ REM_FLG(i);
+ }
+
+ /* You can use only one flag in rare/common */
+ else if (FLG_RARE <= flg && flg <= FLG_COMMON)
{
int i;
- for (i = FLG_ARTIFACT; i <= FLG_NAMELESS; i++)
+ for (i = FLG_RARE; i <= FLG_COMMON; i++)
REM_FLG(i);
}
static void toggle_command_letter(text_body_type *tb, byte flg)
{
autopick_type an_entry, *entry = &an_entry;
- int by1, by2, bx1, bx2, y;
+ int by1, by2, y;
bool add = TRUE;
bool fixed = FALSE;
- /* Select this line */
- if (!tb->mark)
+ /* Some lines are selected */
+ if (tb->mark)
{
- tb->my = tb->cy;
- tb->mx = 0;
+ by1 = MIN(tb->my, tb->cy);
+ by2 = MAX(tb->my, tb->cy);
}
- if (tb->my < tb->cy)
- {
- by1 = tb->my;
- by2 = tb->cy;
- bx1 = tb->mx;
- bx2 = tb->cx;
- }
- else
+ /* No mark -- Select current line */
+ else /* if (!tb->mark) */
{
- by2 = tb->my;
- by1 = tb->cy;
- bx2 = tb->mx;
- bx1 = tb->cx;
+ by1 = by2 = tb->cy;
}
- /* String on these lines are not really selected */
- if (tb->lines_list[by1][bx1] == '\0' && by1 < tb->cy) by1++;
- if (bx2 == 0 && by1 < by2) by2--;
/* Set/Reset flag of each line */
for (y = by1; y <= by2; y++)
/*
* Delete or insert string
*/
-static void add_keyword(text_body_type *tb, int flg)
+static void add_keyword(text_body_type *tb, BIT_FLAGS flg)
{
- int by1, by2, bx1, bx2, y;
+ int by1, by2, y;
- /* Select this line */
- if (!tb->mark)
+ /* Some lines are selected */
+ if (tb->mark)
{
- tb->my = tb->cy;
- tb->mx = 0;
+ by1 = MIN(tb->my, tb->cy);
+ by2 = MAX(tb->my, tb->cy);
}
- if (tb->my < tb->cy)
- {
- by1 = tb->my;
- by2 = tb->cy;
- bx1 = tb->mx;
- bx2 = tb->cx;
- }
- else
+ /* No mark -- Select current line */
+ else /* if (!tb->mark) */
{
- by2 = tb->my;
- by1 = tb->cy;
- bx2 = tb->mx;
- bx1 = tb->cx;
+ by1 = by2 = tb->cy;
}
- /* String on these lines are not really selected */
- if (tb->lines_list[by1][bx1] == '\0' && by1 < tb->cy) by1++;
- if (bx2 == 0 && by1 < by2) by2--;
/* Set/Reset flag of each line */
for (y = by1; y <= by2; y++)
/*
+ * Add an empty line at the last of the file
+ */
+static bool add_empty_line(text_body_type *tb)
+{
+ int k;
+
+ for (k = 0; tb->lines_list[k]; k++)
+ /* count number of lines */ ;
+
+ /* Too many lines! */
+ if (k >= MAX_LINES - 2) return FALSE;
+
+ /* The last line is already empty */
+ if (!tb->lines_list[k-1][0]) return FALSE;
+
+ /* Create new empty line */
+ tb->lines_list[k] = string_make("");
+
+ /* Expressions need re-evaluation */
+ tb->dirty_flags |= DIRTY_EXPRESSION;
+
+ /* Text is changed */
+ tb->changed = TRUE;
+
+ /* A line is added */
+ return TRUE;
+}
+
+
+/*
* Insert return code and split the line
*/
static bool insert_return_code(text_body_type *tb)
*/
static object_type *choose_object(cptr q, cptr s)
{
- int item;
+ OBJECT_IDX item;
if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR | USE_EQUIP))) return NULL;
object_type *o_ptr;
cptr q, s;
- /* Get an item */
#ifdef JP
- q = "¤É¤Î¥¢¥¤¥Æ¥à¤òÅÐÏ¿¤·¤Þ¤¹¤«? ";
- s = "¥¢¥¤¥Æ¥à¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£";
+ q = "どのアイテムを登録しますか? ";
+ s = "アイテムを持っていない。";
#else
q = "Enter which item? ";
s = "You have nothing to enter.";
object_type *o_ptr;
cptr q, s;
- /* Get an item */
#ifdef JP
- q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò¸¡º÷¤·¤Þ¤¹¤«? ";
- s = "¥¢¥¤¥Æ¥à¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¡£";
+ q = "どのアイテムを検索しますか? ";
+ s = "アイテムを持っていない。";
#else
q = "Enter which item? ";
s = "You have nothing to enter.";
*o_handle = o_ptr;
string_free(*search_strp);
- object_desc(buf, *o_handle, FALSE, 3);
+ object_desc(buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
*search_strp = string_make(format("<%s>", buf));
return 1;
}
*o_handle = &autopick_last_destroyed_object;
string_free(*search_strp);
- object_desc(buf, *o_handle, FALSE, 3);
+ object_desc(buf, *o_handle, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
*search_strp = string_make(format("<%s>", buf));
return 1;
}
*/
byte color = TERM_YELLOW;
char buf[MAX_NLEN+20];
- const size_t len = 80;
+ const int len = 80;
-#ifdef JP
- char prompt[] = "¸¡º÷(^I:»ý¤Áʪ ^L:Ç˲õ¤µ¤ì¤¿Êª): ";
-#else
- char prompt[] = "Search key(^I:inven ^L:destroyed): ";
-#endif
+ char prompt[] = _("検索(^I:持ち物 ^L:破壊された物): ", "Search key(^I:inven ^L:destroyed): ");
int col = sizeof(prompt) - 1;
+ /* Prepare string buffer for edit */
if (*search_strp) strcpy(buf, *search_strp);
else buf[0] = '\0';
+ /* Object searching mode */
+ if (*o_handle)
+ {
+ color = TERM_L_GREEN;
+ }
+
/* Display prompt */
prt(prompt, 0, 0);
Term_gotoxy(col + pos, 0);
/* Get a special key code */
- skey = inkey_special();
+ skey = inkey_special(TRUE);
/* Analyze the key */
switch (skey)
/* Now on insert mode */
color = TERM_WHITE;
- /* No move at biggining of line */
+ /* No move at beginning of line */
if (0 == pos) break;
while (TRUE)
int next_pos = i + 1;
#ifdef JP
- if (iskanji(buf[next_pos])) next_pos++;
+ if (iskanji(buf[i])) next_pos++;
#endif
/* Is there the cursor at next position? */
case '\n':
case '\r':
case KTRL('s'):
- if (!pos && *o_handle) return (back ? -1 : 1);
+ if (*o_handle) return (back ? -1 : 1);
string_free(*search_strp);
*search_strp = string_make(buf);
*o_handle = NULL;
return (back ? -1 : 1);
case KTRL('i'):
- /* Get an item */
return get_object_for_search(o_handle, search_strp);
case KTRL('l'):
/* Now on insert mode */
color = TERM_WHITE;
- /* No move at biggining of line */
+ /* No move at beginning of line */
if (0 == pos) break;
while (TRUE)
/* Now on insert mode */
color = TERM_WHITE;
+ /* No move at end of line */
+ if ('\0' == buf[pos]) break;
+
/* Position of next character */
src = pos + 1;
/* Get a character code */
c = (char)skey;
- if (color == TERM_YELLOW)
+ /* Was non insert mode? */
+ if (color != TERM_WHITE)
{
+ /* Was object searching mode */
+ if (color == TERM_L_GREEN)
+ {
+ /* Cancel the mode */
+ *o_handle = NULL;
+
+ /* Remove indicating string */
+ string_free(*search_strp);
+ *search_strp = NULL;
+ }
+
/* Overwrite default string */
buf[0] = '\0';
}
+ /* Object searching mode was cancelled? */
+ if (*o_handle && color != TERM_L_GREEN)
+ {
+ /* Cancel the mode */
+ *o_handle = NULL;
+
+ /* Remove indicating string */
+ buf[0] = '\0';
+ string_free(*search_strp);
+ *search_strp = NULL;
+
+ }
+
+
} /* while (TRUE) */
}
/*
* Search next line matches for o_ptr
*/
-static bool search_for_object(text_body_type *tb, object_type *o_ptr, bool forward)
+static void search_for_object(text_body_type *tb, object_type *o_ptr, bool forward)
{
- int i;
autopick_type an_entry, *entry = &an_entry;
char o_name[MAX_NLEN];
+ int bypassed_cy = -1;
- object_desc(o_name, o_ptr, FALSE, 3);
+ /* Start searching from current cursor position */
+ int i = tb->cy;
- /* Force to be lower case string */
- for (i = 0; o_name[i]; i++)
- {
-#ifdef JP
- if (iskanji(o_name[i]))
- i++;
- else
-#endif
- if (isupper(o_name[i]))
- o_name[i] = tolower(o_name[i]);
- }
-
- i = tb->cy;
+ /* Prepare object name string first */
+ object_desc(o_name, o_ptr, (OD_NO_FLAVOR | OD_OMIT_PREFIX | OD_NO_PLURAL));
- while (1)
+ /* Convert the string to lower case */
+ str_tolower(o_name);
+
+ while (TRUE)
{
+ bool match;
+
+ /* End of list? */
if (forward)
{
if (!tb->lines_list[++i]) break;
if (--i < 0) break;
}
- /* Ignore bypassed lines */
- if (tb->states[i] & LSTAT_BYPASS) continue;
-
+ /* Is this line is a correct entry? */
if (!autopick_new_entry(entry, tb->lines_list[i], FALSE)) continue;
- if (is_autopick_aux(o_ptr, entry, o_name))
+ /* Does this line match to the object? */
+ match = is_autopick_aux(o_ptr, entry, o_name);
+ autopick_free_entry(entry);
+ if (!match) continue;
+
+ /* Found a line but it's inactive */
+ if (tb->states[i] & LSTAT_BYPASS)
+ {
+ /* If it is first found, remember it */
+ if (bypassed_cy == -1) bypassed_cy = i;
+ }
+
+ /* Found an active line! */
+ else
{
+ /* Move to this line */
tb->cx = 0;
tb->cy = i;
- return TRUE;
+
+ if (bypassed_cy != -1)
+ {
+ /* Mark as some lines are skipped */
+ tb->dirty_flags |= DIRTY_SKIP_INACTIVE;
+ }
+
+ /* Found it! */
+ return;
}
}
- return FALSE;
+ if (bypassed_cy != -1)
+ {
+ /* Move to the remembered line */
+ tb->cx = 0;
+ tb->cy = bypassed_cy;
+
+ /* Mark as this line is inactive */
+ tb->dirty_flags |= DIRTY_INACTIVE;
+ }
+
+ else
+ {
+ /* Mark as NOT FOUND */
+ tb->dirty_flags |= DIRTY_NOT_FOUND;
+ }
+
+ return;
}
/*
* Search next line matches to the string
*/
-static bool search_for_string(text_body_type *tb, cptr search_str, bool forward)
+static void search_for_string(text_body_type *tb, cptr search_str, bool forward)
{
+ int bypassed_cy = -1;
+ int bypassed_cx = 0;
+
+ /* Start searching from current cursor position */
int i = tb->cy;
- while (1)
+ while (TRUE)
{
cptr pos;
+ /* End of list? */
if (forward)
{
if (!tb->lines_list[++i]) break;
if (--i < 0) break;
}
- /* Ignore bypassed lines */
- if (tb->states[i] & LSTAT_BYPASS) continue;
+ /* Look for the string pattern */
+ pos = my_strstr(tb->lines_list[i], search_str);
-#ifdef JP
- pos = strstr_j(tb->lines_list[i], search_str);
-#else
- pos = strstr(tb->lines_list[i], search_str);
-#endif
- if (pos)
+ /* Not found! */
+ if (!pos) continue;
+
+ /* Found a line but it's inactive */
+ if ((tb->states[i] & LSTAT_BYPASS) &&
+ !(tb->states[i] & LSTAT_EXPRESSION))
+ {
+ /* If it is first found, remember it */
+ if (bypassed_cy == -1)
+ {
+ bypassed_cy = i;
+ bypassed_cx = (int)(pos - tb->lines_list[i]);
+ }
+ }
+
+ /* Found an active line! */
+ else
{
+ /* Move to this location */
tb->cx = (int)(pos - tb->lines_list[i]);
tb->cy = i;
- return TRUE;
+
+ if (bypassed_cy != -1)
+ {
+ /* Mark as some lines are skipped */
+ tb->dirty_flags |= DIRTY_SKIP_INACTIVE;
+ }
+
+ /* Found it! */
+ return;
}
}
- return FALSE;
+ if (bypassed_cy != -1)
+ {
+ /* Move to the remembered line */
+ tb->cx = bypassed_cx;
+ tb->cy = bypassed_cy;
+
+ /* Mark as this line is inactive */
+ tb->dirty_flags |= DIRTY_INACTIVE;
+ }
+
+ else
+ {
+ /* Mark as NOT FOUND */
+ tb->dirty_flags |= DIRTY_NOT_FOUND;
+ }
+
+ return;
}
/*
* Editor command id's
*/
-#define EC_QUIT 1
-#define EC_SAVEQUIT 2
-#define EC_REVERT 3
-#define EC_HELP 4
-#define EC_RETURN 5
+#define EC_QUIT 1
+#define EC_SAVEQUIT 2
+#define EC_REVERT 3
+#define EC_HELP 4
+#define EC_RETURN 5
#define EC_LEFT 6
#define EC_DOWN 7
#define EC_UP 8
#define EC_IK_IDENTIFIED 41
#define EC_IK_STAR_IDENTIFIED 42
#define EC_OK_BOOSTED 43
-#define EC_OK_MORE_THAN 44
+#define EC_OK_MORE_DICE 44
#define EC_OK_MORE_BONUS 45
#define EC_OK_WORTHLESS 46
#define EC_OK_ARTIFACT 47
#define EC_OK_EGO 48
-#define EC_OK_NAMELESS 49
-#define EC_OK_WANTED 50
-#define EC_OK_UNIQUE 51
-#define EC_OK_HUMAN 52
-#define EC_OK_UNREADABLE 53
-#define EC_OK_REALM1 54
-#define EC_OK_REALM2 55
-#define EC_OK_FIRST 56
-#define EC_OK_SECOND 57
-#define EC_OK_THIRD 58
-#define EC_OK_FOURTH 59
-#define EC_KK_WEAPONS 60
-#define EC_KK_FAVORITE 61
-#define EC_KK_ARMORS 62
-#define EC_KK_MISSILES 63
-#define EC_KK_DEVICES 64
-#define EC_KK_LIGHTS 65
-#define EC_KK_JUNKS 66
-#define EC_KK_SPELLBOOKS 67
-#define EC_KK_SHIELDS 68
-#define EC_KK_BOWS 69
-#define EC_KK_RINGS 70
-#define EC_KK_AMULETS 71
-#define EC_KK_SUITS 72
-#define EC_KK_CLOAKS 73
-#define EC_KK_HELMS 74
-#define EC_KK_GLOVES 75
-#define EC_KK_BOOTS 76
+#define EC_OK_GOOD 49
+#define EC_OK_NAMELESS 50
+#define EC_OK_AVERAGE 51
+#define EC_OK_RARE 52
+#define EC_OK_COMMON 53
+#define EC_OK_WANTED 54
+#define EC_OK_UNIQUE 55
+#define EC_OK_HUMAN 56
+#define EC_OK_UNREADABLE 57
+#define EC_OK_REALM1 58
+#define EC_OK_REALM2 59
+#define EC_OK_FIRST 60
+#define EC_OK_SECOND 61
+#define EC_OK_THIRD 62
+#define EC_OK_FOURTH 63
+#define EC_KK_WEAPONS 64
+#define EC_KK_FAVORITE_WEAPONS 65
+#define EC_KK_ARMORS 66
+#define EC_KK_MISSILES 67
+#define EC_KK_DEVICES 68
+#define EC_KK_LIGHTS 69
+#define EC_KK_JUNKS 70
+#define EC_KK_CORPSES 71
+#define EC_KK_SPELLBOOKS 72
+#define EC_KK_SHIELDS 73
+#define EC_KK_BOWS 74
+#define EC_KK_RINGS 75
+#define EC_KK_AMULETS 76
+#define EC_KK_SUITS 77
+#define EC_KK_CLOAKS 78
+#define EC_KK_HELMS 79
+#define EC_KK_GLOVES 80
+#define EC_KK_BOOTS 81
/* Manu names */
#ifdef JP
-#define MN_QUIT "¥»¡¼¥Ö̵¤·¤Ç½ªÎ»"
-#define MN_SAVEQUIT "¥»¡¼¥Ö¤·¤Æ½ªÎ»"
-#define MN_REVERT "Á´¤Æ¤ÎÊѹ¹¤òÇË´þ"
-#define MN_HELP "¥Ø¥ë¥×"
-
-#define MN_MOVE "¥«¡¼¥½¥ë°ÜÆ°"
-#define MN_LEFT "º¸"
-#define MN_DOWN "²¼"
-#define MN_UP "¾å"
-#define MN_RIGHT "±¦"
-#define MN_BOL "¹Ô¤ÎÀèƬ"
-#define MN_EOL "¹Ô¤Î½ªÃ¼"
-#define MN_PGUP "¾å¤Î¥Ú¡¼¥¸"
-#define MN_PGDOWN "²¼¤Î¥Ú¡¼¥¸"
-#define MN_TOP "1¹ÔÌܤذÜÆ°"
-#define MN_BOTTOM "ºÇ²¼¹Ô¤Ø°ÜÆ°"
-
-#define MN_EDIT "ÊÔ½¸"
-#define MN_CUT "¥«¥Ã¥È"
-#define MN_COPY "¥³¥Ô¡¼"
-#define MN_PASTE "¥Ú¡¼¥¹¥È"
-#define MN_BLOCK "ÁªÂòÈϰϤλØÄê"
-#define MN_KILL_LINE "¹Ô¤Î»Ä¤ê¤òºï½ü"
-#define MN_DELETE_CHAR "1ʸ»úºï½ü"
-#define MN_BACKSPACE "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹"
-#define MN_RETURN "²þ¹Ô"
-#define MN_RETURN "²þ¹Ô"
-
-#define MN_SEARCH "¸¡º÷"
-#define MN_SEARCH_STR "ʸ»úÎó¤Ç¸¡º÷"
-#define MN_SEARCH_FORW "Á°Êý¤ØºÆ¸¡º÷"
-#define MN_SEARCH_BACK "¸åÊý¤ØºÆ¸¡º÷"
-#define MN_SEARCH_OBJ "¥¢¥¤¥Æ¥à¤òÁªÂò¤·¤Æ¸¡º÷"
-#define MN_SEARCH_DESTROYED "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Ç¸¡º÷"
-
-#define MN_INSERT "¿§¡¹ÁÞÆþ"
-#define MN_INSERT_OBJECT "ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ"
-#define MN_INSERT_DESTROYED "¼«Æ°Ç˲õ¤µ¤ì¤¿¥¢¥¤¥Æ¥à¤Î̾Á°¤òÁÞÆþ"
-#define MN_INSERT_BLOCK "¾ò·ïʬ´ô¥Ö¥í¥Ã¥¯¤ÎÎã¤òÁÞÆþ"
-#define MN_INSERT_MACRO "¥Þ¥¯¥íÄêµÁ¤òÁÞÆþ"
-#define MN_INSERT_KEYMAP "¥¡¼¥Þ¥Ã¥×ÄêµÁ¤òÁÞÆþ"
-
-#define MN_COMMAND_LETTER "½¦¤¤/Ç˲õ/ÊüÃÖ¤ÎÁªÂò"
-#define MN_CL_AUTOPICK "¡Ö ¡× (¼«Æ°½¦¤¤)"
-#define MN_CL_DESTROY "¡Ö!¡× (¼«Æ°Ç˲õ)"
-#define MN_CL_LEAVE "¡Ö~¡× (ÊüÃÖ)"
-#define MN_CL_QUERY "¡Ö;¡× (³Îǧ¤·¤Æ½¦¤¦)"
-#define MN_CL_NO_DISP "¡Ö(¡× (¥Þ¥Ã¥×¥³¥Þ¥ó¥É¤Çɽ¼¨¤·¤Ê¤¤)"
-
-#define MN_ADJECTIVE_GEN "·ÁÍÆ»ì(°ìÈÌ)¤ÎÁªÂò"
-
-#define MN_ADJECTIVE_SPECIAL "·ÁÍÆ»ì(Æüì)¤ÎÁªÂò"
-#define MN_BOOSTED "¥À¥¤¥¹Ìܤΰ㤦 (Éð´ï)"
-#define MN_MORE_THAN "¥À¥¤¥¹ÌÜ # °Ê¾å¤Î (Éð´ï)"
-#define MN_MORE_BONUS "½¤ÀµÃÍ # °Ê¾å¤Î (»ØÎØÅù)"
-#define MN_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È (ÁõÈ÷)"
-#define MN_EGO "¥¨¥´ (ÁõÈ÷)"
-#define MN_NAMELESS "̵ÌäΠ(ÁõÈ÷)"
-#define MN_WANTED "¾Þ¶â¼ó¤Î (»àÂÎ)"
-#define MN_UNIQUE "¥æ¥Ë¡¼¥¯¡¦¥â¥ó¥¹¥¿¡¼¤Î (»àÂÎ)"
-#define MN_HUMAN "¿Í´Ö¤Î (»àÂÎ)"
-#define MN_UNREADABLE "Æɤá¤Ê¤¤ (ËâË¡½ñ)"
-#define MN_REALM1 "Âè°ìÎΰè¤Î (ËâË¡½ñ)"
-#define MN_REALM2 "ÂèÆóÎΰè¤Î (ËâË¡½ñ)"
-#define MN_FIRST "1ºýÌܤΠ(ËâË¡½ñ)"
-#define MN_SECOND "2ºýÌܤΠ(ËâË¡½ñ)"
-#define MN_THIRD "3ºýÌܤΠ(ËâË¡½ñ)"
-#define MN_FOURTH "4ºýÌܤΠ(ËâË¡½ñ)"
-
-#define MN_NOUN "̾»ì¤ÎÁªÂò"
+static char MN_QUIT[] = "セーブ無しで終了";
+static char MN_SAVEQUIT[] = "セーブして終了";
+static char MN_REVERT[] = "全ての変更を破棄";
+static char MN_HELP[] = "ヘルプ";
+
+static char MN_MOVE[] = "カーソル移動";
+static char MN_LEFT[] = "左 (←矢印キー)";
+static char MN_DOWN[] = "下 (↓矢印キー)";
+static char MN_UP[] = "上 (↑矢印キー)";
+static char MN_RIGHT[] = "右 (→矢印キー)";
+static char MN_BOL[] = "行の先頭";
+static char MN_EOL[] = "行の終端";
+static char MN_PGUP[] = "上のページ (PageUpキー)";
+static char MN_PGDOWN[] = "下のページ (PageDownキー)";
+static char MN_TOP[] = "1行目へ移動 (Homeキー)";
+static char MN_BOTTOM[] = "最下行へ移動(Endキー)";
+
+static char MN_EDIT[] = "編集";
+static char MN_CUT[] = "カット";
+static char MN_COPY[] = "コピー";
+static char MN_PASTE[] = "ペースト";
+static char MN_BLOCK[] = "選択範囲の指定";
+static char MN_KILL_LINE[] = "行の残りを削除";
+static char MN_DELETE_CHAR[] = "1文字削除";
+static char MN_BACKSPACE[] = "バックスペース";
+static char MN_RETURN[] = "改行";
+
+static char MN_SEARCH[] = "検索";
+static char MN_SEARCH_STR[] = "文字列で検索";
+static char MN_SEARCH_FORW[] = "前方へ再検索";
+static char MN_SEARCH_BACK[] = "後方へ再検索";
+static char MN_SEARCH_OBJ[] = "アイテムを選択して検索";
+static char MN_SEARCH_DESTROYED[] = "自動破壊されたアイテムで検索";
+
+static char MN_INSERT[] = "色々挿入";
+static char MN_INSERT_OBJECT[] = "選択したアイテムの名前を挿入";
+static char MN_INSERT_DESTROYED[] = "自動破壊されたアイテムの名前を挿入";
+static char MN_INSERT_BLOCK[] = "条件分岐ブロックの例を挿入";
+static char MN_INSERT_MACRO[] = "マクロ定義を挿入";
+static char MN_INSERT_KEYMAP[] = "キーマップ定義を挿入";
+
+static char MN_COMMAND_LETTER[] = "拾い/破壊/放置の選択";
+static char MN_CL_AUTOPICK[] = "「 」 (自動拾い)";
+static char MN_CL_DESTROY[] = "「!」 (自動破壊)";
+static char MN_CL_LEAVE[] = "「~」 (放置)";
+static char MN_CL_QUERY[] = "「;」 (確認して拾う)";
+static char MN_CL_NO_DISP[] = "「(」 (マップコマンドで表示しない)";
+
+static char MN_ADJECTIVE_GEN[] = "形容詞(一般)の選択";
+static char MN_RARE[] = "レアな (装備)";
+static char MN_COMMON[] = "ありふれた (装備)";
+
+static char MN_ADJECTIVE_SPECIAL[] = "形容詞(特殊)の選択";
+static char MN_BOOSTED[] = "ダイス目の違う (武器)";
+static char MN_MORE_DICE[] = "ダイス目 # 以上の (武器)";
+static char MN_MORE_BONUS[] = "修正値 # 以上の (指輪等)";
+static char MN_WANTED[] = "賞金首の (死体)";
+static char MN_UNIQUE[] = "ユニーク・モンスターの (死体)";
+static char MN_HUMAN[] = "人間の (死体)";
+static char MN_UNREADABLE[] = "読めない (魔法書)";
+static char MN_REALM1[] = "第一領域の (魔法書)";
+static char MN_REALM2[] = "第二領域の (魔法書)";
+static char MN_FIRST[] = "1冊目の (魔法書)";
+static char MN_SECOND[] = "2冊目の (魔法書)";
+static char MN_THIRD[] = "3冊目の (魔法書)";
+static char MN_FOURTH[] = "4冊目の (魔法書)";
+
+static char MN_NOUN[] = "名詞の選択";
#else
-#define MN_QUIT "Quit without save"
-#define MN_SAVEQUIT "Save & Quit"
-#define MN_REVERT "Revert all changes"
-#define MN_HELP "Help"
-
-#define MN_MOVE "Move cursor"
-#define MN_LEFT "Left"
-#define MN_DOWN "Down"
-#define MN_UP "Up"
-#define MN_RIGHT "Right"
-#define MN_BOL "Beggining of line"
-#define MN_EOL "End of line"
-#define MN_PGUP "Page up"
-#define MN_PGDOWN "Page down"
-#define MN_TOP "Top"
-#define MN_BOTTOM "Bottom"
-
-#define MN_EDIT "Edit"
-#define MN_CUT "Cut"
-#define MN_COPY "Copy"
-#define MN_PASTE "Paste"
-#define MN_BLOCK "Select block"
-#define MN_KILL_LINE "Kill rest of line"
-#define MN_DELETE_CHAR "Delete character"
-#define MN_BACKSPACE "Backspace"
-#define MN_RETURN "Return"
-#define MN_RETURN "Return"
-
-#define MN_SEARCH "Search"
-#define MN_SEARCH_STR "Search by string"
-#define MN_SEARCH_FORW "Search forward"
-#define MN_SEARCH_BACK "Search backward"
-#define MN_SEARCH_OBJ "Search by inventory object"
-#define MN_SEARCH_DESTROYED "Search by destroyed object"
-
-#define MN_INSERT "Insert..."
-#define MN_INSERT_OBJECT "Insert name of choosen object"
-#define MN_INSERT_DESTROYED "Insert name of destroyed object"
-#define MN_INSERT_BLOCK "Insert conditional block"
-#define MN_INSERT_MACRO "Insert a macro definition"
-#define MN_INSERT_KEYMAP "Insert a keymap definition"
-
-#define MN_COMMAND_LETTER "Command letter"
-#define MN_CL_AUTOPICK "' ' (Auto pick)"
-#define MN_CL_DESTROY "'!' (Auto destroy)"
-#define MN_CL_LEAVE "'~' (Leave it on the floor)"
-#define MN_CL_QUERY "';' (Query to pick up)"
-#define MN_CL_NO_DISP "'(' (No display on the large map)"
-
-#define MN_ADJECTIVE_GEN "Adjective (general)"
-
-#define MN_ADJECTIVE_SPECIAL "Adjective (special)"
-#define MN_BOOSTED "dice boosted (weapons)"
-#define MN_MORE_THAN "more than # dice (weapons)"
-#define MN_MORE_BONUS "more bonus than # (rings etc.)"
-#define MN_ARTIFACT "artifact (equipments)"
-#define MN_EGO "ego (equipments)"
-#define MN_NAMELESS "nameless (equipments)"
-#define MN_WANTED "wanted (corpse)"
-#define MN_UNIQUE "unique (corpse)"
-#define MN_HUMAN "human (corpse)"
-#define MN_UNREADABLE "unreadable (spellbooks)"
-#define MN_REALM1 "realm1 (spellbooks)"
-#define MN_REALM2 "realm2 (spellbooks)"
-#define MN_FIRST "first (spellbooks)"
-#define MN_SECOND "second (spellbooks)"
-#define MN_THIRD "third (spellbooks)"
-#define MN_FOURTH "fourth (spellbooks)"
-
-#define MN_NOUN "Keywords (noun)"
+static char MN_QUIT[] = "Quit without save";
+static char MN_SAVEQUIT[] = "Save & Quit";
+static char MN_REVERT[] = "Revert all changes";
+static char MN_HELP[] = "Help";
+
+static char MN_MOVE[] = "Move cursor";
+static char MN_LEFT[] = "Left (Left Arrow key)";
+static char MN_DOWN[] = "Down (Down Arrow key)";
+static char MN_UP[] = "Up (Up Arrow key)";
+static char MN_RIGHT[] = "Right (Right Arrow key)";
+static char MN_BOL[] = "Beggining of line";
+static char MN_EOL[] = "End of line";
+static char MN_PGUP[] = "Page up (PageUp key)";
+static char MN_PGDOWN[] = "Page down(PageDown key)";
+static char MN_TOP[] = "Top (Home key)";
+static char MN_BOTTOM[] = "Bottom (End key)";
+
+static char MN_EDIT[] = "Edit";
+static char MN_CUT[] = "Cut";
+static char MN_COPY[] = "Copy";
+static char MN_PASTE[] = "Paste";
+static char MN_BLOCK[] = "Select block";
+static char MN_KILL_LINE[] = "Kill rest of line";
+static char MN_DELETE_CHAR[] = "Delete character";
+static char MN_BACKSPACE[] = "Backspace";
+static char MN_RETURN[] = "Return";
+
+static char MN_SEARCH[] = "Search";
+static char MN_SEARCH_STR[] = "Search by string";
+static char MN_SEARCH_FORW[] = "Search forward";
+static char MN_SEARCH_BACK[] = "Search backward";
+static char MN_SEARCH_OBJ[] = "Search by inventory object";
+static char MN_SEARCH_DESTROYED[] = "Search by destroyed object";
+
+static char MN_INSERT[] = "Insert...";
+static char MN_INSERT_OBJECT[] = "Insert name of choosen object";
+static char MN_INSERT_DESTROYED[] = "Insert name of destroyed object";
+static char MN_INSERT_BLOCK[] = "Insert conditional block";
+static char MN_INSERT_MACRO[] = "Insert a macro definition";
+static char MN_INSERT_KEYMAP[] = "Insert a keymap definition";
+
+static char MN_COMMAND_LETTER[] = "Command letter";
+static char MN_CL_AUTOPICK[] = "' ' (Auto pick)";
+static char MN_CL_DESTROY[] = "'!' (Auto destroy)";
+static char MN_CL_LEAVE[] = "'~' (Leave it on the floor)";
+static char MN_CL_QUERY[] = "';' (Query to pick up)";
+static char MN_CL_NO_DISP[] = "'(' (No display on the large map)";
+
+static char MN_ADJECTIVE_GEN[] = "Adjective (general)";
+static char MN_RARE[] = "rare (equipments)";
+static char MN_COMMON[] = "common (equipments)";
+
+static char MN_ADJECTIVE_SPECIAL[] = "Adjective (special)";
+static char MN_BOOSTED[] = "dice boosted (weapons)";
+static char MN_MORE_DICE[] = "more than # dice (weapons)";
+static char MN_MORE_BONUS[] = "more bonus than # (rings etc.)";
+static char MN_WANTED[] = "wanted (corpse)";
+static char MN_UNIQUE[] = "unique (corpse)";
+static char MN_HUMAN[] = "human (corpse)";
+static char MN_UNREADABLE[] = "unreadable (spellbooks)";
+static char MN_REALM1[] = "realm1 (spellbooks)";
+static char MN_REALM2[] = "realm2 (spellbooks)";
+static char MN_FIRST[] = "first (spellbooks)";
+static char MN_SECOND[] = "second (spellbooks)";
+static char MN_THIRD[] = "third (spellbooks)";
+static char MN_FOURTH[] = "fourth (spellbooks)";
+
+static char MN_NOUN[] = "Keywords (noun)";
#endif
{KEY_IDENTIFIED, 1, -1, EC_IK_IDENTIFIED},
{KEY_STAR_IDENTIFIED, 1, -1, EC_IK_STAR_IDENTIFIED},
{KEY_COLLECTING, 1, -1, EC_OK_COLLECTING},
+ {KEY_ARTIFACT, 1, -1, EC_OK_ARTIFACT},
+ {KEY_EGO, 1, -1, EC_OK_EGO},
+ {KEY_GOOD, 1, -1, EC_OK_GOOD},
+ {KEY_NAMELESS, 1, -1, EC_OK_NAMELESS},
+ {KEY_AVERAGE, 1, -1, EC_OK_AVERAGE},
{KEY_WORTHLESS, 1, -1, EC_OK_WORTHLESS},
+ {MN_RARE, 1, -1, EC_OK_RARE},
+ {MN_COMMON, 1, -1, EC_OK_COMMON},
{MN_ADJECTIVE_SPECIAL, 0, -1, -1},
{MN_BOOSTED, 1, -1, EC_OK_BOOSTED},
- {MN_MORE_THAN, 1, -1, EC_OK_MORE_THAN},
+ {MN_MORE_DICE, 1, -1, EC_OK_MORE_DICE},
{MN_MORE_BONUS, 1, -1, EC_OK_MORE_BONUS},
- {MN_ARTIFACT, 1, -1, EC_OK_ARTIFACT},
- {MN_EGO, 1, -1, EC_OK_EGO},
- {MN_NAMELESS, 1, -1, EC_OK_NAMELESS},
{MN_WANTED, 1, -1, EC_OK_WANTED},
{MN_UNIQUE, 1, -1, EC_OK_UNIQUE},
{MN_HUMAN, 1, -1, EC_OK_HUMAN},
{MN_NOUN, 0, -1, -1},
{KEY_WEAPONS, 1, -1, EC_KK_WEAPONS},
- {KEY_FAVORITE, 1, -1, EC_KK_FAVORITE},
+ {KEY_FAVORITE_WEAPONS, 1, -1, EC_KK_FAVORITE_WEAPONS},
{KEY_ARMORS, 1, -1, EC_KK_ARMORS},
{KEY_MISSILES, 1, -1, EC_KK_MISSILES},
{KEY_DEVICES, 1, -1, EC_KK_DEVICES},
{KEY_LIGHTS, 1, -1, EC_KK_LIGHTS},
{KEY_JUNKS, 1, -1, EC_KK_JUNKS},
+ {KEY_CORPSES, 1, -1, EC_KK_CORPSES},
{KEY_SPELLBOOKS, 1, -1, EC_KK_SPELLBOOKS},
{KEY_SHIELDS, 1, -1, EC_KK_SHIELDS},
{KEY_BOWS, 1, -1, EC_KK_BOWS},
}
strcat(linestr, "+");
- while (1)
+ while (TRUE)
{
int com_id;
char key;
if (menu_data[i].com_id == -1)
{
-#ifdef JP
- strcpy(com_key_str, "¢§");
-#else
- strcpy(com_key_str, ">");
-#endif
+ strcpy(com_key_str, _("▼", ">"));
}
else if (menu_data[i].key != -1)
{
/* The menu was shown */
redraw = FALSE;
}
-#ifdef JP
- prt(format("(a-%c) ¥³¥Þ¥ó¥É:", menu_key + 'a' - 1), 0, 0);
-#else
- prt(format("(a-%c) Command:", menu_key + 'a' - 1), 0, 0);
-#endif
+ prt(format(_("(a-%c) コマンド:", "(a-%c) Command:"), menu_key + 'a' - 1), 0, 0);
key = inkey();
if (key == ESCAPE) return 0;
chain = tb->yank;
- while (1)
+ while (TRUE)
{
if (!chain->next)
{
- chain->next = new_chain_str(str);
- return;
+ chain->next = new_chain_str(str);
+ return;
+ }
+
+ /* Go to next */
+ chain = chain->next;
+ }
+}
+
+
+/*
+ * Do work for the copy editor-command
+ */
+static void copy_text_to_yank(text_body_type *tb)
+{
+ int len = strlen(tb->lines_list[tb->cy]);
+
+ /* Correct cursor location */
+ if (tb->cx > len) tb->cx = len;
+
+ /* Use single line? */
+ if (!tb->mark)
+ {
+ /* Select a single line */
+ tb->cx = 0;
+ tb->my = tb->cy;
+ tb->mx = len;
+ }
+
+ /* Kill old yank buffer */
+ kill_yank_chain(tb);
+
+
+ /* Single line case */
+ if (tb->my == tb->cy)
+ {
+ int i;
+ char buf[MAX_LINELEN];
+ int bx1 = MIN(tb->mx, tb->cx);
+ int bx2 = MAX(tb->mx, tb->cx);
+
+ /* Correct fake cursor position */
+ if (bx2 > len) bx2 = len;
+
+ /* Whole part of this line is selected */
+ if (bx1 == 0 && bx2 == len)
+ {
+ /* Copy this line */
+ add_str_to_yank(tb, tb->lines_list[tb->cy]);
+
+ /* Add end of line to the buffer */
+ add_str_to_yank(tb, "");
+ }
+
+ /* Segment of this line is selected */
+ else
+ {
+ for (i = 0; i < bx2 - bx1; i++)
+ {
+ buf[i] = tb->lines_list[tb->cy][bx1 + i];
+ }
+ buf[i] = '\0';
+
+ /* Copy this segment of line */
+ add_str_to_yank(tb, buf);
+ }
+ }
+
+ /* Multiple lines case */
+ else /* if (tb->my != tb->cy) */
+ {
+ int y;
+
+ int by1 = MIN(tb->my, tb->cy);
+ int by2 = MAX(tb->my, tb->cy);
+
+ /* Copy lines */
+ for (y = by1; y <= by2; y++)
+ {
+ /* Copy this line */
+ add_str_to_yank(tb, tb->lines_list[y]);
}
- /* Go to next */
- chain = chain->next;
+ /* Add final end of line to the buffer */
+ add_str_to_yank(tb, "");
}
+
+ /* Disable selection */
+ tb->mark = 0;
+
+ /* Now dirty */
+ tb->dirty_flags |= DIRTY_ALL;
}
static void draw_text_editor(text_body_type *tb)
{
int i;
- int by1 = -1, bx1 = -1, by2 = -1, bx2 = -1;
+ int by1 = 0, by2 = 0;
- /* Get size */
Term_get_size(&tb->wid, &tb->hgt);
/*
i++;
if (i == tb->cx)
{
- tb->cx--;
+ /*
+ * Move to a correct position in the
+ * left or right
+ */
+ if (i & 1) tb->cx--;
+ else tb->cx++;
break;
}
}
char f;
cptr v;
cptr s = tb->lines_list[y];
+ char *ss, *s_keep;
+ int s_len;
/* Update this line's state */
tb->states[y] = state;
if (streq(s, "$AUTOREGISTER"))
state |= LSTAT_AUTOREGISTER;
+ s_len = strlen(s);
+ ss = (char *)string_make(s);
+ s_keep = ss;
+
/* Parse the expr */
- v = process_pref_file_expr(&s, &f);
+ v = process_pref_file_expr(&ss, &f);
/* Set flag */
if (streq(v, "0")) state |= LSTAT_BYPASS;
else state &= ~LSTAT_BYPASS;
+ /* Cannot use string_free() because the string was "destroyed" */
+ C_KILL(s_keep, s_len + 1, char);
+
/* Re-update this line's state */
tb->states[y] = state | LSTAT_EXPRESSION;
}
if (tb->mark)
{
- int tmp_cx = tb->cx;
- int len = strlen(tb->lines_list[tb->cy]);
-
- /* Correct cursor location */
- if (tb->cx > len) tmp_cx = len;
-
tb->dirty_flags |= DIRTY_ALL;
- if (tb->my < tb->cy ||
- (tb->my == tb->cy && tb->mx < tmp_cx))
- {
- by1 = tb->my;
- bx1 = tb->mx;
- by2 = tb->cy;
- bx2 = tmp_cx;
- }
- else
- {
- by2 = tb->my;
- bx2 = tb->mx;
- by1 = tb->cy;
- bx1 = tmp_cx;
- }
+ by1 = MIN(tb->my, tb->cy);
+ by2 = MAX(tb->my, tb->cy);
}
/* Dump up to tb->hgt lines of messages */
else color = TERM_WHITE;
}
- if (!tb->mark)
+ /* No mark or Out of mark */
+ if (!tb->mark || (y < by1 || by2 < y))
{
/* Dump the messages, bottom to top */
Term_putstr(leftcol, i + 1, tb->wid - 1, color, msg);
}
+ /* Multiple lines selected */
+ else if (by1 != by2)
+ {
+ /* Dump the messages, bottom to top */
+ Term_putstr(leftcol, i + 1, tb->wid - 1, TERM_YELLOW, msg);
+ }
+
+ /* Single line selected */
else
{
int x0 = leftcol + tb->left;
+ int len = strlen(tb->lines_list[tb->cy]);
+ int bx1 = MIN(tb->mx, tb->cx);
+ int bx2 = MAX(tb->mx, tb->cx);
- int sx0 = 0;
- int sx1 = 0;
-
- if (by1 <= y && y < by2) sx1 = strlen(msg);
- if (y == by1) sx0 = bx1;
- if (y == by2) sx1 = bx2;
+ /* Correct cursor location */
+ if (bx2 > len) bx2 = len;
Term_gotoxy(leftcol, i + 1);
- if (x0 < sx0) Term_addstr(sx0 - x0, color, msg);
- if (x0 < sx1) Term_addstr(sx1 - sx0, TERM_YELLOW, msg + (sx0 - x0));
- Term_addstr(-1, color, msg + (sx1 - x0));
+ if (x0 < bx1) Term_addstr(bx1 - x0, color, msg);
+ if (x0 < bx2) Term_addstr(bx2 - bx1, TERM_YELLOW, msg + (bx1 - x0));
+ Term_addstr(-1, color, msg + (bx2 - x0));
}
}
if (tb->old_cy != tb->cy || (tb->dirty_flags & (DIRTY_ALL | DIRTY_NOT_FOUND | DIRTY_NO_SEARCH)) || tb->dirty_line == tb->cy)
{
autopick_type an_entry, *entry = &an_entry;
+ cptr str1 = NULL, str2 = NULL;
+
/* Clear information line */
for (i = 0; i < DESCRIPT_HGT; i++)
/* Display information */
if (tb->dirty_flags & DIRTY_NOT_FOUND)
{
-#ifdef JP
- prt(format("¥Ñ¥¿¡¼¥ó¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s", tb->search_str), tb->hgt + 1 + 1, 0);
-#else
- prt(format("Pattern not found: %s", tb->search_str), tb->hgt + 1 + 1, 0);
-#endif
+ str1 = format(_("パターンが見つかりません: %s", "Pattern not found: %s"), tb->search_str);
+ }
+ else if (tb->dirty_flags & DIRTY_SKIP_INACTIVE)
+ {
+ str1 = format(_("無効状態の行をスキップしました。(%sを検索中)",
+ "Some inactive lines are skipped. (Searching %s)"), tb->search_str);
+ }
+ else if (tb->dirty_flags & DIRTY_INACTIVE)
+ {
+ str1 = format(_("無効状態の行だけが見付かりました。(%sを検索中)",
+ "Found only an inactive line. (Searching %s)"), tb->search_str);
}
else if (tb->dirty_flags & DIRTY_NO_SEARCH)
{
-#ifdef JP
- prt("¸¡º÷Ãæ¤Î¥Ñ¥¿¡¼¥ó¤¬¤¢¤ê¤Þ¤»¤ó('/'¤Ç¸¡º÷)¡£", tb->hgt + 1 + 1, 0);
-#else
- prt("No pattern to search. (Press '/' to search.)", tb->hgt +1 + 1, 0);
-#endif
+ str1 = _("検索するパターンがありません(^S で検索)。", "No pattern to search. (Press ^S to search.)");
}
else if (tb->lines_list[tb->cy][0] == '#')
{
-#ifdef JP
- prt("¤³¤Î¹Ô¤Ï¥³¥á¥ó¥È¤Ç¤¹¡£", tb->hgt +1 + 1, 0);
-#else
- prt("This line is a comment.", tb->hgt +1 + 1, 0);
-#endif
+ str1 = _("この行はコメントです。", "This line is a comment.");
}
- else if (tb->lines_list[tb->cy][1] == ':')
+ else if (tb->lines_list[tb->cy][0] && tb->lines_list[tb->cy][1] == ':')
{
- cptr str = NULL;
-
switch(tb->lines_list[tb->cy][0])
{
case '?':
-#ifdef JP
- str = "¤³¤Î¹Ô¤Ï¾ò·ïʬ´ô¼°¤Ç¤¹¡£";
-#else
- str = "This line is a Conditional Expression.";
-#endif
-
+ str1 = _("この行は条件分岐式です。", "This line is a Conditional Expression.");
break;
case 'A':
-#ifdef JP
- str = "¤³¤Î¹Ô¤Ï¥Þ¥¯¥í¤Î¼Â¹ÔÆâÍƤòÄêµÁ¤·¤Þ¤¹¡£";
-#else
- str = "This line defines a Macro action.";
-#endif
+ str1 = _("この行はマクロの実行内容を定義します。", "This line defines a Macro action.");
break;
case 'P':
-#ifdef JP
- str = "¤³¤Î¹Ô¤Ï¥Þ¥¯¥í¤Î¥È¥ê¥¬¡¼¡¦¥¡¼¤òÄêµÁ¤·¤Þ¤¹¡£";
-#else
- str = "This line defines a Macro trigger key.";
-#endif
+ str1 = _("この行はマクロのトリガー・キーを定義します。", "This line defines a Macro trigger key.");
break;
case 'C':
-#ifdef JP
- str = "¤³¤Î¹Ô¤Ï¥¡¼ÇÛÃÖ¤òÄêµÁ¤·¤Þ¤¹¡£";
-#else
- str = "This line defines a Keymap.";
-#endif
+ str1 = _("この行はキー配置を定義します。", "This line defines a Keymap.");
break;
}
- /* Draw the first line */
- if (str) prt(str, tb->hgt +1 + 1, 0);
-
- str = NULL;
-
switch(tb->lines_list[tb->cy][0])
{
case '?':
if (tb->states[tb->cy] & LSTAT_BYPASS)
{
-#ifdef JP
- str = "¸½ºß¤Î¼°¤ÎÃͤϡֵ¶(=0)¡×¤Ç¤¹¡£";
-#else
- str = "The expression is 'False'(=0) currently.";
-#endif
+ str2 = _("現在の式の値は「偽(=0)」です。", "The expression is 'False'(=0) currently.");
}
else
{
-#ifdef JP
- str = "¸½ºß¤Î¼°¤ÎÃͤϡֿ¿(=1)¡×¤Ç¤¹¡£";
-#else
- str = "The expression is 'True'(=1) currently.";
-#endif
+ str2 = _("現在の式の値は「真(=1)」です。", "The expression is 'True'(=1) currently.");
}
break;
default:
if (tb->states[tb->cy] & LSTAT_AUTOREGISTER)
{
-#ifdef JP
- str = "¤³¤Î¹Ô¤Ï¸å¤Çºï½ü¤µ¤ì¤Þ¤¹¡£";
-#else
- str = "This line will be delete later.";
-#endif
+ str2 = _("この行は後で削除されます。", "This line will be delete later.");
}
else if (tb->states[tb->cy] & LSTAT_BYPASS)
{
-#ifdef JP
- str = "¤³¤Î¹Ô¤Ï¸½ºß¤Ï̵¸ú¤Ê¾õÂ֤Ǥ¹¡£";
-#else
- str = "This line is bypassed currently.";
-#endif
+ str2 = _("この行は現在は無効な状態です。", "This line is bypassed currently.");
}
break;
}
-
- /* Draw the second line */
- if (str) prt(str, tb->hgt +1 + 2, 0);
}
/* Get description of an autopicker preference line */
if (tb->states[tb->cy] & LSTAT_AUTOREGISTER)
{
-#ifdef JP
- strcat(buf, "¤³¤Î¹Ô¤Ï¸å¤Çºï½ü¤µ¤ì¤Þ¤¹¡£");
-#else
- strcat(buf, " This line will be delete later.");
-#endif
+ strcat(buf, _("この行は後で削除されます。", " This line will be delete later."));
}
if (tb->states[tb->cy] & LSTAT_BYPASS)
{
-#ifdef JP
- strcat(buf, "¤³¤Î¹Ô¤Ï¸½ºß¤Ï̵¸ú¤Ê¾õÂ֤Ǥ¹¡£");
-#else
- strcat(buf, " This line is bypassed currently.");
-#endif
+ strcat(buf, _("この行は現在は無効な状態です。", " This line is bypassed currently."));
}
roff_to_buf(buf, 81, temp, sizeof(temp));
}
autopick_free_entry(entry);
}
+
+ /* Draw the first line */
+ if (str1) prt(str1, tb->hgt +1 + 1, 0);
+
+ /* Draw the second line */
+ if (str2) prt(str2, tb->hgt +1 + 2, 0);
}
}
char *d = buf;
int x;
- /* No segment? */
- if (x0 == x1) return;
-
/* Kill whole line? */
if (whole && x0 == 0 && s[x1] == '\0' && tb->lines_list[y+1])
{
return;
}
+ /* No segment? */
+ if (x0 == x1) return;
+
/* Before the segment */
for (x = 0; x < x0; x++)
*(d++) = s[x];
while (i)
{
/* Save the key */
- buf[n++] = i;
+ buf[n++] = (char)i;
/* Do not process macros */
inkey_base = TRUE;
/* Terminate */
buf[n] = '\0';
- /* Flush */
flush();
/* Convert the trigger */
{
char tmp[1024];
char buf[2];
- int mode;
+ BIT_FLAGS mode;
cptr act;
/* Roguelike */
mode = KEYMAP_MODE_ORIG;
}
- /* Flush */
flush();
/* Get a key */
buf[0] = inkey();
buf[1] = '\0';
- /* Flush */
flush();
/* Convert the trigger */
/* Look up the keymap */
act = keymap_act[mode][(byte)(buf[0])];
+ if (act)
+ {
+ /* Analyze the current action */
+ ascii_to_text(tmp, act);
+ }
+ else
+ {
+ /* No keymap defined -- Use trigger key itself as a default */
+
+ /* Nothing to do (use tmp) */
+ }
+
/* Insert blank action preference line */
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
- tb->lines_list[tb->cy] = string_make(format("A:%s", act));
+ tb->lines_list[tb->cy] = string_make(format("A:%s", tmp));
return TRUE;
}
case EC_QUIT:
if (tb->changed)
{
-#ifdef JP
- if (!get_check("Á´¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¤Æ¤«¤é½ªÎ»¤·¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡© ")) break;
-#else
- if (!get_check("Discard all changes and quit. Are you sure? ")) break;
-#endif
+ if (!get_check(_("全ての変更を破棄してから終了します。よろしいですか？ ",
+ "Discard all changes and quit. Are you sure? "))) break;
}
return QUIT_WITHOUT_SAVE;
case EC_REVERT:
/* Revert to original */
-#ifdef JP
- if (!get_check("Á´¤Æ¤ÎÊѹ¹¤òÇË´þ¤·¤Æ¸µ¤Î¾õÂÖ¤ËÌᤷ¤Þ¤¹¡£¤è¤í¤·¤¤¤Ç¤¹¤«¡© ")) break;
-#else
- if (!get_check("Discard all changes and revert to original file. Are you sure? ")) break;
-#endif
+ if (!get_check(_("全ての変更を破棄して元の状態に戻します。よろしいですか？ ",
+ "Discard all changes and revert to original file. Are you sure? "))) break;
free_text_lines(tb->lines_list);
tb->lines_list = read_pickpref_text_lines(&tb->filename_mode);
case EC_HELP:
/* Peruse the main help file */
-#ifdef JP
- (void)show_file(TRUE, "jeditor.txt", NULL, 0, 0);
-#else
- (void)show_file(TRUE, "editor.txt", NULL, 0, 0);
-#endif
+ (void)show_file(TRUE, _("jeditor.txt", "editor.txt"), NULL, 0, 0);
/* Redraw all */
tb->dirty_flags |= DIRTY_SCREEN;
if (0 < tb->cx)
{
int len;
+#ifdef JP
+ int i;
+#endif
tb->cx--;
len = strlen(tb->lines_list[tb->cy]);
if (len < tb->cx) tb->cx = len;
+
+#ifdef JP
+ /* Don't let cursor at second byte of kanji */
+ for (i = 0; tb->lines_list[tb->cy][i]; i++)
+ {
+ if (iskanji(tb->lines_list[tb->cy][i]))
+ {
+ i++;
+ if (i == tb->cx)
+ {
+ /* Move to the left */
+ tb->cx--;
+ break;
+ }
+ }
+ }
+#endif
}
else if (tb->cy > 0)
{
case EC_DOWN:
/* Next line */
- if (tb->lines_list[tb->cy + 1]) tb->cy++;
+
+ /* Is this the last line? */
+ if (!tb->lines_list[tb->cy + 1])
+ {
+ /* Add one more empty line if possible */
+ if (!add_empty_line(tb)) break;
+ }
+
+ /* Go down */
+ tb->cy++;
+
break;
case EC_UP:
len = strlen(tb->lines_list[tb->cy]);
if (len < tb->cx)
{
- if (tb->lines_list[tb->cy + 1])
+ /* Correct the cursor position */
+ tb->cx = len;
+
+ /* Is this the last line? */
+ if (!tb->lines_list[tb->cy + 1])
{
- tb->cy++;
- tb->cx = 0;
+ /* Add one more empty line if possible */
+ if (!add_empty_line(tb)) break;
}
- else
- tb->cx = len;
+
+ /* Move to the beginning of next line */
+ tb->cy++;
+ tb->cx = 0;
}
break;
}
case EC_PGDOWN:
/* Page down */
- while (tb->cy < tb->upper + tb->hgt && tb->lines_list[tb->cy + 1])
+ while (tb->cy < tb->upper + tb->hgt)
+ {
+ /* Is this the last line? */
+ if (!tb->lines_list[tb->cy + 1])
+ {
+ /* Add one more empty line if possible */
+ if (!add_empty_line(tb)) break;
+ }
+
tb->cy++;
+ }
+
tb->upper = tb->cy;
break;
break;
case EC_BOTTOM:
- while (tb->lines_list[tb->cy + 1])
+ while (TRUE)
+ {
+ /* Is this the last line? */
+ if (!tb->lines_list[tb->cy + 1])
+ {
+ /* Add one more empty line if possible */
+ if (!add_empty_line(tb)) break;
+ }
+
tb->cy++;
+ }
+
+ /* Always at the biginning of the last line */
+ tb->cx = 0;
+
break;
case EC_CUT:
{
- int by1, bx1, by2, bx2;
- int y;
-
/* Copy the text first */
- do_editor_command(tb, EC_COPY);
+ copy_text_to_yank(tb);
- if (tb->my < tb->cy ||
- (tb->my == tb->cy && tb->mx < tb->cx))
- {
- by1 = tb->my;
- bx1 = tb->mx;
- by2 = tb->cy;
- bx2 = tb->cx;
- }
- else
+ /* Single line case */
+ if (tb->my == tb->cy)
{
- by2 = tb->my;
- bx2 = tb->mx;
- by1 = tb->cy;
- bx1 = tb->cx;
+ int bx1 = MIN(tb->mx, tb->cx);
+ int bx2 = MAX(tb->mx, tb->cx);
+ int len = strlen(tb->lines_list[tb->cy]);
+
+ /* Correct fake cursor position */
+ if (bx2 > len) bx2 = len;
+
+ kill_line_segment(tb, tb->cy, bx1, bx2, TRUE);
+
+ /* New cursor position */
+ tb->cx = bx1;
}
- /* Kill lines in reverse order */
- for (y = by2; y >= by1; y--)
+ /* Multiple lines case */
+ else /* if (tb->my != tb->cy) */
{
- int x0 = 0;
- int x1 = strlen(tb->lines_list[y]);
+ int y;
- if (y == by1) x0 = bx1;
- if (y == by2) x1 = bx2;
+ int by1 = MIN(tb->my, tb->cy);
+ int by2 = MAX(tb->my, tb->cy);
+
+ /* Kill lines in reverse order */
+ for (y = by2; y >= by1; y--)
+ {
+ int len = strlen(tb->lines_list[y]);
+
+ kill_line_segment(tb, y, 0, len, TRUE);
+ }
- kill_line_segment(tb, y, x0, x1, TRUE);
+ /* New cursor position */
+ tb->cy = by1;
+ tb->cx = 0;
}
- /* Correct cursor position */
- tb->cy = by1;
- tb->cx = bx1;
/* Disable selection */
tb->mark = 0;
/* Now dirty */
tb->dirty_flags |= DIRTY_ALL;
+ /* Text is changed */
+ tb->changed = TRUE;
+
break;
}
case EC_COPY:
- {
- int by1, bx1, by2, bx2;
- int y;
- int len = strlen(tb->lines_list[tb->cy]);
-
- /* Correct cursor location */
- if (tb->cx > len) tb->cx = len;
+ copy_text_to_yank(tb);
- /* Use single line? */
- if (!tb->mark)
+ /*
+ * Move cursor position to the end of the selection
+ *
+ * Pressing ^C ^V correctly duplicates the selection.
+ */
+ if (tb->my == tb->cy)
{
- tb->my = tb->cy;
- tb->mx = 0;
- if (tb->lines_list[tb->cy + 1])
+ tb->cx = MAX(tb->cx, tb->mx);
+
+ /*
+ * When whole line is selected, the end of
+ * line code is also copyed.
+ */
+ if (!tb->lines_list[tb->cy][tb->cx])
{
- /* Select a single line */
- tb->cx = 0;
+ /* Is this the last line? */
+ if (!tb->lines_list[tb->cy + 1])
+ {
+ /* Add one more empty line if possible */
+ if (!add_empty_line(tb)) break;
+ }
+
+ /* Go to the beginning of next line */
tb->cy++;
+ tb->cx = 0;
}
- else
- {
- /* Select bottom line */
- tb->cx = len;
- }
- }
-
- if (tb->my < tb->cy ||
- (tb->my == tb->cy && tb->mx < tb->cx))
- {
- by1 = tb->my;
- bx1 = tb->mx;
- by2 = tb->cy;
- bx2 = tb->cx;
}
else
{
- by2 = tb->my;
- bx2 = tb->mx;
- by1 = tb->cy;
- bx1 = tb->cx;
- }
-
- /* Kill old yank buffer */
- kill_yank_chain(tb);
-
- /* Copy string to yank buffer */
- for (y = by1; y <= by2; y++)
- {
- int i;
- char buf[MAX_LINELEN];
-
- int x0 = 0;
- int x1 = strlen(tb->lines_list[y]);
+ tb->cy = MAX(tb->cy, tb->my);
- if (y == by1) x0 = bx1;
- if (y == by2) x1 = bx2;
-
- for (i = 0; i < x1 - x0; i++)
+ /* Is this the last line? */
+ if (!tb->lines_list[tb->cy + 1])
{
- buf[i] = tb->lines_list[y][x0 + i];
+ /* Add one more empty line if possible */
+ if (!add_empty_line(tb)) break;
}
- buf[i] = '\0';
- add_str_to_yank(tb, buf);
+ /* Go down */
+ tb->cy++;
}
- /* Disable selection */
- tb->mark = 0;
-
- /* Now dirty */
- tb->dirty_flags |= DIRTY_ALL;
break;
- }
case EC_PASTE:
{
}
case EC_DELETE_CHAR:
+ {
/* DELETE == go forward + BACK SPACE */
+ int len;
+
/* Ignore selection */
if (tb->mark)
{
#endif
tb->cx++;
+ /* Pass through the end of line to next line */
+ len = strlen(tb->lines_list[tb->cy]);
+ if (len < tb->cx)
+ {
+ if (tb->lines_list[tb->cy + 1])
+ {
+ tb->cy++;
+ tb->cx = 0;
+ }
+ else
+ {
+ tb->cx = len;
+ break;
+ }
+ }
+
do_editor_command(tb, EC_BACKSPACE);
break;
+ }
case EC_BACKSPACE:
{
tb->dirty_flags |= DIRTY_ALL;
}
+ /* Move to correct collumn */
len = strlen(tb->lines_list[tb->cy]);
- if (len < tb->cx)
- {
- if (tb->lines_list[tb->cy + 1])
- {
- tb->cy++;
- tb->cx = 0;
- }
- else
- {
- tb->cx = len;
- break;
- }
- }
+ if (len < tb->cx) tb->cx = len;
if (tb->cx == 0)
{
case EC_SEARCH_FORW:
if (tb->search_o_ptr)
{
- if (!search_for_object(tb, tb->search_o_ptr, TRUE)) tb->dirty_flags |= DIRTY_NOT_FOUND;
+ search_for_object(tb, tb->search_o_ptr, TRUE);
}
- else if (tb->search_str)
+ else if (tb->search_str && tb->search_str[0])
{
- if (!search_for_string(tb, tb->search_str, TRUE)) tb->dirty_flags |= DIRTY_NOT_FOUND;
+ search_for_string(tb, tb->search_str, TRUE);
}
else
{
case EC_SEARCH_BACK:
if (tb->search_o_ptr)
{
- if (!search_for_object(tb, tb->search_o_ptr, FALSE)) tb->dirty_flags |= DIRTY_NOT_FOUND;
+ search_for_object(tb, tb->search_o_ptr, FALSE);
}
- else if (tb->search_str)
+ else if (tb->search_str && tb->search_str[0])
{
- if (!search_for_string(tb, tb->search_str, FALSE)) tb->dirty_flags |= DIRTY_NOT_FOUND;
+ search_for_string(tb, tb->search_str, FALSE);
}
else
{
break;
case EC_SEARCH_DESTROYED:
- if (!get_destroyed_object_for_search(&tb->search_o_ptr, &tb->search_str)) break;
+ if (!get_destroyed_object_for_search(&tb->search_o_ptr, &tb->search_str))
+ {
+ /* There is no object to search */
+ tb->dirty_flags |= DIRTY_NO_SEARCH;
+
+ break;
+ }
do_editor_command(tb, EC_SEARCH_FORW);
break;
case EC_INSERT_BLOCK:
{
/* Insert a conditinal expression line */
- char classrace[80];
+ char expression[80];
/* Conditional Expression for Class and Race */
- sprintf(classrace, "?:[AND [EQU $RACE %s] [EQU $CLASS %s]]",
+ sprintf(expression, "?:[AND [EQU $RACE %s] [EQU $CLASS %s] [GEQ $LEVEL %02d]]",
#ifdef JP
- rp_ptr->E_title, cp_ptr->E_title
+ rp_ptr->E_title, cp_ptr->E_title,
#else
- rp_ptr->title, cp_ptr->title
+ rp_ptr->title, cp_ptr->title,
#endif
+ p_ptr->lev
);
tb->cx = 0;
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
- tb->lines_list[tb->cy] = string_make(classrace);
+ tb->lines_list[tb->cy] = string_make(expression);
tb->cy++;
insert_return_code(tb);
string_free(tb->lines_list[tb->cy]);
Term_erase(0, tb->cy - tb->upper + 1, tb->wid);
/* Prompt */
-#ifdef JP
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, "P:<¥È¥ê¥¬¡¼¥¡¼>: ");
-#else
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, "P:<Trigger key>: ");
-#endif
+ Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, _("P:<トリガーキー>: ", "P:<Trigger key>: "));
if (insert_macro_line(tb))
{
/* Prepare to input action */
Term_erase(0, tb->cy - tb->upper + 1, tb->wid);
/* Prompt */
-#ifdef JP
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, format("C:%d:<¥³¥Þ¥ó¥É¥¡¼>: ", (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG)));
-#else
- Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW, format("C:%d:<Keypress>: ", (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG)));
-#endif
+ Term_putstr(0, tb->cy - tb->upper + 1, tb->wid - 1, TERM_YELLOW,
+ format(_("C:%d:<コマンドキー>: ", "C:%d:<Keypress>: "), (rogue_like_commands ? KEYMAP_MODE_ROGUE : KEYMAP_MODE_ORIG)));
if (insert_keymap_line(tb))
{
case EC_IK_IDENTIFIED: toggle_keyword(tb, FLG_IDENTIFIED); break;
case EC_IK_STAR_IDENTIFIED: toggle_keyword(tb, FLG_STAR_IDENTIFIED); break;
case EC_KK_WEAPONS: toggle_keyword(tb, FLG_WEAPONS); break;
- case EC_KK_FAVORITE: toggle_keyword(tb, FLG_FAVORITE); break;
+ case EC_KK_FAVORITE_WEAPONS: toggle_keyword(tb, FLG_FAVORITE_WEAPONS); break;
case EC_KK_ARMORS: toggle_keyword(tb, FLG_ARMORS); break;
case EC_KK_MISSILES: toggle_keyword(tb, FLG_MISSILES); break;
case EC_KK_DEVICES: toggle_keyword(tb, FLG_DEVICES); break;
case EC_KK_LIGHTS: toggle_keyword(tb, FLG_LIGHTS); break;
case EC_KK_JUNKS: toggle_keyword(tb, FLG_JUNKS); break;
+ case EC_KK_CORPSES: toggle_keyword(tb, FLG_CORPSES); break;
case EC_KK_SPELLBOOKS: toggle_keyword(tb, FLG_SPELLBOOKS); break;
case EC_KK_SHIELDS: toggle_keyword(tb, FLG_SHIELDS); break;
case EC_KK_BOWS: toggle_keyword(tb, FLG_BOWS); break;
case EC_KK_BOOTS: toggle_keyword(tb, FLG_BOOTS); break;
case EC_OK_COLLECTING: toggle_keyword(tb, FLG_COLLECTING); break;
case EC_OK_BOOSTED: toggle_keyword(tb, FLG_BOOSTED); break;
- case EC_OK_MORE_THAN: toggle_keyword(tb, FLG_MORE_THAN); break;
+ case EC_OK_MORE_DICE: toggle_keyword(tb, FLG_MORE_DICE); break;
case EC_OK_MORE_BONUS: toggle_keyword(tb, FLG_MORE_BONUS); break;
case EC_OK_WORTHLESS: toggle_keyword(tb, FLG_WORTHLESS); break;
case EC_OK_ARTIFACT: toggle_keyword(tb, FLG_ARTIFACT); break;
case EC_OK_EGO: toggle_keyword(tb, FLG_EGO); break;
+ case EC_OK_GOOD: toggle_keyword(tb, FLG_GOOD); break;
case EC_OK_NAMELESS: toggle_keyword(tb, FLG_NAMELESS); break;
+ case EC_OK_AVERAGE: toggle_keyword(tb, FLG_AVERAGE); break;
+ case EC_OK_RARE: toggle_keyword(tb, FLG_RARE); break;
+ case EC_OK_COMMON: toggle_keyword(tb, FLG_COMMON); break;
case EC_OK_WANTED: toggle_keyword(tb, FLG_WANTED); break;
case EC_OK_UNIQUE: toggle_keyword(tb, FLG_UNIQUE); break;
case EC_OK_HUMAN: toggle_keyword(tb, FLG_HUMAN); break;
next = inkey();
if (j+2 < MAX_LINELEN)
{
- buf[j++] = key;
- buf[j++] = next;
+ buf[j++] = (char)key;
+ buf[j++] = (char)next;
tb->cx += 2;
}
else
#endif
{
if (j+1 < MAX_LINELEN)
- buf[j++] = key;
+ buf[j++] = (char)key;
tb->cx++;
}
tb->dirty_line = -1;
tb->filename_mode = PT_DEFAULT;
+ if (turn < old_autosave_turn)
+ {
+ while (old_autosave_turn > turn) old_autosave_turn -= TURNS_PER_TICK * TOWN_DAWN;
+ }
+
/* Autosave */
if (turn > old_autosave_turn + 100L)
{
update_playtime();
/* Free old entries */
- init_autopicker();
+ init_autopick();
/* Command Description of the 'Last Destroyed Item' */
if (autopick_last_destroyed_object.k_idx)
draw_text_editor(tb);
/* Display header line */
-#ifdef JP
- prt("(^Q:½ªÎ» ^W:¥»¡¼¥Ö¤·¤Æ½ªÎ», ESC:¥á¥Ë¥å¡¼, ¤½¤Î¾:ÆþÎÏ)", 0, 0);
-#else
- prt("(^Q:quit, ^W:save&quit, ESC:menu, Other:input text)", 0, 0);
-#endif
+ prt(_("(^Q:終了 ^W:セーブして終了, ESC:メニュー, その他:入力)",
+ "(^Q:Quit, ^W:Save&Quit, ESC:Menu, Other:Input text)"), 0, 0);
if (!tb->mark)
{
/* Display current position */
tb->old_hgt = tb->hgt;
/* Get a command */
- key = inkey_special();
+ key = inkey_special(TRUE);
/* Special keys */
if (key & SKEY_MASK)
/* Other commands */
else
{
- com_id = get_com_id(key);
+ com_id = get_com_id((char)key);
}
if (com_id) quit = do_editor_command(tb, com_id);
- } /* while (1) */
+ } /* while (TRUE) */
/* Restore the screen */
screen_load();
free_text_lines(tb->lines_list);
+ string_free(tb->search_str);
string_free(tb->last_destroyed);
/* Destroy string chain */
kill_yank_chain(tb);
/* Reload autopick pref */
- process_pickpref_file(buf);
+ process_autopick_file(buf);
/* HACK -- reset start_time so that playtime is not increase while edit */
- start_time = time(NULL);
+ start_time = (u32b)time(NULL);
/* Save cursor location */
cx_save = tb->cx;
OSDN Git Service
