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

Rejigger anti-magic traps

Browse Source 
My changes were too drastic, so reduce the drain and damage so it
matches all the other traps. Now the anti-magic trap will always
ding your max energy a bit, in addition to the physical damage done
if wearing magic resistance.
This commit is contained in:
Pasi Kallinen
2022-07-12 20:24:27 +03:00
parent 0059ced578
commit 5c7c9d10ae
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mklev.c
View File

@@ -1435,7 +1435,6 @@ mktrap(
if (lvl < 5)
kind = NO_TRAP;
break;
case ANTI_MAGIC:
case LANDMINE:
if (lvl < 6)
kind = NO_TRAP;

19
src/trap.c
View File

@@ -2037,17 +2037,13 @@ trapeffect_anti_magic(
unsigned int trflags UNUSED)
{
if (mtmp == &g.youmonst) {
int drain = (u.uen > 1) ? (rnd(u.uen / 2) + 2) : 4;
int drain = d(2, 6);
int halfd = rnd(((drain + 1) / 2));
seetrap(trap);
/* hero without magic resistance loses spell energy,
hero with magic resistance takes damage instead;
possibly non-intuitive but useful for play balance */
if (!Antimagic) {
drain_en(drain);
} else {
if (Antimagic) {
struct obj *otmp;
int dmgval2 = rnd(drain), hp = Upolyd ? u.mh : u.uhp;
int dmgval2 = rnd(4), hp = Upolyd ? u.mh : u.uhp;
/* Half_XXX_damage has opposite its usual effect (approx)
but isn't cumulative if hero has more than one */
@@ -2074,6 +2070,11 @@ trapeffect_anti_magic(
/* opposite of magical explosion */
losehp(dmgval2, "anti-magic implosion", KILLED_BY_AN);
}
if (u.uenmax > halfd) {
u.uenmax -= halfd;
drain -= halfd;
}
drain_en(drain);
} else {
boolean trapkilled = FALSE;
boolean in_sight = canseemon(mtmp) || (mtmp == u.usteed);
@@ -2084,7 +2085,7 @@ trapeffect_anti_magic(
if (!resists_magm(mtmp)) { /* lose spell energy */
if (!mtmp->mcan && (attacktype(mptr, AT_MAGC)
|| attacktype(mptr, AT_BREA))) {
mtmp->mspec_used += d(2, 2);
mtmp->mspec_used += d(2, 6);
if (in_sight) {
seetrap(trap);
pline("%s seems lethargic.", Monnam(mtmp));