From 690aba79b62dabb4d5b9f5159bbf8efdad99fdfb Mon Sep 17 00:00:00 2001 From: mogami Date: Mon, 27 Oct 2003 20:31:46 +0000 Subject: [PATCH] =?utf8?q?-=20{=E4=B8=8A=E8=B3=AA=E4=BB=A5=E4=B8=8A}?= =?utf8?q?=E3=81=AE=E6=93=AC=E4=BC=BC=E9=91=91=E5=AE=9A=E6=B8=88=E3=81=BF?= =?utf8?q?=E3=81=AE=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=82=92=E8=87=AA?= =?utf8?q?=E5=8B=95=E7=A0=B4=E5=A3=8A=E3=81=AB=E8=87=AA=E5=8B=95=E7=99=BB?= =?utf8?q?=E9=8C=B2=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= =?utf8?q?=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3=E3=80=82=20-=20=E8=87=AA?= =?utf8?q?=E5=8B=95=E7=99=BB=E9=8C=B2=E3=81=A7=E3=80=81=E5=8F=AF=E8=83=BD?= =?utf8?q?=E3=81=AA=E9=99=90=E3=82=8A=E3=80=8C^=E3=80=8D=E3=82=92=E4=BB=98?= =?utf8?q?=E3=81=91=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?utf8?q?=E3=80=82=E3=83=A1=E3=82=A4=E3=82=B9=E3=81=A8=E9=89=9B=E8=A9=B0?= =?utf8?q?=E3=82=81=E3=83=A1=E3=82=A4=E3=82=B9=E3=82=92=E5=8C=BA=E5=88=A5?= =?utf8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=80=82=20-=20=E4=B8=80=E9=83=A8?= =?utf8?q?=E5=A4=89=E3=81=AA=E3=83=9E=E3=82=AF=E3=83=AD=E5=90=8D=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/autopick.c | 56 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 559102bb8..f3c7e852a 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -25,10 +25,8 @@ #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_MORE_DICE 7 +#define FLG_MORE_BONUS 10 #define FLG_WORTHLESS 11 #define FLG_ARTIFACT 12 #define FLG_EGO 13 @@ -315,7 +313,7 @@ static bool autopick_new_entry(autopick_type *entry, cptr str, bool allow_defaul if (k > 0 && k <= 2) { (void)MATCH_KEY(KEY_DICE); - ADD_FLG(FLG_MORE_THAN); + ADD_FLG(FLG_MORE_DICE); } else ptr = prev_ptr; @@ -509,6 +507,12 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) /* Assume that object name is to be added */ bool name = TRUE; +#ifdef JP + bool bol_mark = FALSE; +#else + bool bol_mark = TRUE; +#endif + char name_str[MAX_NLEN]; /* Initialize name string */ @@ -523,6 +527,7 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) if (!object_aware_p(o_ptr)) { ADD_FLG(FLG_UNAWARE); + bol_mark = TRUE; } /* Not really identified */ @@ -531,6 +536,7 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) if (!(o_ptr->ident & IDENT_SENSE)) { ADD_FLG(FLG_UNIDENTIFIED); + bol_mark = TRUE; } else { @@ -540,12 +546,14 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) 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: @@ -557,9 +565,13 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) 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; } } @@ -600,6 +612,8 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) /* Wearable nameless object */ if ((TV_EQUIP_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_EQUIP_END)) ADD_FLG(FLG_NAMELESS); + + bol_mark = TRUE; } } @@ -702,7 +716,15 @@ static void autopick_entry_from_object(autopick_type *entry, object_type *o_ptr) /* Prepare the object description */ if (name) { - object_desc(name_str, o_ptr, FALSE, 0); + char o_name[MAX_NLEN]; + + object_desc(o_name, o_ptr, FALSE, 0); + + /* + * If necessary, add a '^' which indicates the + * beginning of line. + */ + sprintf(name_str, "%s%s", bol_mark ? "^" : "", o_name); } /* Register the name in lowercase */ @@ -847,7 +869,7 @@ cptr autopick_line_from_entry(autopick_type *entry) 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)); @@ -999,7 +1021,7 @@ static bool is_autopick_aux(object_type *o_ptr, autopick_type *entry, cptr o_nam } /*** 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; @@ -2082,7 +2104,7 @@ static void describe_autopick(char *buff, autopick_type *entry) } /*** 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++] = "¥À¥á¡¼¥¸¥À¥¤¥¹¤ÎºÇÂçÃͤ¬"; @@ -2371,7 +2393,7 @@ static void describe_autopick(char *buff, autopick_type *entry) } /*** 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 __"; @@ -3585,7 +3607,7 @@ static void search_for_string(text_body_type *tb, cptr search_str, bool forward) #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 @@ -3684,7 +3706,7 @@ static void search_for_string(text_body_type *tb, cptr search_str, bool forward) #define MN_ADJECTIVE_SPECIAL "·ÁÍÆ»ì(Æüì)¤ÎÁªÂò" #define MN_BOOSTED "¥À¥¤¥¹Ìܤΰ㤦 (Éð´ï)" -#define MN_MORE_THAN "¥À¥¤¥¹ÌÜ # °Ê¾å¤Î (Éð´ï)" +#define MN_MORE_DICE "¥À¥¤¥¹ÌÜ # °Ê¾å¤Î (Éð´ï)" #define MN_MORE_BONUS "½¤ÀµÃÍ # °Ê¾å¤Î (»ØÎØÅù)" #define MN_ARTIFACT "¥¢¡¼¥Æ¥£¥Õ¥¡¥¯¥È (ÁõÈ÷)" #define MN_EGO "¥¨¥´ (ÁõÈ÷)" @@ -3757,7 +3779,7 @@ static void search_for_string(text_body_type *tb, cptr search_str, bool forward) #define MN_ADJECTIVE_SPECIAL "Adjective (special)" #define MN_BOOSTED "dice boosted (weapons)" -#define MN_MORE_THAN "more than # dice (weapons)" +#define MN_MORE_DICE "more than # dice (weapons)" #define MN_MORE_BONUS "more bonus than # (rings etc.)" #define MN_ARTIFACT "artifact (equipments)" #define MN_EGO "ego (equipments)" @@ -3840,7 +3862,7 @@ command_menu_type menu_data[] = {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}, @@ -5508,7 +5530,7 @@ static bool do_editor_command(text_body_type *tb, int com_id) 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; -- 2.11.0