#include "angband.h"
+#define MIN_STOCK 12
-#ifdef JP
-/* ²¼¤ÎÊý¤«¤é°ÜÆ°¤·¤Æ¤¤Þ¤·¤¿ */
static int cur_store_num = 0;
static int store_top = 0;
+static int store_bottom = 0;
+static int xtra_stock = 0;
static store_type *st_ptr = NULL;
-static owner_type *ot_ptr = NULL;
-#endif
+static const owner_type *ot_ptr = NULL;
static s16b old_town_num = 0;
static s16b inner_town_num = 0;
#define RUMOR_CHANCE 8
*/
static void say_comment_1(void)
{
- char rumour[1024];
-
#ifdef JP
/* ¥Ö¥é¥Ã¥¯¥Þ¡¼¥±¥Ã¥È¤Î¤È¤¤ÏÊ̤Υá¥Ã¥»¡¼¥¸¤ò½Ð¤¹ */
if ( cur_store_num == STORE_BLACK ) {
if (one_in_(RUMOR_CHANCE))
{
#ifdef JP
-msg_print("Ź¼ç¤Ï¼ª¤¦¤Á¤·¤¿:");
+ msg_print("Ź¼ç¤Ï¼ª¤¦¤Á¤·¤¿:");
#else
msg_print("The shopkeeper whispers something into your ear:");
#endif
-
-
-#ifdef JP
-if (!get_rnd_line_jonly("rumors_j.txt", 0, rumour, 10))
-#else
- if (!get_rnd_line("rumors.txt", 0, rumour))
-#endif
-
- msg_print(rumour);
+ display_rumor(TRUE);
}
}
-
-
-#ifdef JP
-/* ÆüËܸìÈǤξì¹ç¤Ï¾å¤ÎÊý¤Ë°ÜÆ°¤·¤Æ¤¢¤ê¤Þ¤¹ */
-#else
-/*
- * We store the current "store number" here so everyone can access it
- */
-static int cur_store_num = 7;
-
-/*
- * We store the current "store page" here so everyone can access it
- */
-static int store_top = 0;
-
-/*
- * We store the current "store pointer" here so everyone can access it
- */
-static store_type *st_ptr = NULL;
-
-/*
- * We store the current "owner type" here so everyone can access it
- */
-static owner_type *ot_ptr = NULL;
-#endif
-
/*
* We store the current "store feat" here so everyone can access it
*/
static int cur_store_feat;
-
-
-
-
-
/*
* Buying and selling adjustments for race combinations.
* Entry[owner][player] gives the basic "cost inflation".
/*Hum, HfE, Elf, Hal, Gno, Dwa, HfO, HfT, Dun, HiE, Barbarian,
HfOg, HGn, HTn, Cyc, Yek, Klc, Kbd, Nbl, DkE, Drc, Mind Flayer,
Imp, Glm, Skl, Zombie, Vampire, Spectre, Fairy, Beastman, Ent,
- Angel, Demon, Kuta*/
+ Angel, Demon, Kutar */
/* Human */
{ 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120,
110, 101, 115, 110 },
- /* Kuta */
+ /* Kutar */
{ 110, 110, 105, 105, 110, 115, 115, 115, 110, 105, 110,
115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
115, 115, 125, 125, 125, 125, 105, 115, 105, 95, 140,
case TV_CRUSADE_BOOK:
case TV_MUSIC_BOOK:
case TV_HISSATSU_BOOK:
+ case TV_HEX_BOOK:
{
if (cost <= 50L) size += damroll(2, 3);
if (cost <= 500L) size += damroll(1, 3);
if (cost < 1601L) size += damroll(1, 5);
else if (cost < 3201L) size += damroll(1, 3);
}
-
- /* Ensure that mass-produced rods and wands get the correct pvals. */
- if ((o_ptr->tval == TV_ROD) || (o_ptr->tval == TV_WAND))
- {
- o_ptr->pval *= size;
- }
break;
}
}
/* Save the total pile size */
o_ptr->number = size - (size * discount / 100);
+
+ /* Ensure that mass-produced rods and wands get the correct pvals. */
+ if ((o_ptr->tval == TV_ROD) || (o_ptr->tval == TV_WAND))
+ {
+ o_ptr->pval *= o_ptr->number;
+ }
}
case TV_CRAFT_BOOK:
case TV_DAEMON_BOOK:
case TV_MUSIC_BOOK:
+ case TV_HEX_BOOK:
case TV_AMULET:
case TV_RING:
case TV_STAFF:
case TV_DAEMON_BOOK:
case TV_CRUSADE_BOOK:
case TV_MUSIC_BOOK:
+ case TV_HEX_BOOK:
break;
default:
return (FALSE);
o_ptr = &st_ptr->stock[pos];
/* Get the "offset" */
- i = (pos % 12);
+ i = (pos % store_bottom);
/* Label it, clear the line --(-- */
- (void)sprintf(out_val, "%c) ", I2A(i));
+ (void)sprintf(out_val, "%c) ", ((i > 25) ? toupper(I2A(i - 26)) : I2A(i)));
prt(out_val, i+6, 0);
cur_col = 3;
int i, k;
/* Display the next 12 items */
- for (k = 0; k < 12; k++)
+ for (k = 0; k < store_bottom; k++)
{
/* Do not display "dead" items */
if (store_top + k >= st_ptr->stock_num) break;
}
/* Erase the extra lines and the "more" prompt */
- for (i = k; i < 13; i++) prt("", i + 6, 0);
+ for (i = k; i < store_bottom + 1; i++) prt("", i + 6, 0);
/* Assume "no current page" */
#ifdef JP
/* Visual reminder of "more items" */
- if (st_ptr->stock_num > 12)
+ if (st_ptr->stock_num > store_bottom)
{
/* Show "more" reminder (after the last item) */
#ifdef JP
/* Indicate the "current page" */
/* Trailing spaces are to display (Page xx) and (Page x) */
#ifdef JP
- put_str(format("(%d¥Ú¡¼¥¸) ", store_top/12 + 1), 5, 20);
+ put_str(format("(%d¥Ú¡¼¥¸) ", store_top/store_bottom + 1), 5, 20);
#else
- put_str(format("(Page %d) ", store_top/12 + 1), 5, 20);
+ put_str(format("(Page %d) ", store_top/store_bottom + 1), 5, 20);
#endif
}
+
+ if (cur_store_num == STORE_HOME || cur_store_num == STORE_MUSEUM)
+ {
+ k = st_ptr->stock_size;
+
+ if (cur_store_num == STORE_HOME && !powerup_home) k /= 10;
+#ifdef JP
+ put_str(format("¥¢¥¤¥Æ¥à¿ô: %4d/%4d", st_ptr->stock_num, k), 19 + xtra_stock, 27);
+#else
+ put_str(format("Objects: %4d/%4d", st_ptr->stock_num, k), 19 + xtra_stock, 30);
+#endif
+ }
}
char out_val[64];
#ifdef JP
- prt("¼ê»ý¤Á¤Î¤ª¶â: ", 19, 53);
+ prt("¼ê»ý¤Á¤Î¤ª¶â: ", 19 + xtra_stock, 53);
#else
- prt("Gold Remaining: ", 19, 53);
+ prt("Gold Remaining: ", 19 + xtra_stock, 53);
#endif
sprintf(out_val, "%9ld", (long)p_ptr->au);
- prt(out_val, 19, 68);
+ prt(out_val, 19 + xtra_stock, 68);
}
static int get_stock(int *com_val, cptr pmt, int i, int j)
{
char command;
-
char out_val[160];
+ char lo, hi;
#ifdef ALLOW_REPEAT /* TNB */
*com_val = (-1);
/* Build the prompt */
+ lo = I2A(i);
+ hi = (j > 25) ? toupper(I2A(j - 26)) : I2A(j);
#ifdef JP
(void)sprintf(out_val, "(%s:%c-%c, ESC¤ÇÃæÃÇ) %s",
(((cur_store_num == STORE_HOME) || (cur_store_num == STORE_MUSEUM)) ? "¥¢¥¤¥Æ¥à" : "¾¦ÉÊ"),
- I2A(i), I2A(j), pmt);
+ lo, hi, pmt);
#else
(void)sprintf(out_val, "(Items %c-%c, ESC to exit) %s",
- I2A(i), I2A(j), pmt);
+ lo, hi, pmt);
#endif
if (!get_com(out_val, &command, FALSE)) break;
/* Convert */
- k = (islower(command) ? A2I(command) : -1);
+ if (islower(command))
+ k = A2I(command);
+ else if (isupper(command))
+ k = A2I(tolower(command)) + 26;
+ else
+ k = -1;
/* Legal responses */
if ((k >= i) && (k <= j))
char out_val[160];
-
if (cur_store_num == STORE_MUSEUM)
{
#ifdef JP
i = (st_ptr->stock_num - store_top);
/* And then restrict it to the current page */
- if (i > 12) i = 12;
+ if (i > store_bottom) i = store_bottom;
/* Prompt */
#ifdef JP
else if (st_ptr->stock_num != i)
{
/* Pick the correct screen */
- if (store_top >= st_ptr->stock_num) store_top -= 12;
+ if (store_top >= st_ptr->stock_num) store_top -= store_bottom;
/* Redraw everything */
display_inventory();
if (st_ptr->stock_num == 0) store_top = 0;
/* Nothing left on that screen */
- else if (store_top >= st_ptr->stock_num) store_top -= 12;
+ else if (store_top >= st_ptr->stock_num) store_top -= store_bottom;
/* Redraw everything */
display_inventory();
/* Re-display if item is now in store */
if (item_pos >= 0)
{
- store_top = (item_pos / 12) * 12;
+ store_top = (item_pos / store_bottom) * store_bottom;
display_inventory();
}
}
/* Update store display */
if (item_pos >= 0)
{
- store_top = (item_pos / 12) * 12;
+ store_top = (item_pos / store_bottom) * store_bottom;
display_inventory();
}
}
/* Update store display */
if (item_pos >= 0)
{
- store_top = (item_pos / 12) * 12;
+ store_top = (item_pos / store_bottom) * store_bottom;
display_inventory();
}
}
i = (st_ptr->stock_num - store_top);
/* And then restrict it to the current page */
- if (i > 12) i = 12;
+ if (i > store_bottom) i = store_bottom;
/* Prompt */
#ifdef JP
i = st_ptr->stock_num - store_top;
/* And then restrict it to the current page */
- if (i > 12) i = 12;
+ if (i > store_bottom) i = store_bottom;
/* Prompt */
#ifdef JP
if (st_ptr->stock_num == 0) store_top = 0;
/* Nothing left on that screen */
- else if (store_top >= st_ptr->stock_num) store_top -= 12;
+ else if (store_top >= st_ptr->stock_num) store_top -= store_bottom;
/* Redraw everything */
display_inventory();
/* 1 ¥Ú¡¼¥¸Ìá¤ë¥³¥Þ¥ó¥É: ²æ¤¬²È¤Î¥Ú¡¼¥¸¿ô¤¬Â¿¤¤¤Î¤Ç½ÅÊõ¤¹¤ë¤Ï¤º By BUG */
case '-':
{
- if (st_ptr->stock_num <= 12) {
+ if (st_ptr->stock_num <= store_bottom) {
#ifdef JP
msg_print("¤³¤ì¤ÇÁ´Éô¤Ç¤¹¡£");
#else
#endif
}
else{
- store_top -= 12;
+ store_top -= store_bottom;
if ( store_top < 0 )
- store_top = ((st_ptr->stock_num - 1 )/12) * 12;
+ store_top = ((st_ptr->stock_num - 1 )/store_bottom) * store_bottom;
if ( (cur_store_num == STORE_HOME) && (powerup_home == FALSE) )
- if ( store_top >= 12 ) store_top = 12;
+ if ( store_top >= store_bottom ) store_top = store_bottom;
display_inventory();
}
break;
/* Browse */
case ' ':
{
- if (st_ptr->stock_num <= 12)
+ if (st_ptr->stock_num <= store_bottom)
{
#ifdef JP
msg_print("¤³¤ì¤ÇÁ´Éô¤Ç¤¹¡£");
}
else
{
- store_top += 12;
+ store_top += store_bottom;
/*
* ±£¤·¥ª¥×¥·¥ç¥ó(powerup_home)¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤Ï
* ²æ¤¬²È¤Ç¤Ï 2 ¥Ú¡¼¥¸¤Þ¤Ç¤·¤«É½¼¨¤·¤Ê¤¤
else if (p_ptr->pclass == CLASS_SMITH)
do_cmd_kaji(TRUE);
else if (p_ptr->pclass == CLASS_MAGIC_EATER)
- do_cmd_magic_eater(TRUE);
+ do_cmd_magic_eater(TRUE, FALSE);
+ else if (p_ptr->pclass == CLASS_SNIPER)
+ do_cmd_snipe_browse();
else do_cmd_browse();
break;
}
int i;
cave_type *c_ptr;
bool need_redraw_store_inv; /* To redraw missiles damage and prices in store */
+ int w, h;
+
+ /* Get term size */
+ Term_get_size(&w, &h);
+ /* Calculate stocks per 1 page */
+ xtra_stock = MIN(14+26, ((h > 24) ? (h - 24) : 0));
+ store_bottom = MIN_STOCK + xtra_stock;
/* Access the player grid */
c_ptr = &cave[py][px];
/* No automatic command */
command_new = 0;
+ /* Do not expand macros */
+ get_com_no_macros = TRUE;
/* Save the store number */
cur_store_num = which;
prt("", 1, 0);
/* Clear */
- clear_from(20);
+ clear_from(20 + xtra_stock);
/* Basic commands */
#ifdef JP
- prt(" ESC) ·úʪ¤«¤é½Ð¤ë", 21, 0);
+ prt(" ESC) ·úʪ¤«¤é½Ð¤ë", 21 + xtra_stock, 0);
#else
- prt(" ESC) Exit from Building.", 21, 0);
+ prt(" ESC) Exit from Building.", 21 + xtra_stock, 0);
#endif
/* Browse if necessary */
- if (st_ptr->stock_num > 12)
+ if (st_ptr->stock_num > store_bottom)
{
#ifdef JP
- prt(" -)Á°¥Ú¡¼¥¸", 22, 0);
- prt(" ¥¹¥Ú¡¼¥¹) ¼¡¥Ú¡¼¥¸", 23, 0);
+ prt(" -)Á°¥Ú¡¼¥¸", 22 + xtra_stock, 0);
+ prt(" ¥¹¥Ú¡¼¥¹) ¼¡¥Ú¡¼¥¸", 23 + xtra_stock, 0);
#else
- prt(" -) Previous page", 22, 0);
- prt(" SPACE) Next page", 23, 0);
+ prt(" -) Previous page", 22 + xtra_stock, 0);
+ prt(" SPACE) Next page", 23 + xtra_stock, 0);
#endif
}
if (cur_store_num == STORE_HOME)
{
#ifdef JP
- prt("g) ¥¢¥¤¥Æ¥à¤ò¼è¤ë", 21, 27);
- prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 22, 27);
- prt("x) ²È¤Î¥¢¥¤¥Æ¥à¤òÄ´¤Ù¤ë", 23,27);
+ prt("g) ¥¢¥¤¥Æ¥à¤ò¼è¤ë", 21 + xtra_stock, 27);
+ prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 22 + xtra_stock, 27);
+ prt("x) ²È¤Î¥¢¥¤¥Æ¥à¤òÄ´¤Ù¤ë", 23 + xtra_stock, 27);
#else
- prt("g) Get an item.", 21, 27);
- prt("d) Drop an item.", 22, 27);
- prt("x) eXamine an item in the home.", 23,27);
+ prt("g) Get an item.", 21 + xtra_stock, 27);
+ prt("d) Drop an item.", 22 + xtra_stock, 27);
+ prt("x) eXamine an item in the home.", 23 + xtra_stock, 27);
#endif
}
else if (cur_store_num == STORE_MUSEUM)
{
#ifdef JP
- prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 21, 27);
- prt("r) ¥¢¥¤¥Æ¥à¤ÎŸ¼¨¤ò¤ä¤á¤ë", 22, 27);
- prt("x) Çîʪ´Û¤Î¥¢¥¤¥Æ¥à¤òÄ´¤Ù¤ë", 23, 27);
+ prt("d) ¥¢¥¤¥Æ¥à¤òÃÖ¤¯", 21 + xtra_stock, 27);
+ prt("r) ¥¢¥¤¥Æ¥à¤ÎŸ¼¨¤ò¤ä¤á¤ë", 22 + xtra_stock, 27);
+ prt("x) Çîʪ´Û¤Î¥¢¥¤¥Æ¥à¤òÄ´¤Ù¤ë", 23 + xtra_stock, 27);
#else
- prt("d) Drop an item.", 21, 27);
- prt("r) order to Remove an item.", 22, 27);
- prt("x) eXamine an item in the museum.", 23, 27);
+ prt("d) Drop an item.", 21 + xtra_stock, 27);
+ prt("r) order to Remove an item.", 22 + xtra_stock, 27);
+ prt("x) eXamine an item in the museum.", 23 + xtra_stock, 27);
#endif
}
else
{
#ifdef JP
- prt("p) ¾¦ÉʤòÇ㤦", 21, 30);
- prt("s) ¥¢¥¤¥Æ¥à¤òÇä¤ë", 22, 30);
- prt("x) ¾¦ÉʤòÄ´¤Ù¤ë", 23,30);
+ prt("p) ¾¦ÉʤòÇ㤦", 21 + xtra_stock, 30);
+ prt("s) ¥¢¥¤¥Æ¥à¤òÇä¤ë", 22 + xtra_stock, 30);
+ prt("x) ¾¦ÉʤòÄ´¤Ù¤ë", 23 + xtra_stock,30);
#else
- prt("p) Purchase an item.", 21, 30);
- prt("s) Sell an item.", 22, 30);
- prt("x) eXamine an item in the shop", 23,30);
+ prt("p) Purchase an item.", 21 + xtra_stock, 30);
+ prt("s) Sell an item.", 22 + xtra_stock, 30);
+ prt("x) eXamine an item in the shop", 23 + xtra_stock,30);
#endif
}
#ifdef JP
/* ´ðËÜŪ¤Ê¥³¥Þ¥ó¥É¤ÎÄɲÃɽ¼¨ */
- prt("i/e) »ý¤Áʪ/ÁõÈ÷¤Î°ìÍ÷", 21, 56);
+ prt("i/e) »ý¤Áʪ/ÁõÈ÷¤Î°ìÍ÷", 21 + xtra_stock, 56);
if (rogue_like_commands)
{
- prt("w/T) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22, 56);
+ prt("w/T) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22 + xtra_stock, 56);
}
else
{
- prt("w/t) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22, 56);
+ prt("w/t) ÁõÈ÷¤¹¤ë/¤Ï¤º¤¹", 22 + xtra_stock, 56);
}
#else
- prt("i/e) Inventry/Equipment list", 21, 56);
+ prt("i/e) Inventry/Equipment list", 21 + xtra_stock, 56);
if (rogue_like_commands)
{
- prt("w/T) Wear/Take off equipment", 22, 56);
+ prt("w/T) Wear/Take off equipment", 22 + xtra_stock, 56);
}
else
{
- prt("w/t) Wear/Take off equipment", 22, 56);
+ prt("w/t) Wear/Take off equipment", 22 + xtra_stock, 56);
}
#endif
/* Prompt */
#ifdef JP
- prt("¥³¥Þ¥ó¥É:", 20, 0);
+ prt("¥³¥Þ¥ó¥É:", 20 + xtra_stock, 0);
#else
- prt("You may: ", 20, 0);
+ prt("You may: ", 20 + xtra_stock, 0);
#endif
/* Redraw the home */
if (item_pos >= 0)
{
- store_top = (item_pos / 12) * 12;
+ store_top = (item_pos / store_bottom) * store_bottom;
display_inventory();
}
}
/* Hack -- Cancel "see" mode */
command_see = FALSE;
+ /* Allow expanding macros */
+ get_com_no_macros = FALSE;
/* Flush messages XXX XXX XXX */
msg_print(NULL);
OSDN Git Service
