case ART_JUDGE:
{
#ifdef JP
-return "ÂÎÎϤȰú¤Âؤ¨¤ËÀéΤ´ã¤Èµ¢´Ô";
+return "ÂÎÎϤȰú¤Âؤ¨¤ËÀéΤ´ã¤Èµ¢´Ô : 20+d20 ¥¿¡¼¥óËè";
#else
- return "clairvoyance and recall, draining you";
+ return "clairvoyance and recall, draining you every 20+d20 turns";
#endif
}
case ART_DOR: case ART_TERROR: case ART_STONEMASK:
{
#ifdef JP
-return "Á´Êý¸þ¤Ø¤Î¶²Éݤθ÷Àþ";
+ return "Á´Êý¸þ¤Ø¤Î¶²Éݤθ÷Àþ : 3*(¥ì¥Ù¥ë+10) ¥¿¡¼¥óËè";
#else
- return "rays of fear in every direction";
+ return "rays of fear in every direction every 3*(level+10) turns";
#endif
}
case EGO_RING_DRAGON_F:
if (o_ptr->sval == SV_RING_FLAMES)
#ifdef JP
-return "²Ð±ê¤Î¥Ö¥ì¥¹¤È²Ð¤Ø¤ÎÂÑÀ";
+return "²Ð±ê¤Î¥Ö¥ì¥¹ (200) ¤È²Ð¤Ø¤ÎÂÑÀ : 200 ¥¿¡¼¥óËè";
#else
- return "breath of fire and resist fire";
+ return "breath of fire (200) and resist fire every 200 turns";
#endif
else
#ifdef JP
case EGO_RING_DRAGON_C:
if (o_ptr->sval == SV_RING_ICE)
#ifdef JP
-return "Î䵤¤Î¥Ö¥ì¥¹¤ÈÎ䵤¤Ø¤ÎÂÑÀ";
+return "Î䵤¤Î¥Ö¥ì¥¹ (200) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ : 200 ¥¿¡¼¥óËè";
#else
- return "breath of cold and resist cold";
+ return "breath of cold (200) and resist cold every 200 turns";
#endif
else
#ifdef JP
#endif
case EGO_RING_TRUE:
#ifdef JP
-return "»Îµ¤¹âÍÈ¡¢½ËÊ¡¡¢µæ¶Ë¤ÎÂÑÀ";
+return "»Îµ¤¹âÍÈ¡¢½ËÊ¡¡¢µæ¶Ë¤ÎÂÑÀ : 777 ¥¿¡¼¥óËè";
#else
- return "hero, bless, and ultimate resistance";
+ return "hero, bless, and ultimate resistance every 777 turns";
#endif
}
}
{
case SV_RING_FLAMES:
#ifdef JP
-return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë¤È²Ð¤Ø¤ÎÂÑÀ";
+return "¥Õ¥¡¥¤¥¢¡¦¥Ü¡¼¥ë (100) ¤È²Ð¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of fire and resist fire";
+ return "ball of fire (100) and resist fire every 50+d50 turns";
#endif
case SV_RING_ICE:
#ifdef JP
-return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë¤ÈÎ䵤¤Ø¤ÎÂÑÀ";
+return "¥³¡¼¥ë¥É¡¦¥Ü¡¼¥ë (100) ¤ÈÎ䵤¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of cold and resist cold";
+ return "ball of cold (100) and resist cold every 50+d50 turns";
#endif
case SV_RING_ACID:
#ifdef JP
-return "¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë¤È»À¤Ø¤ÎÂÑÀ";
+return "¥¢¥·¥Ã¥É¡¦¥Ü¡¼¥ë (100) ¤È»À¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of acid and resist acid";
+ return "ball of acid (100) and resist acid every 50+d50 turns";
#endif
case SV_RING_ELEC:
#ifdef JP
-return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë¤ÈÅÅ·â¤Ø¤ÎÂÑÀ";
+return "¥µ¥ó¥À¡¼¡¦¥Ü¡¼¥ë (100) ¤ÈÅÅ·â¤Ø¤ÎÂÑÀ : 50+d50 ¥¿¡¼¥óËè";
#else
- return "ball of elec and resist elec";
+ return "ball of elec (100) and resist elec every 50+d50 turns";
#endif
default:
#ifdef JP
info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤ÏÈó¾ï¤Ë»È¤¤¤ä¤¹¤¤¡£";
#else
- info[i++] = "It is made for riding.";
+ info[i++] = "It is made for use while riding.";
#endif
else
#ifdef JP
info[i++] = "¤½¤ì¤Ï¾èÇÏÃæ¤Ç¤â»È¤¤¤ä¤¹¤¤¡£";
#else
- info[i++] = "It is suitable for riding.";
+ info[i++] = "It is suitable for use while riding.";
#endif
}
#ifdef JP
info[i++] = "¤½¤ì¤ÏËâË¡¤ò¾§¤¨¤Ë¤¯¤¯¤¹¤ë¡£";
#else
- info[i++] = "It is unsuitable for spellcasting.";
+ info[i++] = "It encumbers you while spellcasting.";
#endif
}
{
cur_col++;
if (a & 0x80)
- Term_draw(cur_col, j + 1, 255, 255);
+ Term_draw(cur_col, j + 1, 255, -1);
}
cur_col += 2;
}
{
cur_col++;
if (a & 0x80)
- Term_draw(cur_col, j + 1, 255, 255);
+ Term_draw(cur_col, j + 1, 255, -1);
}
cur_col += 2;
}
if (item_tester_okay(&inventory[j]))
return TRUE;
- (void)scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x01);
if (floor_num)
return TRUE;
#ifdef ALLOW_EASY_FLOOR /* TNB */
- if (easy_floor) return get_item_floor(cp, pmt, str, mode);
+ if (easy_floor || use_menu) return get_item_floor(cp, pmt, str, mode);
#endif /* ALLOW_EASY_FLOOR -- TNB */
}
}
-
/* Require at least one legal choice */
if (!allow_floor && (i1 > i2) && (e1 > e2))
{
#ifdef JP
if (inven) strcat(out_val, format(" %s »ý¤Áʪ,", use_menu ? "'4'or'6'" : "'/'"));
#else
- if (inven) strcat(out_val, " / for Inven,");
+if (inven) strcat(out_val, format(" %s for Inven,", use_menu ? "4 or 6" : "'/'"));
#endif
}
case '\r':
case '\n':
{
- /* Validate the item */
- if (!get_item_okay(get_item_label))
+ if (command_wrk == USE_FLOOR)
{
- bell();
- break;
+ /* Special index */
+ (*cp) = -get_item_label;
}
-
- /* Allow player to "refuse" certain actions */
- if (!get_item_allow(get_item_label))
+ else
{
- done = TRUE;
- break;
+ /* Validate the item */
+ if (!get_item_okay(get_item_label))
+ {
+ bell();
+ break;
+ }
+
+ /* Allow player to "refuse" certain actions */
+ if (!get_item_allow(get_item_label))
+ {
+ done = TRUE;
+ break;
+ }
+
+ /* Accept that choice */
+ (*cp) = get_item_label;
}
- /* Accept that choice */
- (*cp) = get_item_label;
item = TRUE;
done = TRUE;
break;
* mode & 0x02 -- Marked items only
* mode & 0x04 -- Stop after first
*/
-bool scan_floor(int *items, int *item_num, int y, int x, int mode)
+int scan_floor(int *items, int y, int x, int mode)
{
int this_o_idx, next_o_idx;
int num = 0;
- (*item_num) = 0;
-
/* Sanity */
- if (!in_bounds(y, x)) return (FALSE);
+ if (!in_bounds(y, x)) return 0;
/* Scan all objects in the grid */
for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
if ((mode & 0x02) && !o_ptr->marked) continue;
/* Accept this item */
- items[num++] = this_o_idx;
+ /* XXX Hack -- Enforce limit */
+ if (num <= 23)
+ items[num] = this_o_idx;
+
+ num++;
/* Only one */
if (mode & 0x04) break;
-
- /* XXX Hack -- Enforce limit */
- if (num == 23) break;
}
- /* Number of items */
- (*item_num) = num;
-
/* Result */
- return (num != 0);
+ return num;
}
/*
* Display a list of the items on the floor at the given location.
*/
-int show_floor(int target_item, int y, int x)
+int show_floor(int target_item, int y, int x, int *min_width)
{
int i, j, k, l;
int col, len, lim;
Term_get_size(&wid, &hgt);
/* Default length */
- len = 20;
+ len = MAX((*min_width), 20);
/* Maximum space allowed for descriptions */
lim = wid - 4;
if (show_weights) lim -= 9;
/* Scan for objects in the grid, using item_tester_okay() */
- (void) scan_floor(floor_list, &floor_num, y, x, 0x01);
+ floor_num = scan_floor(floor_list, y, x, 0x01);
/* Display the inventory */
- for (k = 0, i = 0; i < floor_num; i++)
+ for (k = 0, i = 0; i < floor_num && i < 23; i++)
{
o_ptr = &o_list[floor_list[i]];
k++;
}
+ /* Save width */
+ *min_width = len;
+
/* Find the column to start in */
col = (len > wid - 4) ? 0 : (wid - len - 1);
char out_val[160];
int floor_num, floor_list[23], floor_top = 0;
+ int min_width = 0;
extern bool select_spellbook;
extern bool select_the_force;
if (floor)
{
/* Scan all objects in the grid */
- (void) scan_floor(floor_list, &floor_num, py, px, 0x01);
+ floor_num = scan_floor(floor_list, py, px, 0x01);
}
/* Accept inventory */
n2 = I2A(k - floor_top);
/* Redraw if needed */
- if (command_see) get_item_label = show_floor(menu_line, py, px);
+ if (command_see) get_item_label = show_floor(menu_line, py, px, &min_width);
}
/* Viewing inventory */
/* Append */
#ifdef JP
-if (allow_equip)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " '6' ÁõÈ÷ÉÊ,");
- else
- strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
- }
- else strcat(out_val, " '/' ÁõÈ÷ÉÊ,");
-}
-else if (select_the_force)
- strcat(out_val, " 'w'Îýµ¤½Ñ,");
+ if (allow_equip)
+ {
+ if (!use_menu)
+ strcat(out_val, " '/' ÁõÈ÷ÉÊ,");
+ else if (allow_floor)
+ strcat(out_val, " '6' ÁõÈ÷ÉÊ,");
+ else
+ strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
+ }
+ else if (select_the_force)
+ strcat(out_val, " 'w'Îýµ¤½Ñ,");
#else
-if (allow_equip)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " 6 for Equip,");
- else
- strcat(out_val, " 4 or 6 for Equip,");
- }
- else strcat(out_val, " / for Equip,");
-}
-else if (select_the_force)
- strcat(out_val, " w for the Force,");
+ if (allow_equip)
+ {
+ if (!use_menu)
+ strcat(out_val, " / for Equip,");
+ else if (allow_floor)
+ strcat(out_val, " 6 for Equip,");
+ else
+ strcat(out_val, " 4 or 6 for Equip,");
+ }
+ else if (select_the_force)
+ strcat(out_val, " w for the Force,");
#endif
/* Append */
+ if (allow_floor)
+ {
#ifdef JP
-if (allow_floor)
-{
- if (use_menu)
- {
- if (allow_equip)
- strcat(out_val, " '4' ¾²¾å,");
- else
- strcat(out_val, " '4'or'6' ¾²¾å,");
- }
- else strcat(out_val, " '-'¾²¾å,");
-}
+ if (!use_menu)
+ strcat(out_val, " '-'¾²¾å,");
+ if (allow_equip)
+ strcat(out_val, " '4' ¾²¾å,");
+ else
+ strcat(out_val, " '4'or'6' ¾²¾å,");
#else
- if (allow_floor) strcat(out_val, " - for floor,");
+ if (!use_menu)
+ strcat(out_val, " - for floor,");
+ if (allow_equip)
+ strcat(out_val, " 4 for floor,");
+ else
+ strcat(out_val, " 4 or 6 for floor,");
#endif
+ }
}
/* Append */
+ if (allow_inven)
+ {
#ifdef JP
-if (allow_inven)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " '4' »ý¤Áʪ,");
- else
- strcat(out_val, " '4'or'6' »ý¤Áʪ,");
- }
- else strcat(out_val, " '/' »ý¤Áʪ,");
-}
+ if (!use_menu)
+ strcat(out_val, " '/' »ý¤Áʪ,");
+ else if (allow_floor)
+ strcat(out_val, " '4' »ý¤Áʪ,");
+ else
+ strcat(out_val, " '4'or'6' »ý¤Áʪ,");
#else
- if (allow_inven) strcat(out_val, " / for Inven,");
-#endif
+ if (!use_menu)
+ strcat(out_val, " / for Inven,");
+ else if (allow_floor)
+ strcat(out_val, " 4 for Inven,");
+ else
+ strcat(out_val, " 4 or 6 for Inven,");
+#endif
+ }
/* Append */
+ if (allow_floor)
+ {
#ifdef JP
-if (allow_floor)
-{
- if (use_menu)
- {
- if (allow_floor)
- strcat(out_val, " '6' ¾²¾å,");
- else
- strcat(out_val, " '4'or'6' ¾²¾å,");
- }
- else strcat(out_val, " '-'¾²¾å,");
-}
+ if (!use_menu)
+ strcat(out_val, " '-'¾²¾å,");
+ else if (allow_inven)
+ strcat(out_val, " '6' ¾²¾å,");
+ else
+ strcat(out_val, " '4'or'6' ¾²¾å,");
#else
- if (allow_floor) strcat(out_val, " - for floor,");
+ if (!use_menu)
+ strcat(out_val, " - for floor,");
+ else if (allow_inven)
+ strcat(out_val, " 6 for floor,");
+ else
+ strcat(out_val, " 4 or 6 for floor,");
#endif
-
+ }
}
/* Viewing floor */
if (allow_inven && allow_equip)
{
#ifdef JP
-strcat(out_val, " '4' ÁõÈ÷ÉÊ, '6' »ý¤Áʪ,");
+ strcat(out_val, " '4' ÁõÈ÷ÉÊ, '6' »ý¤Áʪ,");
#else
- strcat(out_val, " / for Inven,");
+ strcat(out_val, " 4 for Equip, 6 for Inven,");
#endif
}
else if (allow_inven)
{
#ifdef JP
-strcat(out_val, " '4'or'6' »ý¤Áʪ,");
+ strcat(out_val, " '4'or'6' »ý¤Áʪ,");
#else
- strcat(out_val, " / for Inven,");
+ strcat(out_val, " 4 or 6 for Inven,");
#endif
}
else if (allow_equip)
{
#ifdef JP
-strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
+ strcat(out_val, " '4'or'6' ÁõÈ÷ÉÊ,");
#else
- strcat(out_val, " / for Equip,");
+ strcat(out_val, " 4 or 6 for Equip,");
#endif
}
else if (allow_inven)
{
#ifdef JP
-strcat(out_val, " '/' »ý¤Áʪ,");
+ strcat(out_val, " '/' »ý¤Áʪ,");
#else
strcat(out_val, " / for Inven,");
#endif
else if (allow_equip)
{
#ifdef JP
-strcat(out_val, " '/'ÁõÈ÷ÉÊ,");
+ strcat(out_val, " '/'ÁõÈ÷ÉÊ,");
#else
strcat(out_val, " / for Equip,");
#endif
}
+
+ /* Append */
+ if (command_see && !use_menu)
+ {
+#ifdef JP
+ strcat(out_val, " Enter ¼¡,");
+#else
+ strcat(out_val, " Enter for scroll down,");
+#endif
+ }
}
/* Finish the prompt */
int max_line = 1;
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
switch (which)
{
case ESCAPE:
/* Switch inven/equip */
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
if (menu_line > max_line) menu_line = max_line;
/* Need to redraw */
/* Switch inven/equip */
if (command_wrk == USE_INVEN) max_line = max_inven;
else if (command_wrk == USE_EQUIP) max_line = max_equip;
- else if (command_wrk == USE_FLOOR) max_line = floor_num;
+ else if (command_wrk == USE_FLOOR) max_line = MIN(23, floor_num);
if (menu_line > max_line) menu_line = max_line;
/* Need to redraw */
case '\r':
case '\n':
{
- /* Validate the item */
- if (!get_item_okay(get_item_label))
+ if (command_wrk == USE_FLOOR)
{
- bell();
- break;
+ /* Special index */
+ (*cp) = -get_item_label;
}
-
- /* Allow player to "refuse" certain actions */
- if (!get_item_allow(get_item_label))
+ else
{
- done = TRUE;
- break;
+ /* Validate the item */
+ if (!get_item_okay(get_item_label))
+ {
+ bell();
+ break;
+ }
+
+ /* Allow player to "refuse" certain actions */
+ if (!get_item_allow(get_item_label))
+ {
+ done = TRUE;
+ break;
+ }
+
+ /* Accept that choice */
+ (*cp) = get_item_label;
}
- /* Accept that choice */
- (*cp) = get_item_label;
item = TRUE;
done = TRUE;
break;
break;
}
+ case '\n':
+ case '\r':
+ case '+':
+ {
+ int i, o_idx;
+ cave_type *c_ptr = &cave[py][px];
+
+ if (command_wrk != (USE_FLOOR)) break;
+
+ /* Get the object being moved. */
+ o_idx = c_ptr->o_idx;
+
+ /* Only rotate a pile of two or more objects. */
+ if (!(o_idx && o_list[o_idx].next_o_idx)) break;
+
+ /* Remove the first object from the list. */
+ excise_object_idx(o_idx);
+
+ /* Find end of the list. */
+ i = c_ptr->o_idx;
+ while (o_list[i].next_o_idx)
+ i = o_list[i].next_o_idx;
+
+ /* Add after the last object. */
+ o_list[i].next_o_idx = o_idx;
+
+ /* Re-scan floor list */
+ floor_num = scan_floor(floor_list, py, px, 0x01);
+
+ /* Hack -- Fix screen */
+ if (command_see)
+ {
+ /* Load screen */
+ screen_load();
+
+ /* Save screen */
+ screen_save();
+ }
+
+ break;
+ }
+
case '/':
{
if (command_wrk == (USE_INVEN))
break;
}
- case '\n':
#if 0
+ case '\n':
case '\r':
-#endif
{
/* Choose "default" inventory item */
if (command_wrk == (USE_INVEN))
done = TRUE;
break;
}
+#endif
case 'w':
{
else if (command_wrk == USE_FLOOR)
{
k = islower(which) ? A2I(which) : -1;
- if (k < 0 || k >= floor_num)
+ if (k < 0 || k >= floor_num || k >= 23)
{
bell();
break;
}
/* Remember this object index */
- floor_list[floor_num] = this_o_idx;
+ if (floor_num <= 23)
+ floor_list[floor_num] = this_o_idx;
/* Count non-gold objects */
floor_num++;
- if (floor_num == 23) break;
-
/* Remember this index */
floor_o_idx = this_o_idx;
}
OSDN Git Service
