nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Unify strength string

Browse Source
This commit is contained in:
Pasi Kallinen
2017-08-06 22:56:07 +03:00
parent 1f671b962c
commit 152ddf4a4b
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/botl.c
View File

@@ -13,6 +13,25 @@ const char *const enc_stat[] = { "", "Burdened", "Stressed",
STATIC_OVL NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */ STATIC_OVL NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */
STATIC_DCL const char *NDECL(rank); STATIC_DCL const char *NDECL(rank);
static char *
get_strength_str()
{
static char buf[32];
int st = ACURR(A_STR);
if (st > 18) {
if (st > STR18(100))
Sprintf(buf, "%2d", st - 100);
else if (st < STR18(100))
Sprintf(buf, "18/%02d", st - 18);
else
Sprintf(buf, "18/**");
} else
Sprintf(buf, "%-1d", st);
return buf;
}
#if !defined(STATUS_VIA_WINDOWPORT) || defined(DUMPLOG) #if !defined(STATUS_VIA_WINDOWPORT) || defined(DUMPLOG)
char * char *
@@ -48,16 +67,9 @@ do_statusline1()
j = (int) ((nb + 2) - newbot1); /* strlen(newbot1) but less computation */ j = (int) ((nb + 2) - newbot1); /* strlen(newbot1) but less computation */
if ((i - j) > 0) if ((i - j) > 0)
Sprintf(nb = eos(nb), "%*s", i - j, " "); /* pad with spaces */ Sprintf(nb = eos(nb), "%*s", i - j, " "); /* pad with spaces */
if (ACURR(A_STR) > 18) {
if (ACURR(A_STR) > STR18(100)) Sprintf(nb = eos(nb), "St:%s Dx:%-1d Co:%-1d In:%-1d Wi:%-1d Ch:%-1d",
Sprintf(nb = eos(nb), "St:%2d ", ACURR(A_STR) - 100); get_strength_str(),
else if (ACURR(A_STR) < STR18(100))
Sprintf(nb = eos(nb), "St:18/%02d ", ACURR(A_STR) - 18);
else
Sprintf(nb = eos(nb), "St:18/** ");
} else
Sprintf(nb = eos(nb), "St:%-1d ", ACURR(A_STR));
Sprintf(nb = eos(nb), "Dx:%-1d Co:%-1d In:%-1d Wi:%-1d Ch:%-1d",
ACURR(A_DEX), ACURR(A_CON), ACURR(A_INT), ACURR(A_WIS), ACURR(A_DEX), ACURR(A_CON), ACURR(A_INT), ACURR(A_WIS),
ACURR(A_CHA)); ACURR(A_CHA));
Sprintf(nb = eos(nb), Sprintf(nb = eos(nb),
@@ -470,18 +482,8 @@ bot()
valset[BL_TITLE] = TRUE; /* indicate val already set */ valset[BL_TITLE] = TRUE; /* indicate val already set */
/* Strength */ /* Strength */
buf[0] = '\0';
blstats[idx][BL_STR].a.a_int = ACURR(A_STR); blstats[idx][BL_STR].a.a_int = ACURR(A_STR);
if (ACURR(A_STR) > 18) { Strcpy(blstats[idx][BL_STR].val, get_strength_str());
if (ACURR(A_STR) > STR18(100))
Sprintf(buf, "%2d", ACURR(A_STR) - 100);
else if (ACURR(A_STR) < STR18(100))
Sprintf(buf, "18/%02d", ACURR(A_STR) - 18);
else
Sprintf(buf, "18/**");
} else
Sprintf(buf, "%-1d", ACURR(A_STR));
Strcpy(blstats[idx][BL_STR].val, buf);
valset[BL_STR] = TRUE; /* indicate val already set */ valset[BL_STR] = TRUE; /* indicate val already set */
/* Dexterity, constitution, intelligence, wisdom, charisma. */ /* Dexterity, constitution, intelligence, wisdom, charisma. */