From 8dfb62a9d66da771ed9578a446d1e7a9e2e87e35 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Fri, 2 Sep 2011 21:44:09 +0000 Subject: [PATCH] jabberwock hands Revert a change from five weeks ago which added M1_NOHANDS to the jabberwock definition. The jabberwock illustration from Lewis Carroll's _Through_the_Looking_Glass_ depicts one with its forelegs held like arms and the forefeet look like clutching hands. Enormous hands, but nethack's one-size-fits-all object model means they can manipulate things just like anybody else's hands. --- doc/fixes34.4 | 1 - src/monst.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index ae92a2a22..523166685 100644 --- a/doc/fixes34.4 +++ b/doc/fixes34.4 @@ -409,7 +409,6 @@ unlit candelabrum would become unlightable if its candles had exactly 1 turn of fuel left and it was applied anywhere other than the invocation spot temporary loss of Dex from wounded legs will become permanent if it occurs while mounted and hero dismounts before steed's legs have healed -jaberwocks don't have hands character escape sequence handling during options processing was vulernable to malformed escapes and could potentially be abused to clobber the stack and launch a buffer overrun attack diff --git a/src/monst.c b/src/monst.c index eb3063eae..fb2d3e8db 100644 --- a/src/monst.c +++ b/src/monst.c @@ -1574,13 +1574,15 @@ struct permonst _mons2[] = { /* * Jabberwock */ + /* the illustration from _Through_the_Looking_Glass_ + depicts hands as well as wings */ MON("jabberwock", S_JABBERWOCK, LVL(15, 12, -2, 50, 0), (G_GENO|1), A(ATTK(AT_BITE, AD_PHYS, 2,10), ATTK(AT_BITE, AD_PHYS, 2,10), ATTK(AT_CLAW, AD_PHYS, 2,10), ATTK(AT_CLAW, AD_PHYS, 2,10), NO_ATTK, NO_ATTK), SIZ(1300, 600, MS_BURBLE, MZ_LARGE), 0, 0, - M1_ANIMAL|M1_NOHANDS|M1_FLY|M1_CARNIVORE, + M1_ANIMAL|M1_FLY|M1_CARNIVORE, M2_HOSTILE|M2_STRONG|M2_NASTY|M2_COLLECT, M3_INFRAVISIBLE, CLR_ORANGE), #if 0 /* DEFERRED */ MON("vorpal jabberwock", S_JABBERWOCK, @@ -1589,7 +1591,7 @@ struct permonst _mons2[] = { ATTK(AT_CLAW, AD_PHYS, 3, 10), ATTK(AT_CLAW, AD_PHYS, 3, 10), NO_ATTK, NO_ATTK), SIZ(1300, 600, MS_BURBLE, MZ_LARGE), 0, 0, - M1_ANIMAL|M1_NOHANDS|M1_FLY|M1_CARNIVORE, + M1_ANIMAL|M1_FLY|M1_CARNIVORE, M2_HOSTILE|M2_STRONG|M2_NASTY|M2_COLLECT, M3_INFRAVISIBLE, HI_LORD), #endif #ifdef KOPS -- 2.50.1