From be17f600eb288e4e2c54847f2d69d6ce59a443d2 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 12 Sep 2020 18:58:45 +0200 Subject: [PATCH] resource visibility, code clarification. --- src/kernel/resources.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/kernel/resources.c b/src/kernel/resources.c index ecc92ee93..6c93a0a13 100644 --- a/src/kernel/resources.c +++ b/src/kernel/resources.c @@ -122,12 +122,13 @@ static int visible_default(const rawmaterial * res, int skilllevel) * plus current level of difficulty */ { const struct item_type *itype = res->rtype->itype; + int level = res->level + itype->construction->minskill - 1; if (res->level <= 1 - && res->level + itype->construction->minskill <= skilllevel + 1) { + && level <= skilllevel) { assert(res->amount > 0); return res->amount; } - else if (res->level + itype->construction->minskill <= skilllevel + 2) { + else if (level < skilllevel) { assert(res->amount > 0); return res->amount; } @@ -138,7 +139,8 @@ static int visible_half_skill(const rawmaterial * res, int skilllevel) /* resources are visible if skill equals half as much as normal */ { const struct item_type *itype = res->rtype->itype; - if (res->level + itype->construction->minskill < 2 * (skilllevel + 1)) { + int level = res->level + itype->construction->minskill - 1; + if (2 * skilllevel >= level) { return res->amount; } return -1;