Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resource visibility, code clarification.

This commit is contained in:
Enno Rehling 2020-09-12 18:58:45 +02:00
parent 7987317697
commit be17f600eb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kernel/resources.c
View File

@ -122,12 +122,13 @@ static int visible_default(const rawmaterial * res, int skilllevel)
* plus current level of difficulty */ * plus current level of difficulty */
{ {
const struct item_type *itype = res->rtype->itype; const struct item_type *itype = res->rtype->itype;
int level = res->level + itype->construction->minskill - 1;
if (res->level <= 1 if (res->level <= 1
&& res->level + itype->construction->minskill <= skilllevel + 1) { && level <= skilllevel) {
assert(res->amount > 0); assert(res->amount > 0);
return res->amount; return res->amount;
} }
else if (res->level + itype->construction->minskill <= skilllevel + 2) { else if (level < skilllevel) {
assert(res->amount > 0); assert(res->amount > 0);
return res->amount; 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 */ /* resources are visible if skill equals half as much as normal */
{ {
const struct item_type *itype = res->rtype->itype; 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 res->amount;
} }
return -1; return -1;