diff -Naurd ../nethack-3.4.0/dat/castle.des ./dat/castle.des --- ../nethack-3.4.0/dat/castle.des Wed Mar 20 23:42:27 2002 +++ ./dat/castle.des Mon Feb 24 15:25:05 2003 @@ -47,6 +47,7 @@ TELEPORT_REGION:levregion(01,00,10,20),(1,1,61,15),down TELEPORT_REGION:levregion(69,00,79,20),(1,1,61,15),up STAIR:levregion(01,00,10,20),(0,0,62,16),up +FOUNTAIN:(10,08) # Doors DOOR:closed,(07,03) DOOR:closed,(55,03) diff -Naurd ../nethack-3.4.0/dat/data.base ./dat/data.base --- ../nethack-3.4.0/dat/data.base Wed Mar 20 23:42:28 2002 +++ ./dat/data.base Mon Feb 24 15:25:05 2003 @@ -159,8 +159,8 @@ the father of all gods, and the ruler of heaven and destiny. Anu features strongly in the _atiku_ festival in Babylon, Uruk and other cities. -~* cape -*ape +ape +* ape The most highly evolved of all the primates, as shown by all their anatomical characters and particularly the development of the brain. Both arboreal and terrestrial, @@ -184,6 +184,7 @@ when. [ The Devil's Dictionary, by Ambrose Bierce ] archeologist +* archeologist Archeology is the search for fact, not truth. [...] So forget any ideas you've got about lost cities, exotic travel, and digging up the world. We do not follow maps to buried @@ -313,7 +314,7 @@ And Dayna knew he was right. [ The Stand, by Stephen King ] barbarian -human barbarian +* barbarian They dressed alike -- in buckskin boots, leathern breeks and deerskin shirts, with broad girdles that held axes and short swords; and they were all gaunt and scarred and hard-eyed; @@ -566,6 +567,22 @@ yellow and white, none was missing. Very sleek and fat did the cats appear, and sonorous with purring content. [ The Cats of Ulthar, by H.P. Lovecraft ] +# this one doesn't work very well for dwarven and gnomish cavemen +cave*man +human cave*man + Now it was light enough to leave. Moon-Watcher picked up + the shriveled corpse and dragged it after him as he bent + under the low overhang of the cave. Once outside, he + threw the body over his shoulder and stood upright - the + only animal in all this world able to do so. + Among his kind, Moon-Watcher was almost a giant. He was + nearly five feet high, and though badly undernourished + weighed over a hundred pounds. His hairy, muscular body + was halfway between ape and man, but his head was already + much nearer to man than ape. The forehead was low, and + there were ridges over the eye sockets, yet he unmistakably + held in his genes the promise of humanity. + [ 2001: A Space Odyssey, by Arthur C. Clarke ] *centaur Of all the monsters put together by the Greek imagination the Centaurs (Kentauroi) constituted a class in themselves. @@ -922,6 +939,21 @@ [ The Inferno, from The Divine Comedy of Dante Alighieri, translated by H.F. Cary ] doppelganger + "Then we can only give thanks that this is Antarctica, where + there is not one, single, solitary, living thing for it to + imitate, except these animals in camp." + + "Us," Blair giggled. "It can imitate us. Dogs can't make four + hundred miles to the sea; there's no food. There aren't any + skua gulls to imitate at this season. There aren't any + penguins this far inland. There's nothing that can reach the + sea from this point - except us. We've got brains. We can do + it. Don't you see - it's got to imitate us - it's got to be one + of us - that's the only way it can fly an airplane - fly a plane + for two hours, and rule - be - all Earth's inhabitants. A world + for the taking - if it imitates us! + [ Who Goes There?, by John W. Campbell ] + Xander: Let go! I have to kill the demon bot! Xander Double (grabbing the gun): Anya, get out of the way. Buffy: Xander! @@ -964,6 +996,7 @@ [ Tarzan of the Apes, by Edgar Rice Burroughs ] ~dwarf ??m* dwarf* +dwar* cave*man Dwarfs have faces like men (ugly men, with wrinkled, leathery skins), but are generally either flat-footed, duck-footed, or have feet pointing backwards. They are of the earth, earthy, @@ -1057,11 +1090,6 @@ ~elf ??m* *elf* elvenking -elven archeologist -elven cave*man -elven healer -elven samurai -elven wizard The Elves sat round the fire upon the grass or upon the sawn rings of old trunks. Some went to and fro bearing cups and pouring drinks; others brought food on heaped plates and @@ -1345,9 +1373,11 @@ boulders as weapons, hurling them over large distances. All types of giants share a love for men - roasted, boiled, or fried. Their table manners are legendary. +# note: "gnomish wizard" is a monster; cave*man entry doesn't fit nonhumans ~gnome ??m* gnome* gnomish wizard +gnom* cave*man ... And then a gnome came by, carrying a bundle, an old fellow three times as large as an imp and wearing clothes of a sort, especially a hat. And he was clearly just as frightened @@ -1526,6 +1556,31 @@ time to see Jack running off with his harp. [ Jack and the Beanstalk, from English Fairy Tales, by Joseph Jacobs ] +healer +* healer +attendant +doctor +physician + I swear by Apollo the physician, and Aesculapius, and Health, + and All-heal, and all the gods and goddesses, that, according + to my ability and judgment, I will keep this Oath and this + stipulation -- to reckon him who taught me this Art equally dear + to me as my parents, to share my substance with him, and relieve + his necessities if required; to look upon his offspring in the + same footing as my own brothers, and to teach them this art, if + they shall wish to learn it, without fee or stipulation; and + that by precept, lecture, and every other mode of instruction, + I will impart a knowledge of the Art to my own sons, and those + of my teachers, and to disciples bound by a stipulation and oath + according to the law of medicine, but to none others. I will + follow that system of regimen which, according to my ability and + judgment, I consider for the benefit of my patients, and abstain + from whatever is deleterious and mischievous. [...] + [ Hippocrates' Oath, translated by Francis Adams ] + + PHYSICIAN, n. One upon whom we set our hopes when ill and our + dogs when well. + [ The Devil's Dictionary, by Ambrose Bierce ] heart of ahriman The other three drew in their breath sharply, and the dark, powerful man who stood at the head of the sarcophagus whispered: @@ -1724,36 +1779,17 @@ hostile, they may even band together to raid and pillage human settlements. human -human archeologist -human cave*man -human healer -human monk -human samurai -human wizard -acolyte -apprentice -archeologist -arch priest -attendant -cave*man chieftain guard -healer -grand master -master kaen -monk ninja nurse page -*priest* ronin -samurai shopkeeper student thug warrior *watch* -wizard player These strange creatures live mostly on the surface of the earth, gathering together in societies of various forms, but @@ -1990,7 +2026,7 @@ went into his back up to the butt. [ Ulysses, by James Joyce ] knight -human knight +* knight Here lies the noble fearless knight, Whose valour rose to such a height; When Death at last had struck him down, @@ -2009,13 +2045,34 @@ Elven race, and will go out of their way to cause trouble for Elves at any time. *kop* - The typical policeman of 1920's movies, the Keystone Kop was - modeled like the English "bobby", with a long brass-buttoned - overcoat, carrying long nightsticks that he (more often than - not) whapped himself with, rather than anyone else. The - Keystone Kops were very slapstick-like, relying on speed and - numbers to achieve their comedy, rather than sophisticated - wit. + The Kops are a brilliant concept. To take a gaggle of inept + policemen and display them over and over again in a series of + riotously funny physical punishments plays equally well to the + peanut gallery and the expensive box seats. People hate cops. + Even people who have never had anything to do with cops hate + them. Of course, we count on them to keep order and to protect + us when we need protecting, and we love them on television shows + in which they have nerves of steel and hearts of gold, but in + the abstract, as a nation, collectively we hate them. They are + too much like high school principals. We're very happy to see + their pants fall down, and they look good to us with pie on + their faces. The Keystone Kops turn up--and they get punished + for it, as they crash into each other, fall down, and suffer + indignity after indignity. Here is pure movie satisfaction. + + The Kops are very skillfully presented. The comic originality + and timing in one of their chase scenes requires imagination + to think up, talent to execute, understanding of the medium, + and, of course, raw courage to perform. The Kops are madmen + presented as incompetents, and they're madmen rushing around + in modern machines. What's more, the machines they were operating + in their routines were newly invented and not yet experienced + by the average moviegoer. (In the early days of automobiles, + it was reported that there were only two cars registered in all + of Kansas City, and they ran into each other. There is both + poetry and philosophy in this fact, but most of all, there is + humor. Sennett got the humor.) + [ Silent Stars, by Jeanine Basinger ] kos "I am not a coward!" he cried. "I'll dare Thieves' House and fetch you Krovas' head and toss it with blood a-drip at @@ -2539,6 +2596,47 @@ family, and will cut him off, and all that go a whoring after him, to commit whoredom with Molech, from among their people. [ Leviticus 20:1-5 ] +monk +* monk +grand master +master kaen + One day, an army general invited the Buddhist monk I-Hsiu + (literally, "One Rest") to his military head office for a + dinner. I-Hsiu was not accustomed to wearing luxurious + clothings and so he just put on an old ordinary casual + robe to go to the military base. To him, "form is void". + + As he approached the base, two soldiers appeared before him + and shouted, "Where does this beggar came from? Identify + yourself! You do not have permission to be around here!" + + "My name is I-Hsiu Dharma Master. I am invited by your + general for a supper." + + The two soldiers examined the monk closely and said, "You + liar. How come my general invites such a shabby monk to + dinner? He invites the very solemn venerable I-Hsiu to our + base for a great ceremony today, not you. Now, get out!" + + I-Hsiu was unable to convince the soldiers that he was + indeed the invited guest, so he returned to the temple + and changed to a very formal solemn ceremonial robe for + the dinner. And as he returned to the military base, the + soldiers observed that he was such a great Buddhist monk, + let him in with honour. + + At the dinner, I-Hsiu sat in front of the table full of + food but, instead of putting the food into his month, he + picked up the food with his chopsticks and put it into + his sleeves. The general was curious, and whispered to + him, "This is very embarrassing. Do you want to take + some food back to the temple? I will order the cook to + prepare some take out orders for you." "No" replied the + monk. "When I came here, I was not allowed into the + base by your soldiers until I wear this ceremonial robe. + You do not invite me for a dinner. You invite my robe. + Therefore, my robe is eating the food, not me." + [ Dining with a General - a Zen Buddhism Koan ] monkey "Listen, man-cub," said the Bear, and his voice rumbled like thunder on a hot night. "I have taught thee all the Law of @@ -2829,6 +2927,10 @@ stinger. He is most feared, though, for his powerful magic abilities. His wand causes death to those he chooses. ~orc ??m* +~orcish barbarian +~orcish ranger +~orcish rogue +~orcish wizard orc* * orc uruk*hai @@ -3008,6 +3110,25 @@ preservative instinct of the race is to be unscientific -- and without science we are as the snakes and toads. [ The Devil's Dictionary, by Ambrose Bierce ] +priest* +* priest* +acolyte + [...] For the two priests were talking exactly like priests, + piously, with learning and leisure, about the most aerial + enigmas of theology. The little Essex priest spoke the more + simply, with his round face turned to the strengthening stars; + the other talked with his head bowed, as if he were not even + worthy to look at them. But no more innocently clerical + conversation could have been heard in any white Italian cloister + or black Spanish cathedral. The first he heard was the tail of + one of Father Brown's sentences, which ended: "... what they + really meant in the Middle Ages by the heavens being + incorruptible." The taller priest nodded his bowed head and + said: "Ah, yes, these modern infidels appeal to their reason; + but who can look at those millions of worlds and not feel that + there may well be wonderful universes above us where reason is + utterly unreasonable?" + [ The Innocence of Father Brown, by G.K. Chesterton ] prisoner Where am I? In the Village. @@ -3093,8 +3214,8 @@ raijin raiden The god of thunder. -human ranger ranger +* ranger "Lonely men are we, Rangers of the wild, hunters -- but hunters ever of the servants of the Enemy; for they are found in many places, not in Mordor only. @@ -3185,7 +3306,7 @@ is still unknown how they convert some of these things into something of nutritional value. rogue -human rogue +* rogue I understand the business, I hear it: to have an open ear, a quick eye, and a nimble hand, is necessary for a cut-purse; a good nose is requisite also, to smell out work for the other @@ -3256,6 +3377,19 @@ salamander, in fact, comes from a Greek word meaning "fire animal". [ Salamanders, by Cherie Winner ] +samurai +* samurai + By that time, Narahara had already slipped his arm from the + sleeve of his outer robe, drew out his two-and-a-half-foot + Fujiwara Tadahiro sword, and, brandishing it over his head, + began barreling toward the foreigners. In less than a minute, + he had charged upon them and cut one of them through the torso. + The man fled, clutching his bulging guts, finally to fall from + his horse at the foot of a pine tree about a thousand yards + away. Kaeda Takeji finished him off. The other two Englishmen + were severely wounded as they tried to flee. Only the woman + managed to escape virtually unscathed. + [ The Fox-horse, from Drunk as a Lord, by Ryotaro Shiba ] sandestin Ildefonse left the terrace and almost immediately sounds of contention came from the direction of the work-room. @@ -3314,6 +3448,12 @@ addition will protect anyone who carries it from magic missile attacks. When invoked, it causes conflict in the area around it. +scimitar + Oh, how handsome, how noble was the Vizier Ali Tebelin, + my father, as he stood there in the midst of the shot, his + scimitar in his hand, his face black with powder! How his + enemies fled before hiim! + [ The Count of Monte Cristo, by Alexandre Dumas ] scorpio* A sub-species of the spider (_Scorpionidae_), the scorpion distinguishes itself from them by having a lower body that @@ -3568,7 +3708,7 @@ protects its user from all life draining attacks, and additionally gives the wielder the power of regeneration. When invoked it performs healing magic. -staircase* +stair* Up he went -- very quickly at first -- then more slowly -- then in a little while even more slowly than that -- and finally, after many minutes of climbing up the endless stairway, one @@ -3584,6 +3724,11 @@ "Infinity is a dreadfully poor place. They can never manage to make ends meet." [ The Phantom Tollbooth, by Norton Juster ] + + Dr. Ray Stantz: Hey, where do those stairs go? + Dr. Peter Venkman: They go up. + [ Ghostbusters, directed by Ivan Reitman, + written by Dan Ackroyd and Harold Ramis ] ~statue trap statue* Then at last he began to wonder why the lion was standing so @@ -3750,9 +3895,11 @@ son, Zeus, and he and his fellow titans were ousted from Mount Olympus. [ Greek Mythology, by Richard Patrick ] +touch*stone + "Gold is tried by a touchstone, men by gold." + [ Chilon (c. 560 BC) ] tourist -elven tourist -human tourist +* tourist The road from Ankh-Morpork to Chrim is high, white and winding, a thirty-league stretch of potholes and half-buried rocks that spirals around mountains and dips into cool green @@ -3946,7 +4093,7 @@ keep me right there." [ Unicorn Variations, by Roger Zelazny ] valkyrie -human valkyrie +* valkyrie The Valkyries were the thirteen choosers of the slain, the beautiful warrior-maids of Odin who rode through the air and over the sea. They watched the progress of the battle and @@ -4031,7 +4178,7 @@ as the crow flies, and maybe twenty as the wolf runs," answered Gandalf grimly. "Then let us start as soon as it is light tomorrow, if we can," - said Boromir. "The wolf that one hears is worse then the orc + said Boromir. "The wolf that one hears is worse than the orc that one fears." "True!" said Aragorn, loosening his sword in its sheath. "But where the warg howls, there also the orc prowls." @@ -4078,6 +4225,20 @@ flat on his back upon a cold stone with his hands on his breast. [ The Fellowship of the Ring, by J.R.R. Tolkien ] +# note: need to convert player character "gnomish wizard" into just "wizard" +# in the lookup code to avoid conflict with the monster of that same name +~gnomish wizard +wizard +* wizard +apprentice + Ebenezum walked before me along the closest thing we could + find to a path in these overgrown woods. Every few paces he + would pause, so that I, burdened with a pack stuffed with + arcane and heavy paraphernalia, could catch up with his + wizardly strides. He, as usual, carried nothing, preferring, + as he often said, to keep his hands free for quick conjuring + and his mind free for the thoughts of a mage. + [ A Dealing with Demons, by Craig Shaw Gardner ] wizard of yendor No one knows how old this mighty wizard is, or from whence he came. It is known that, having lived a span far greater than diff -Naurd ../nethack-3.4.0/dat/mines.des ./dat/mines.des --- ../nethack-3.4.0/dat/mines.des Wed Mar 20 23:42:31 2002 +++ ./dat/mines.des Mon Feb 24 15:25:05 2003 @@ -404,7 +404,7 @@ ----- --------- |...--- ------.......-- ------- --------------- |.....----.........--..| |.....| ------- |.............| ---..-....-.----------..| |.....| |.....| --+---+- .----+- +--..-....-.----------..| |.....| |.....| --+---+--.----+- --.--.....---- ---- |.....| ------ --....---- |..-...--.-.+..| ---.........---- ----- ---+--- |..+.| ---..-..----..---+-..---..| ----.-....|..----...-- |.| |..|.| ---+-.....-+--........--+- @@ -423,8 +423,12 @@ |...| ---- ------|....| ----- -----.....----........|..|.| ----- ------ ------- --------------- ENDMAP + STAIR:(01,01),up STAIR:(46,03),down +FOUNTAIN:(50,09) +FOUNTAIN:(10,15) +FOUNTAIN:(66,18) REGION:(00,00,74,20),unlit,"ordinary" REGION:(09,13,11,17),lit,"ordinary" @@ -502,26 +506,29 @@ INIT_MAP:'.','-',true,true,lit,true GEOMETRY:center,top MAP -.-----................----------------. -.|...|................|...|..|...|...|. -.|...+..--+--.........|...|..|...|...|. -.|...|..|...|..-----..|...|..|-+---+--. -.-----..|...|--|...|..--+---+-......... -........|...|..|...+.............-----. -........-----..|...|......--+-...|...|. -.----...|...|+------..{...|..|...+...|. -.|..+...|...|.............|..|...|...|. -.|..|...|...|-+-.....---+-------------. -.----...--+--..|..-+-|................. -...|........|..|..|..|----....--------- -...|..T.....----..|..|...+....|......|- -...|-....{........|..|...|....+......|- -...--..-....T.....--------....|......|- -.......--.....................--------- +.-----................----------------.- +.|...|................|...|..|...|...|.. +.|...+..--+--.........|...|..|...|...|.. +.|...|..|...|..-----..|...|..|-+---+--.. +.-----..|...|--|...|..--+---+-.........| +........|...|..|...+.............-----.. +........-----..|...|......--+-...|...|.. +.----...|...|+------..{...|..|...+...|.. +.|..+...|...|.............|..|...|...|.. +.|..|...|...|-+-.....---+-------------.| +.----...--+--..|..-+-|.................. +...|........|..|..|..|----....---------. +...|..T.....----..|..|...+....|......|-. +...|-....{........|..|...|....+......|-. +...--..-....T.....--------....|......|-. +.......--.....................---------- ENDMAP + REGION:(00,00,38,15),lit,"ordinary" -STAIR:levregion(01,03,20,19),(0,0,38,15),up -STAIR:levregion(21,03,75,19),(0,0,38,15),down +STAIR:levregion(01,03,20,19),(0,0,39,15),up +STAIR:levregion(21,03,75,19),(0,0,39,15),down +FOUNTAIN:(22,07) +FOUNTAIN:(09,13) REGION:(13,5,14,6),unlit,"ordinary" REGION:(9,7,11,9),lit,"candle shop" REGION:(16,4,18,6),lit,"tool shop" @@ -704,6 +711,7 @@ | |....S.. |...............-..| ..S...........| | -------- -------------------- ------------------------ ENDMAP + # Dungeon Description RANDOM_PLACES:(08,16),(13,07),(21,08),(41,14),(50,04),(50,16),(66,01) REGION:(26,01,32,01),unlit,"ordinary",filled,true @@ -814,7 +822,9 @@ |.................| |.....................|........ | --------------------------------------------------------------------------- ENDMAP + # Dungeon Description +FOUNTAIN:(14,13) REGION:(23,03,48,06),lit,"ordinary" REGION:(21,06,22,06),lit,"ordinary" REGION:(14,04,14,04),unlit,"ordinary" @@ -933,9 +943,11 @@ -.S..|--------.---.--- -...---------------...{.--------- --------- --|. - - - - - - - -- - - - -- . - - - --- - - - . . - - - - -- - - - - - - ENDMAP + RANDOM_PLACES:(1,15),(68,6),(1,13) NON_DIGGABLE:(67,3,73,7) -NON_DIGGABLE:(0,14,2,16) +NON_DIGGABLE:(0,12,2,16) +FOUNTAIN:(12,08) REGION:(0,0,75,16),unlit,"ordinary" REGION:(38,6,46,10),lit,"ordinary" DOOR:closed,(37,8) diff -Naurd ../nethack-3.4.0/dat/Monk.des ./dat/Monk.des --- ../nethack-3.4.0/dat/Monk.des Wed Mar 20 23:42:31 2002 +++ ./dat/Monk.des Mon Feb 24 15:25:05 2003 @@ -212,11 +212,12 @@ .........LLL.........L.... ENDMAP # Dungeon Description +RANDOM_PLACES:(14,04),(13,07) REGION:(00,00,25,10),unlit,"ordinary" # Stairs STAIR:(20,05),up # Objects -OBJECT:'(',"lenses",(13,05),blessed,0,"The Eyes of the Overworld" +OBJECT:'(',"lenses",place[0],blessed,0,"The Eyes of the Overworld" OBJECT:random,random,random OBJECT:random,random,random OBJECT:random,random,random @@ -239,8 +240,8 @@ TRAP:random,random TRAP:random,random # Random monsters. -MONSTER:'@',"Master Kaen",(13,05) -ALTAR:(13,05),noalign,altar +MONSTER:'@',"Master Kaen",place[0] +ALTAR:place[0],noalign,altar MONSTER: 'E',"earth elemental",random MONSTER: 'E',"earth elemental",random MONSTER: 'E',"earth elemental",random diff -Naurd ../nethack-3.4.0/dat/Priest.des ./dat/Priest.des --- ../nethack-3.4.0/dat/Priest.des Wed Mar 20 23:42:32 2002 +++ ./dat/Priest.des Mon Feb 24 15:25:05 2003 @@ -197,11 +197,12 @@ .........LLL.........L.... ENDMAP # Dungeon Description +RANDOM_PLACES:(14,04),(13,07) REGION:(00,00,25,10),unlit,"ordinary" # Stairs STAIR:(20,05),up # Objects -OBJECT:'[',"helm of brilliance",(13,05),blessed,0,"The Mitre of Holiness" +OBJECT:'[',"helm of brilliance",place[0],blessed,0,"The Mitre of Holiness" OBJECT:random,random,random OBJECT:random,random,random OBJECT:random,random,random @@ -224,7 +225,7 @@ TRAP:random,random TRAP:random,random # Random monsters. -MONSTER:'&',"Nalzok",(13,05) +MONSTER:'&',"Nalzok",place[0] MONSTER:'Z',"human zombie",random MONSTER:'Z',"human zombie",random MONSTER:'Z',"human zombie",random diff -Naurd ../nethack-3.4.0/dat/quest.txt ./dat/quest.txt --- ../nethack-3.4.0/dat/quest.txt Wed Mar 20 23:42:32 2002 +++ ./dat/quest.txt Mon Feb 24 15:25:05 2003 @@ -721,11 +721,11 @@ Once again, you find yourself in the lair of %n. %E %Cc Cav 00050 -"So, human, you seek to invade the lair of %n. +"So, follower of %l, you seek to invade the lair of %n. Only my meals are allowed down here. Prepare to be eaten!" %E %Cp Cav 00051 -"So, again you face me, %c. No human has ever before escaped me. +"So, again you face me, %c. No one has ever before escaped me. Now I shall kill you." %E %Cp Cav 00052 @@ -738,7 +738,7 @@ "You are weak, %c. No challenge for the Mother of all Dragons." %E %Cp Cav 00061 -"I grow hungry, human. You look like a nice appetizer!" +"I grow hungry, %r. You look like a nice appetizer!" %E %Cp Cav 00062 "Join me for lunch? You're the main course, %c." @@ -868,7 +868,7 @@ "I see that you bring %o, now you can cure this plague!" %E %Cc Hea 00015 -"Feebly, %l raises his head to look at you. +Feebly, %l raises his head to look at you. "It is good to see you again, %p. I see the concern in your eyes, but do not worry for me. I am not ready for Hades yet. We have @@ -2658,7 +2658,6 @@ path can you hope to overcome the obstacles you will face." %E %Cc Tou 00021 -%E "You have indeed proven yourself a worthy %c, %p. "But now your kinfolk and I must ask you to put aside your travels and @@ -2673,6 +2672,7 @@ "Do not be distracted on your quest. If you do not return quickly I fear that all will be lost. Let us both pray now that %d will guide you and keep you safe." +%E %Cp Tou 00025 "Do not be fooled by the false promises of %n." %E @@ -3098,7 +3098,7 @@ portal spell!!" %E %Cp Wiz 00008 -"The spells of %n were just to powerful for us to withstand." +"The spells of %n were just too powerful for us to withstand." %E %Cp Wiz 00009 "I, too, will venture into the world, because %n is but one of @@ -3153,7 +3153,6 @@ truly ready for this quest. May %d guide you in this task." %E %Cc Wiz 00021 -%E "Yes, %p, you truly are ready for this dire task. Listen, carefully, for what I tell you now will be of vital importance. @@ -3176,6 +3175,7 @@ find and overcome %n, and return %o to me. "Go now, with %d, and complete this quest before it is too late." +%E %Cp Wiz 00025 "Beware, for %n is immune to most magical attacks." %E @@ -3459,7 +3459,21 @@ %Cp - 00049 "Why search for the Amulet? Thou wouldst but lose it, cretin." %E +# +# Banishment message (for converted hero) +# +%Cc - 00060 +"You have betrayed all those who hold allegiance to %d, as you once did. +My allegiance to %d holds fast and I cannot condone or accept what you +have done. +Leave this place. You shall never set foot at %H again. +That which you seek is now lost forever, for without the Bell of Opening, +you will never be able to enter the place where he who has the Amulet +resides. + +Go now! You are banished from this place. +%E # # TEST PATTERN # diff -Naurd ../nethack-3.4.0/dat/rumors.fal ./dat/rumors.fal --- ../nethack-3.4.0/dat/rumors.fal Wed Mar 20 23:42:33 2002 +++ ./dat/rumors.fal Mon Feb 24 15:25:05 2003 @@ -156,6 +156,7 @@ Sometimes "mu" is the answer. Sorry, no fortune this time. Better luck next cookie! Spare your scrolls of make-edible until it's really necessary! +Stormbringer doesn't steal souls. People steal souls. Suddenly, the dungeon will collapse... Taming a mail daemon may cause a system security violation. The crowd was so tough, the Stooges won't play the Dungeon anymore, nyuk nyuk. diff -Naurd ../nethack-3.4.0/dat/rumors.tru ./dat/rumors.tru --- ../nethack-3.4.0/dat/rumors.tru Wed Mar 20 23:42:33 2002 +++ ./dat/rumors.tru Mon Feb 24 15:25:05 2003 @@ -282,8 +282,8 @@ They say that something very special would be in a well-protected place. They say that speed boots aren't fast enough to let you walk on water. They say that teleport traps are the devil's work. -They say that tengus don't wear rings, why should you? -They say that tengus never steal gold although they would be good at it. +They say that tengu don't wear rings, why should you? +They say that tengu never steal gold although they would be good at it. They say that that which was stolen once can be stolen again, ask any nymph. They say that the Delphic Oracle knows that lizard corpses aren't confusing. They say that the Hand of Elbereth can hold up your prayers. diff -Naurd ../nethack-3.4.0/dat/Samurai.des ./dat/Samurai.des --- ../nethack-3.4.0/dat/Samurai.des Wed Mar 20 23:42:34 2002 +++ ./dat/Samurai.des Mon Feb 24 15:25:05 2003 @@ -265,9 +265,15 @@ ....................... ENDMAP # Dungeon Description +RANDOM_PLACES:(02,11),(42,09) REGION:(00,00,44,19),unlit,"ordinary" +# Doors +DOOR:closed,(19,10) +DOOR:closed,(22,08) +DOOR:closed,(22,12) +DOOR:closed,(25,10) # Stairs -STAIR:(02,10),up +STAIR:place[0],up # Non diggable walls NON_DIGGABLE:(00,00,44,19) # Objects @@ -386,6 +392,11 @@ ------------- ------------- ENDMAP REGION:(00,00,59,15),unlit,"ordinary" +# Doors +DOOR:closed,(16,07) +DOOR:closed,(16,08) +DOOR:closed,(43,07) +DOOR:closed,(43,08) # STAIR: random, up STAIR: random, down diff -Naurd ../nethack-3.4.0/dat/Valkyrie.des ./dat/Valkyrie.des --- ../nethack-3.4.0/dat/Valkyrie.des Wed Mar 20 23:42:35 2002 +++ ./dat/Valkyrie.des Mon Feb 24 15:25:05 2003 @@ -40,6 +40,7 @@ BRANCH:(66,17,66,17),(0,0,0,0) # Stairs STAIR:(18,01),down +FOUNTAIN:(53,02) # Doors DOOR:locked,(26,10) DOOR:locked,(43,10)