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

tweaks to offering on other alignment's altar

Browse Source 
Mostly formatting, but also moves the call to the new routine.
This commit is contained in:
PatR
2023-02-06 16:24:03 -08:00
parent 834101396f
commit ce02aebfa6
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/pray.c
View File

@@ -1535,16 +1535,18 @@ offer_real_amulet(struct obj *otmp, aligntyp altaralign)
/*NOTREACHED*/ /*NOTREACHED*/
} }
/* possibly convert an altar's alignment or the hero's alignment */
static void static void
offer_different_alignment_altar(struct obj *otmp, aligntyp altaralign) offer_different_alignment_altar(
struct obj *otmp,
aligntyp altaralign)
{ {
/* Is this a conversion ? */ /* Is this a conversion ? */
/* An unaligned altar in Gehennom will always elicit rejection. */ /* An unaligned altar in Gehennom will always elicit rejection. */
if (ugod_is_angry() || (altaralign == A_NONE && Inhell)) { if (ugod_is_angry() || (altaralign == A_NONE && Inhell)) {
if (u.ualignbase[A_CURRENT] == u.ualignbase[A_ORIGINAL] if (u.ualignbase[A_CURRENT] == u.ualignbase[A_ORIGINAL]
&& altaralign != A_NONE) { && altaralign != A_NONE) {
You("have a strong feeling that %s is angry...", You("have a strong feeling that %s is angry...", u_gname());
u_gname());
consume_offering(otmp); consume_offering(otmp);
pline("%s accepts your allegiance.", a_gname()); pline("%s accepts your allegiance.", a_gname());
@@ -1564,8 +1566,7 @@ offer_different_alignment_altar(struct obj *otmp, aligntyp altaralign)
} }
} else { } else {
consume_offering(otmp); consume_offering(otmp);
You("sense a conflict between %s and %s.", u_gname(), You("sense a conflict between %s and %s.", u_gname(), a_gname());
a_gname());
if (rn2(8 + u.ulevel) > 5) { if (rn2(8 + u.ulevel) > 5) {
struct monst *pri; struct monst *pri;
boolean shrine; boolean shrine;
@@ -1580,11 +1581,9 @@ offer_different_alignment_altar(struct obj *otmp, aligntyp altaralign)
newsym(u.ux, u.uy); /* in case Invisible to self */ newsym(u.ux, u.uy); /* in case Invisible to self */
if (!Blind) if (!Blind)
pline_The("altar glows %s.", pline_The("altar glows %s.",
hcolor((u.ualign.type == A_LAWFUL) hcolor((u.ualign.type == A_LAWFUL) ? NH_WHITE
? NH_WHITE : u.ualign.type ? NH_BLACK
: u.ualign.type : (const char *) "gray"));
? NH_BLACK
: (const char *) "gray"));
if (rnl(u.ulevel) > 6 && u.ualign.record > 0 if (rnl(u.ulevel) > 6 && u.ualign.record > 0
&& rnd(u.ualign.record) > (3 * ALIGNLIM) / 4) && rnd(u.ualign.record) > (3 * ALIGNLIM) / 4)
@@ -1594,8 +1593,7 @@ offer_different_alignment_altar(struct obj *otmp, aligntyp altaralign)
&& !p_coaligned(pri)) && !p_coaligned(pri))
angry_priest(); angry_priest();
} else { } else {
pline("Unluckily, you feel the power of %s decrease.", pline("Unluckily, you feel the power of %s decrease.", u_gname());
u_gname());
change_luck(-1); change_luck(-1);
exercise(A_WIS, FALSE); exercise(A_WIS, FALSE);
if (rnl(u.ulevel) > 6 && u.ualign.record > 0 if (rnl(u.ulevel) > 6 && u.ualign.record > 0
@@ -1835,17 +1833,15 @@ dosacrifice(void)
desecrate_high_altar(altaralign); desecrate_high_altar(altaralign);
} else if (value < 0) { /* don't think the gods are gonna like this... */ } else if (value < 0) { /* don't think the gods are gonna like this... */
gods_upset(altaralign); gods_upset(altaralign);
} else if (u.ualign.type != altaralign) {
/* Sacrificing at an altar of a different alignment */
offer_different_alignment_altar(otmp, altaralign);
return ECMD_TIME;
} else { } else {
int saved_anger = u.ugangr; int saved_anger = u.ugangr;
int saved_cnt = u.ublesscnt; int saved_cnt = u.ublesscnt;
int saved_luck = u.uluck; int saved_luck = u.uluck;
/* Sacrificing at an altar of a different alignment */
if (u.ualign.type != altaralign) {
offer_different_alignment_altar(otmp, altaralign);
return ECMD_TIME;
}
consume_offering(otmp); consume_offering(otmp);
/* OK, you get brownie points. */ /* OK, you get brownie points. */
if (u.ugangr) { if (u.ugangr) {