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

split offering fake amulet into separate function

Browse Source
This commit is contained in:
SHIRAKATA Kentaro
2023-05-20 04:16:49 +09:00
committed by PatR
parent 060398abec
commit 97edd4b845
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/pray.c
View File

@@ -23,6 +23,7 @@ static void consume_offering(struct obj *);
static void offer_too_soon(aligntyp); static void offer_too_soon(aligntyp);
static void desecrate_high_altar(aligntyp); static void desecrate_high_altar(aligntyp);
static void offer_real_amulet(struct obj *, aligntyp); /* NORETURN */ static void offer_real_amulet(struct obj *, aligntyp); /* NORETURN */
static void offer_fake_amulet(struct obj *, boolean, aligntyp);
static void offer_different_alignment_altar(struct obj *, aligntyp); static void offer_different_alignment_altar(struct obj *, aligntyp);
static int bestow_artifact(void); static int bestow_artifact(void);
static boolean pray_revive(void); static boolean pray_revive(void);
@@ -1548,6 +1549,39 @@ offer_real_amulet(struct obj *otmp, aligntyp altaralign)
/*NOTREACHED*/ /*NOTREACHED*/
} }
static void
offer_fake_amulet(
struct obj *otmp,
boolean highaltar,
aligntyp altaralign)
{
if (!highaltar && !otmp->known) {
offer_too_soon(altaralign);
return;
}
Soundeffect(se_thunderclap, 100);
You_hear("a nearby thunderclap.");
if (!otmp->known) {
You("realize you have made a %s.",
Hallucination ? "boo-boo" : "mistake");
otmp->known = TRUE;
change_luck(-1);
} else {
/* don't you dare try to fool the gods */
if (Deaf)
pline("Oh, no."); /* didn't hear thunderclap */
change_luck(-3);
adjalign(-1);
u.ugangr += 3;
/* value = -3; */
if (altaralign != u.ualign.type && highaltar) {
desecrate_high_altar(altaralign);
} else { /* value < 0 */
gods_upset(altaralign);
}
}
}
/* possibly convert an altar's alignment or the hero's alignment */ /* possibly convert an altar's alignment or the hero's alignment */
static void static void
offer_different_alignment_altar( offer_different_alignment_altar(
@@ -1864,27 +1898,8 @@ dosacrifice(void)
} /* real Amulet */ } /* real Amulet */
if (otmp->otyp == FAKE_AMULET_OF_YENDOR) { if (otmp->otyp == FAKE_AMULET_OF_YENDOR) {
if (!highaltar && !otmp->known) { offer_fake_amulet(otmp, highaltar, altaralign);
offer_too_soon(altaralign); return ECMD_TIME;
return ECMD_TIME;
}
Soundeffect(se_thunderclap, 100);
You_hear("a nearby thunderclap.");
if (!otmp->known) {
You("realize you have made a %s.",
Hallucination ? "boo-boo" : "mistake");
otmp->known = TRUE;
change_luck(-1);
return ECMD_TIME;
} else {
/* don't you dare try to fool the gods */
if (Deaf)
pline("Oh, no."); /* didn't hear thunderclap */
change_luck(-3);
adjalign(-1);
u.ugangr += 3;
value = -3;
}
} /* fake Amulet */ } /* fake Amulet */
if (value == 0) { if (value == 0) {