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

Move check for starting L1 spellbook to include non-random spellbooks

Browse Source
This commit is contained in:
Matthew Everett
2022-06-11 15:29:37 -07:00
committed by PatR
parent fbd7d5cd37
commit f2bef98dac
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/u_init.c
+4 -3
View File
@@ -1082,9 +1082,6 @@ ini_inv(struct trobj *trop)
/* Don't have 2 of the same ring or spellbook */ /* Don't have 2 of the same ring or spellbook */
if (obj->oclass == RING_CLASS || obj->oclass == SPBOOK_CLASS) if (obj->oclass == RING_CLASS || obj->oclass == SPBOOK_CLASS)
g.nocreate4 = otyp; g.nocreate4 = otyp;
/* First spellbook should be level 1 - did we get it? */
if (obj->oclass == SPBOOK_CLASS && objects[obj->otyp].oc_level == 1)
got_sp1 = TRUE;
} }
if (g.urace.mnum != PM_HUMAN) { if (g.urace.mnum != PM_HUMAN) {
@@ -1183,6 +1180,10 @@ ini_inv(struct trobj *trop)
if (obj->oclass == SPBOOK_CLASS && obj->otyp != SPE_BLANK_PAPER) if (obj->oclass == SPBOOK_CLASS && obj->otyp != SPE_BLANK_PAPER)
initialspell(obj); initialspell(obj);
/* First spellbook should be level 1 - did we get it? */
if (obj->oclass == SPBOOK_CLASS && objects[obj->otyp].oc_level == 1)
got_sp1 = TRUE;
if (--trop->trquan) if (--trop->trquan)
continue; /* make a similar object */ continue; /* make a similar object */
trop++; trop++;