diff -Naur nethack-3.3.1/dat/data.base nethack-3.3.1bis/dat/data.base --- nethack-3.3.1/dat/data.base Sat Jul 15 21:00:02 2000 +++ nethack-3.3.1bis/dat/data.base Mon Nov 20 23:42:21 2000 @@ -2507,6 +2507,22 @@ where the monkeys drink; we do not go where the monkeys go; we do not hunt where they hunt; we do not die where they die...." [ The Jungle Book, by Rudyard Kipling ] +*moose +*m00se + A M00se 0nce bit my sister... + + No realli! She was Karving her initials on the m00se with the + sharpened end of an interspace t00thbrush given by Svenge - her + brother-in-law - an Oslo dentist and star of many Norwegian m0vies: + "The H0t Hands of an Oslo Dentist", "Fillings of Passion", + "The Huge M0lars of Horst Nordfink". + + (We apologize for the fault in the subtitles. Those responsible + have been sacked.) + + Mynd you, m00se bites Kan be pretty nasti ... + [ Excerpt from the opening credits of the movie + "Monty Python and the Holy Grail" ] mumak* ... the Mumak of Harad was indeed a beast of vast bulk, and the like of him does not walk now in Middle-Earth; his kin diff -Naur nethack-3.3.1/src/mhitu.c nethack-3.3.1bis/src/mhitu.c --- nethack-3.3.1/src/mhitu.c Sat Aug 5 00:37:50 2000 +++ nethack-3.3.1bis/src/mhitu.c Mon Nov 20 23:26:25 2000 @@ -502,9 +502,11 @@ if (u.uswallow && (mattk->aatyp != AT_ENGL)) continue; switch(mattk->aatyp) { - case AT_CLAW: /* "hand to hand" attacks */ + case AT_BITE: + if (mdat == &mons[PM_FR_ST_M__SE] && !flags.female) + break; /* else fall through */ + case AT_CLAW: /* "hand to hand" attacks */ case AT_KICK: - case AT_BITE: case AT_STNG: case AT_TUCH: case AT_BUTT: diff -Naur nethack-3.3.1/src/mondata.c nethack-3.3.1bis/src/mondata.c --- nethack-3.3.1/src/mondata.c Sat Jul 15 19:31:49 2000 +++ nethack-3.3.1bis/src/mondata.c Tue Nov 21 00:20:02 2000 @@ -398,6 +398,7 @@ { "grey unicorn", PM_GRAY_UNICORN }, { "grey ooze", PM_GRAY_OOZE }, { "gray-elf", PM_GREY_ELF }, + { "frost moose", PM_FR_ST_M__SE }, /* Hyphenated names */ { "ki rin", PM_KI_RIN }, { "uruk hai", PM_URUK_HAI }, diff -Naur nethack-3.3.1/src/monst.c nethack-3.3.1bis/src/monst.c --- nethack-3.3.1/src/monst.c Thu Aug 3 21:51:43 2000 +++ nethack-3.3.1bis/src/monst.c Mon Nov 20 23:21:31 2000 @@ -749,6 +749,13 @@ SIZ(400, 100, 0, MS_SILENT, MZ_LARGE), 0, 0, M1_ANIMAL|M1_NOHANDS|M1_OMNIVORE, M2_HOSTILE, M3_INFRAVISIBLE, CLR_BROWN), + MON("fr0st m00se", S_QUADRUPED, + LVL(5, 9, 0, 0, 0), (G_GENO|1), + A(ATTK(AT_BUTT, AD_PHYS, 2, 4), ATTK(AT_BITE, AD_PHYS, 2, 6), + NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK), + SIZ(1500, 400, 0, MS_SILENT, MZ_LARGE), MR_COLD, 0, + M1_ANIMAL|M1_THICK_HIDE|M1_NOHANDS|M1_HERBIVORE, + M2_HOSTILE|M2_STRONG, M3_INFRAVISIBLE, CLR_WHITE), MON("mumak", S_QUADRUPED, LVL(5, 9, 0, 0, -2), (G_GENO|1), A(ATTK(AT_BUTT, AD_PHYS, 4,12), ATTK(AT_BITE, AD_PHYS, 2, 6), diff -Naur nethack-3.3.1/src/objnam.c nethack-3.3.1bis/src/objnam.c --- nethack-3.3.1/src/objnam.c Thu Aug 3 20:25:24 2000 +++ nethack-3.3.1bis/src/objnam.c Tue Nov 21 00:21:04 2000 @@ -1062,6 +1062,7 @@ !strcmp(spot-3, "deer") || !strcmp(spot-3, "yaki") || !strcmp(spot-3, "nori"))) || (len >= 5 && (!strcmp(spot-4, "sheep") || + !strcmp(spot-4, "m00se") || !strcmp(spot-4, "ninja") || !strcmp(spot-4, "ronin") || !strcmp(spot-4, "shito") || diff -Naur nethack-3.3.1/win/share/monsters.txt nethack-3.3.1bis/win/share/monsters.txt --- nethack-3.3.1/win/share/monsters.txt Thu Oct 21 22:31:36 1999 +++ nethack-3.3.1bis/win/share/monsters.txt Mon Nov 20 23:48:08 2000 @@ -1591,6 +1591,25 @@ MMMMMMMMMMMMMMMM MMMMMMMMMMMMMMMM } +# tile 1 (fr0st m00se) +{ + MMMMMMMMMMMMMMMM + MMMMMMMMMMMNMMMM + MMMMMMMMMMMMNMMM + MMMMMMMMMMMMNMMM + MMMMMMMJJJNNJMMM + MMMMMJNNNNNNNMMM + MMAAANNNNNNNNMMM + MAAAAANNNNNNNAMM + AANNAANNNNNANAMM + MNENNANNNJAANAMM + MNNNJANNAJAANMMM + MMNJAAANAAAMMMMM + MMAANAMNAMMMMMMM + MMAMMAMNMMMMMMMM + MMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMM +} # tile 83 (mumak) { MMMMMMMMMMMMMMMM