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

Healers gain experience by healing pets

Browse Source
This commit is contained in:
Pasi Kallinen
2024-12-07 12:50:59 +02:00
parent 9d68d171fb
commit a3f0b54aea
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes3-7-0.txt
+1
View File
@@ -2732,6 +2732,7 @@ enlightenment/attribute disclosure for saving-grace: include a line for have
normal play, the prefix is suppressed normal play, the prefix is suppressed
tourists gain experience by seeing new types of creatures up close, and tourists gain experience by seeing new types of creatures up close, and
going to new dungeon levels going to new dungeon levels
healers gain experience by healing pets
Platform- and/or Interface-Specific New Features Platform- and/or Interface-Specific New Features
src/zap.c
+13 -5
View File
@@ -426,11 +426,15 @@ bhitm(struct monst *mtmp, struct obj *otmp)
} }
break; break;
case SPE_HEALING: case SPE_HEALING:
case SPE_EXTRA_HEALING: case SPE_EXTRA_HEALING: {
int healamt = d(6, otyp == SPE_EXTRA_HEALING ? 8 : 4);
reveal_invis = TRUE; reveal_invis = TRUE;
if (mtmp->data != &mons[PM_PESTILENCE]) { if (mtmp->data != &mons[PM_PESTILENCE]) {
int delta = mtmp->mhpmax - mtmp->mhp;
wake = FALSE; /* wakeup() makes the target angry */ wake = FALSE; /* wakeup() makes the target angry */
mtmp->mhp += d(6, otyp == SPE_EXTRA_HEALING ? 8 : 4); mtmp->mhp += healamt;
if (mtmp->mhp > mtmp->mhpmax) if (mtmp->mhp > mtmp->mhpmax)
mtmp->mhp = mtmp->mhpmax; mtmp->mhp = mtmp->mhpmax;
/* plain healing must be blessed to cure blindness; extra /* plain healing must be blessed to cure blindness; extra
@@ -451,15 +455,19 @@ bhitm(struct monst *mtmp, struct obj *otmp)
pline("%s looks%s better.", Monnam(mtmp), pline("%s looks%s better.", Monnam(mtmp),
otyp == SPE_EXTRA_HEALING ? " much" : ""); otyp == SPE_EXTRA_HEALING ? " much" : "");
} }
if (mtmp->mtame && Role_if(PM_HEALER) && (delta > 0)) {
more_experienced(min(delta, healamt), 0);
newexplevel();
}
if (mtmp->mtame || mtmp->mpeaceful) { if (mtmp->mtame || mtmp->mpeaceful) {
adjalign(Role_if(PM_HEALER) ? 1 : sgn(u.ualign.type)); adjalign(Role_if(PM_HEALER) ? 1 : sgn(u.ualign.type));
} }
} else { /* Pestilence */ } else { /* Pestilence */
/* Pestilence will always resist; damage is half of 3d{4,8} */ /* Pestilence will always resist; damage is half of (healamt/2) */
(void) resist(mtmp, otmp->oclass, (void) resist(mtmp, otmp->oclass, healamt / 2, TELL);
d(3, otyp == SPE_EXTRA_HEALING ? 8 : 4), TELL);
} }
break; break;
}
case WAN_LIGHT: /* (broken wand) */ case WAN_LIGHT: /* (broken wand) */
if (flash_hits_mon(mtmp, otmp)) { if (flash_hits_mon(mtmp, otmp)) {
learn_it = TRUE; learn_it = TRUE;