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

Dehardcode the monk minetown food shop conversion

Browse Source 
Instead of trying to figure out in core whether to change a minetown
food shop to health food shop for monks, just figure it out in the
minetown level creation script.
This commit is contained in:
Pasi Kallinen
2020-04-16 21:01:24 +03:00
parent 10a89a529c
commit 7c44e06ab1
9 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nhlua.c
View File

@@ -929,6 +929,9 @@ lua_State *L;
if (!strcmp(tkey, "inventory")) {
nhl_push_obj(L, g.invent);
return 1;
} else if (!strcmp(tkey, "role")) {
lua_pushstring(L, g.urole.name.m);
return 1;
}
nhl_error(L, "Unknown u table index");

9
src/shknam.c
View File

@@ -498,13 +498,6 @@ const char *const *nlp;
int name_wanted;
s_level *sptr;
if (nlp == shkfoods && In_mines(&u.uz) && Role_if(PM_MONK)
&& (sptr = Is_special(&u.uz)) != 0 && sptr->flags.town) {
/* special-case override for minetown food store for monks */
nlp = shkhealthfoods;
ESHK(shk)->shoptype = FODDERSHOP;
}
if (nlp == shklight && In_mines(&u.uz)
&& (sptr = Is_special(&u.uz)) != 0 && sptr->flags.town) {
/* special-case minetown lighting shk */
@@ -676,8 +669,6 @@ struct mkroom *sroom;
if (shp->shknms == shkrings)
(void) mongets(shk, TOUCHSTONE);
nameshk(shk, shp->shknms);
/* might have changed delicatessen to health food store */
sroom->rtype = eshkp->shoptype;
return sh;
}