diff --git a/dat/data.base b/dat/data.base index 960932c18..50152f2c1 100644 --- a/dat/data.base +++ b/dat/data.base @@ -890,6 +890,12 @@ tiamat extremely vain. citrine* A pale yellow variety of crystalline quartz resembling topaz. +cleaver + Hither came Conan, the Cimmerian, black-haired, sullen-eyed, + sword in hand, a thief, a reaver, a slayer, with gigantic + melancholies and gigantic mirth, to tread the jeweled + thrones of the Earth under his sandalled feet. + [ The Phoenix on the Sword, by Robert E. Howard ] ~elven cloak ~oilskin cloak *cloak* @@ -1645,9 +1651,16 @@ fire trap _anywhere_?' [ The Last Hero, by Terry Pratchett ] f* brand - One of a pair of legendary swords that possess the powers - of elemental flame and ice, and will grant these to whoever - is fortunate enough to wield them. + Some say the world will end in fire, + Some say in ice. + From what I've tasted of desire + I hold with those who favor fire. + But if it had to perish twice, + I think I know enough of hate + To say that for destruction ice + Is also great + And would suffice. + [ Fire and Ice, by Robert Frost ] flesh golem With an anxiety that almost amounted to agony, I collected the instruments of life around me, that I might infuse a spark @@ -3920,6 +3933,17 @@ user Might just kill you. [ It's a Jungle Out There, by Randy Newman ] # [ theme song from "Monk" ] +polymorph trap + One morning, as Gregor Samsa was waking up from anxious dreams, + he discovered that in bed he had been changed into a monstrous + verminous bug. He lay on his armour-hard back and saw, as he + lifted his head up a little, his brown, arched abdomen divided + up into rigid bow-like sections. From this height the blanket, + just about ready to slide off completely, could hardly stay in + place. His numerous legs, pitifully thin in comparison to the + rest of his circumference, flickered helplessly before his eyes. + [ The Metamorphosis, by Franz Kafka, + translated by Ian Johnston ] pony Hey! now! Come hoy now! Whither do you wander? Up, down, near or far, here, there or yonder? @@ -4853,6 +4877,11 @@ straw golem figure was raised above the stalks of corn by means of the pole stuck up its back. [ The Wonderful Wizard of Oz, by L. Frank Baum ] +sunsword + What you seek is a blade of light, + a weapon for vengeance. + [ Expedition to Castle Ravenloft, + by Bruce Cordell and James Wyatt ] susano*o The Shinto chthonic and weather god and brother of the sun goddess Amaterasu, he was born from the nose of the diff --git a/dat/medusa.des b/dat/medusa.des index 3e1a70521..b449a29e2 100644 --- a/dat/medusa.des +++ b/dat/medusa.des @@ -218,7 +218,7 @@ MONSTER:random,random LEVEL:"medusa-3" -FLAGS: noteleport,mazelevel +FLAGS: noteleport,mazelevel,shortsighted INIT_MAP:solidfill,' ' GEOMETRY:center,center # diff --git a/dat/opthelp b/dat/opthelp index c378e618c..60531aae5 100644 --- a/dat/opthelp +++ b/dat/opthelp @@ -22,6 +22,7 @@ implicit_uncursed omit "uncursed" from inventory, if possible [TRUE] legacy print introductory message [TRUE] lit_corridor show a dark corridor as lit if in sight [FALSE] lootabc use a/b/c rather than o/i/b when looting [FALSE] +menu_overlay overlay menus on the screen and align to right [TRUE] mail enable the mail daemon [TRUE] null allow nulls to be sent to your terminal [TRUE] try turning this option off (forcing NetHack to use its own diff --git a/dat/tribute b/dat/tribute index cfe4699cf..462e4743e 100644 --- a/dat/tribute +++ b/dat/tribute @@ -329,89 +329,731 @@ the most courted and the most cursed. # # # -%title The Light Fantastic (2) +%title The Light Fantastic (12) +# p. 92 (Signet edition) %passage 1 -'Cohen is my name, boy' Belthan's hands stopped moving. -'Cohen?' she said, 'Cohen the Barbarian?' +'Cohen ish my name, boy.' Bethan's hands stopped moving. + +'Cohen?' she said. 'Cohen the Barbarian?' + 'The very shame.' -'Hang on, hang on,' said Rincewind, 'Cohen's a great big chap, neck like a + +'Hang on, hang on,' said Rincewind. 'Cohen's a great big chap, neck like a bull, got chest muscles like a sack of footballs. I mean, he's the Disc's greatest warrior, a legend in his own lifetime. I remember my grandad -telling me he saw him ... my grandad telling me he ... my grandad ...' +telling me he saw him... my grandad telling me he... my grandad...' + He faltered under the gimlit gaze. -'Oh,' he said, 'Oh. Of course, Sorry.' -'Yesh,' said Cohen, and sighed, 'Thatsh right boy, I'm a lifetime in my own -legend.' + +'Oh,' he said. 'Oh. Of course. Sorry.' + +'Yesh,' said Cohen, and sighed. 'That's right boy. I'm a lifetime in my +own legend.' [The Light Fantastic, by Terry Pratchett] %e passage 1 +# p. 113 (Twoflower is teaching the Riders how to play bridge; +# in /The Light Fantastic/, Death's dialog uses quotation marks +# and full uppercase rather than the small capital letters used in +# the other books) %passage 2 -Death sat at one side of a black baize table in the entre of the room, +Death sat at one side of a black baize table in the centre of the room, arguing with Famine, War and Pestilence. Twoflower was the only one to look up and notice Rincewind. + 'Hey, how did you get here?' he said. -'Well, some say that the creator took a handful - oh, I see, well, it's -hard to explain but I -' + +'Well, some say that the creator took a handful--oh, I see, well, it's +hard to explain but I--' + 'Have you got the Luggage?' + The wooden box pushed past Rincewind and settled down in front of its owner, who opened its lid and rummaged around inside until he came up with a small, leatherbound book which he handed to War, who was hammering the table with a mailed fist. -'It's "Nosehinger on the Laws of Contract",' he said. 'It's quite good, -there's a lot in it about double finessing and how to -' -Death snatched the book with a bony hand and flipped through the pages, + +'It's "Nosehinger on the Laws of Contract",' he said. 'It's quite good, +there's a lot in it about double finessing and how to--' + +Death snatched the book with a bony hand and flipped through the pages, quite oblivious to the presence of the two men. -'RIGHT,' he said, 'PESTILENCE, OPEN ANOTHER PACK OF CARDS. I'M GOING TO GET -TO THE BOTTOM OF THIS IF IT KILLS ME. FIGURATIVELY SPEAKING OF COURSE.' + +'RIGHT,' he said, 'PESTILENCE, OPEN ANOTHER PACK OF CARDS. I'M GOING TO +GET TO THE BOTTOM OF THIS IF IT KILLS ME. FIGURATIVELY SPEAKING OF COURSE.' [The Light Fantastic, by Terry Pratchett] %e passage 2 +# p. 7 (passage starts mid-sentence; the too-long-to-answer question is +# "Why have Rincewind and Twoflower fallen off the Disc's rim?", +# alluding to the conclusion of /The Colour of Magic/; +# in /Sourcery/ and /Interesting Times/ and probably others, the +# famous philosohper's name is spelled "Ly Tin Wheedle") +%passage 3 +[...] such questions take time and could be more trouble than they are +worth. For example, it is said that someone at a party once asked the +famous philosopher Ly Tin Weedle "Why are you here?" and the reply took +three years. + + [The Light Fantastic, by Terry Pratchett] +%e passage +# p. 8 ('libraries': plural is accurate) +%passage 4 +The only furnishing in the room was a lectern of dark wood, carved into the +shape of a bird--well, to be frank, into the shape of a winged thing it is +probably best not to examine too closely--and on the lectern, fastened to +it by a heavy chain covered in padlocks, was a book. + +A large, but not particularly impressive, book. Other books in the +University's libraries had covers inlaid with rare jewels and fascinating +wood, or bound with dragon skin. This one was just a rather tatty leather. +It looked the sort of book described in library catalogues as "slightly +foxed," although it would be more honest to admit that it looked as though +it had been badgered, wolved and possibly beared as well. + + [The Light Fantastic, by Terry Pratchett] +%e passage +# pp. 41-42 +%passage 5 +The barbarian chieftain said: "What then are the greatest things that a +man may find in life?" This is the sort of thing you're supposed to say to +maintain steppecred in barbarian circles. + +The man on his right thoughtfully drank his cocktail of mare's milk and +snowcat blood, and spoke thus: "The crisp horizon of the steppe, the wind +in your hair, a fresh horse under you." + +The man on his left said: "The cry of the white eagle in the heights, the +fall of snow in the forest, a true arrow in your bow." + +The chieftain nodded and said: "Surely it is the sight of your enemy +slain, the humiliation of his tribe and the lamentation of his women." + +There was a general murmur of whiskery approval at this outrageous display. + +Then the chieftain turned respectfully to his guest, a small figure +carefully warming his chilblains by the fire, and said: "But our guest, +whose name is legend, must tell us truly: what is it that a man may call +the greatest things in life?" + +The guest paused in the middle of another unsuccessful attempt to light up. + +"What shay?" he said, toothlessly. + +"I said: what is it that a man may call the greatest things in life?" + +The warriors leaned closer. This should be worth hearing. + +The guest thought long and hard and then said, with deliberation: "Hot +water, good dentishtry and shoft lavatory paper." + + [The Light Fantastic, by Terry Pratchett] +%e passage +# p. 48 (Hanzel and Gretel, obviously...) +%passage 6 +"Have a bit more table," said Rincewind. + +"No thanks, I don't like marzipan," said Twoflower. "Anyway, I'm sure it's +not right to eat other people's furniture." + +"Don't worry," said Swires. "The old witch hasn't been seen for years. +They say she was done up good and proper by a couple of young tearaways." + +"Kids of today," said Rincewind. + +"I blame the parents," said Twoflower. + + [The Light Fantastic, by Terry Pratchett] +%e passage +# p. 103 +%passage 7 +It is a well known fact that warriors and wizards do not get along, because +one side considers the other side to be a collection of bloodthirsty idiots +who can't walk and think at the same time, while the other side is naturally +suspicious of a body of men who mumble a lot and wear long dresses. Oh, say +the wizards, if we're going to be like that, then, what about all those +studded collars and oiled muscles down at the Young Men's Pagan Association? +To which the heroes reply, that's a pretty good allegation coming from a +bunch of wimpsoes who won't go near a woman on account, can you believe it, +of their mystical power being sort of drained out. Right, say the wizards, +that just about does it, you and your leather posing pouches. Oh yeah, say +the heroes, why don't you... + +And so on. This sort of thing has been going on for centuries, and caused +a number of major battles which have left large tracts of land uninhabitable +because of magical harmonics. + + [The Light Fantastic, by Terry Pratchett] +%e passage +# p. 128 +%passage 8 +"He'sh mad?" + +"Sort of mad. But mad with lots of money." + +"Ah, then he can't be mad. I've been around; if a man hash lotsh of money +he'sh just ecshentric." + + [The Light Fantastic, by Terry Pratchett] +%e passage +# p. 182 (Cohen is now wearing dentures with teeth made from diamonds) +%passage 9 +Cohen tapped him on the shoulder. The man looked around irritably. + +"What do you want, grandad?" he snarled. + +Cohen paused until he had the man's full attention, and then he smiled. It +was a slow, lazy smile, unveiling about 300 carats of mouth jewelry that +seemed to light up the room. + +"I will count to three," he said, in a friendly tone of voice. "One, Two." +His bony knee came up in the man's groin with a satisfyingly meaty noise, +and he half-turned to bring the full force of an elbow into the kidneys as +the leader collapsed around his private universe of pain. + +"Three," to told the ball of agony on the floor. Cohen had heard of +fighting fair, and had long ago decided he wanted no part of it. + + [The Light Fantastic, by Terry Pratchett] +%e passage +# pp. 193-194 (this passage is the data.base quote for shopkeeper) +%passage 10 +There have been three general theories put forward to explain the +phenomenon of the wandering shops, or as they are generically known, +/tabernae vagantes/. + +The first postulates that many thousands of years ago there evolved +somewhere in the multiverse a race whose single talent was to buy cheap +and sell dear. Soon they controlled a vast galactic empire or, as they put +it, Emporium, and the more advanced members of the species found a way to +equip their very shops with unique propulsion units that could break the +dark walls of space itself and open up vast new markets. And long after +the worlds of the Emporium perished in the heat death of their particular +universe, after one last defiant fire sale, the wandering starshops still +ply their trade, eating their way through the pages of space-time like a +worm through a three-volume novel. + +The second is that they are the creation of a sympathetic Fate, charged +with the role of supplying exactly the right thing at the right time. + +The third is that they are simply a very clever way of getting around the +various Sunday Closing acts. + +All these theories, diverse as they are, have two things in common. They +explain the observed facts, and they are completely and utterly wrong. + + [The Light Fantastic, by Terry Pratchett] +%e passage +# p. 205 +%passage 11 +"Where to they all come from?" said Twoflower, as they fled yet another mob. + +"Inside every sane person there's a madman struggling to get out," said the +shopkeeper, "That's what I've always thought. No one goes mad quicker than +a totally sane person." + + [The Light Fantastic, by Terry Pratchett] +%e passage +# pp. 229-230 ('grey': British spelling is accurate) +%passage 12 +Trymon was looking at him. /Something/ was looking at him. And still the +others hadn't noticed. Could he even explain it? Trymon looked the same +as he had always done, except for the eyes, and a slight sheen to his skin. + +Rincewind stared, and knew that there were far worse things than Evil. All +the demons in Hell would torture your very soul, but that was precisely +because they value souls very highly; evil would always try to steal the +universe, but at least it considered the universe worth stealing. But the +grey world behind those empty eyes would trample and destroy without even +according its victims the dignity of hatred. It wouldn't even notice them. + + [The Light Fantastic, by Terry Pratchett] +%e passage %e title # # # -%title Equal Rites (3) +%title Equal Rites (10) +# p. 118 (Signet edition; passage starts mid-sentence and ends mid-paragraph) %passage 1 -...it is well known that a vital ingredient of success is not knowing that -what you're attempting can't be done. +[...] it is well known that a vital ingredient of success is not knowing +that what you're attempting can't be done. [...] [Equal Rites, by Terry Pratchett] %e passage +# p. 218 (speaker is Granny Weatherwax) %passage 2 -Million-to-one chances...crop up nine times out of ten. +"Million-to-one chances," she said, "crop up nine times out of ten." [Equal Rites, by Terry Pratchett] %e passage +# pp. 96-97 ('Tannoy': public address speaker) %passage 3 -Animal minds are simple, and therefore sharp. Animals never spend time -dividing experience into little bits and speculating about all the bits -they've missed. The whole panoply of the universe has been neatly -expressed to them as things to (a) mate with, (b) eat, (c) run away from, -and (d) rocks. This frees the mind from unnecessary thoughts and gives -it a cutting edge where it matters. Your normal animal, in fact, never -tries to walk and chew gum at the same time. +Animal minds are simple, and therefore sharp. Animals never spend time +dividing experience into little bits and speculating about all the bits +they've missed. The whole panoply of the universe has been neatly +expressed to them as things to (a) mate with, (b) eat, (c) run away from, +and (d) rocks. This frees the mind from unnecessary thoughts and gives +it a cutting edge where it matters. Your normal animal, in fact, never +tries to walk and chew gum at the same time. -The average human, on the other hand, thinks about all sorts of things +The average human, on the other hand, thinks about all sorts of things around the clock, on all sorts of levels, with interruptions from dozens -of biological calendars and timepieces. There's thoughts about to be said, -and private thoughts, and real thoughts, and thoughts about thoughts, and -a whole gamut of subconscious thoughts. To a telepath the human head is -a din. It is a railway terminus with all the Tannoys talking at once. -It is a complete FM waveband- and some of those stations aren't reputable, +of biological calendars and timepieces. There's thoughts about to be said, +and private thoughts, and real thoughts, and thoughts about thoughts, and +a whole gamut of subconscious thoughts. To a telepath the human head is +a din. It is a railway terminus with all the Tannoys talking at once. +It is a complete FM waveband--and some of those stations aren't reputable, they're outlawed pirates on forbidden seas who play late-night records with limbic lyrics. [Equal Rites, by Terry Pratchett] %e passage +# pp. 18-19 +%passage 4 +Smith took a spade from beside the back door and hesitated. + +"Granny." + +"What?" + +"Do you know how wizards like to be buried?" + +"Yes!" + +"Well, how?" + +Granny paused at the bottom of the stairs. + +"Reluctantly." + + [Equal Rites, by Terry Pratchett] +%e passage +# p. 70 +%passage 5 +Granny sighed. "You have learned something," she said, and thought it +was safe to insert a touch of sternness into her voice. "They say that a +little knowledge is a dangerous thing, but it is not one half so bad as a +lot of ignorance." + + [Equal Rites, by Terry Pratchett] +%e passage +# pp. 113-114 (Esk is a young girl) +%passage 6 +The barges stopped at some of the towns. By tradition only the men went +ashore, and only Amschat, wearing his ceremonial Lying hat, spoke to +non-Zoons. Esk usually went with him. He tried hinting that she should +obey the unwritten rules of Zoon life and stay afloat, but a hint was to +Esk what a mosquito bite was to the average rhino because she was already +learning that if you ignore the rules people will, half the time, quietly +rewrite them so that they don't apply to you. + + [Equal Rites, by Terry Pratchett] +%e passage +# pp. 119-120 (next passage is a direct continuation of this one) +%passage 7 +The town was smaller than Ohulan, and very different because it lay on the +junction of three trade routes quite apart from the river itself. It was +built around one enormous square which was a cross between a permanent +exotic traffic jam and a tent village. Camels kicked mules, mules kicked +horses, horses kicked camels and they all kicked humans; there was a riot +of colours, a din of noise, a nasal orchestration of smells and the steady, +heady sound of hundreds of people working hard at making money. + +One reason for the bustle was that over large parts of the continent other +people preferred to make money without working at all, and since the Disc +had yet to develop a music recording industry they were forced to fall back +on older, more traditional forms of banditry. + +Strangely enough these often involved considerable effort. Rolling heavy +rocks to the top of cliffs for a decent ambush, cutting down trees to +block the road, and digging a pit lined with spikes while still keeping a +wicked edge on a dagger probably involved a much greater expenditure of +thought and muscle than more socially-acceptable professions but, +nevertheless, there were still people misguided enough to endure all this, +plus long nights in uncomfortable surroundings, merely to get their hands +on perfectly ordinary large boxes of jewels. + + [Equal Rites, by Terry Pratchett] +%e passage +# pp. 120-121 (this passage is a direct continuation of preceding one; +# "I said, what is happening here?" actually omits "is" +# but must be a typo--fixed here to avoid bug reports; +# 'broomstick' is Esk's disguised wizard's staff) +%passage 8 +So a town like Zemphis was the place where caravans split, mingled and +came together again, as dozens of merchants and travellers banded together +for protection against the socially disadvantaged on the trails ahead. +Esk, wandering unregarded amidst the bustle, learned all this by the simple +method of finding someone who looked important and tugging on the hem of +his coat. + +This particular man was counting bales of tobacco and would have succeeded +but for the interruption. + +"What?" + +"I said, what is happening here?" + +The man meant to say: "Push off and bother someone else." He meant to +give her a light cuff about the head. So he was astonished to find himself +bending down and talking seriously to a small, grubby-faced child holding +a large broomstick (which also, it seemed to him later, was in some +indefinable way /paying attention/). + +He explained about the caravans. The child nodded. + +"People all get together to travel?" + +"Precisely." + +"Where to?" + +"All sorts of places. Sto Lat, Pseudopolis... Ankh-Morpork, of course...." + +"But the river goes there," said Esk, reasonably. "Barges. The Zoons." + +"Ah, yes," said the merchant, "but they charge high prices and they can't +carry everything and, anyway, no one trusts them much." + +"But they're very honest!" + +"Huh, yes," he said. "But you know what they say: never trust an honest +man." He smiled knowingly. + +"Who says that?" + +"They do. You know. People," he said, a certain uneasiness entering his +voice. + +"Oh," said Esk. She thought about it. "They must be very silly," she said +primly. "Thank you, anyway." + + [Equal Rites, by Terry Pratchett] +%e passage +# pp. 127-128 (this time broomstick is Granny's defective witch's broomstick) +%passage 9 +The broomstick lay between two trestles. Granny Weatherwax sat on a rock +outcrop while a dwarf half her height, wearing an apron that was a mass of +pockets, walked around the broom and occasionally poked it. + +Eventually he kicked the bristles and gave a long intake of breath, a sort +of reverse whistle, which is the secret sign of craftsman across the +universe and means that something expensive is about to happen. + +"Weellll," he said. "I could get the apprentices in to look at this, I +could. It's an education in itself. And you say it actually managed to +get airborne?" + +"It flew like a bird," said Granny. + +The dwarf lit a pipe. "I should very much like to see that bird," he said +reflectively. "I should imagine it's quite something to watch, a bird like +that." + +"Yes, but can you repair it?" said Granny. "I'm in a hurry." + +The dwarf sat down, slowly and deliberately. + +"As for /repair/," he said, "well, I don't know about /repair/. Rebuild, +maybe. Of course, it's hard to get the bristles these days even if you can +find people to do the proper binding, and the spells need--" + +"I don't want it rebuilt, I just want it to work properly," said Granny. + +"It's an early model, you see," the dwarf plugged on. "Very tricky, those +early models. You can't get the wood--" + +He was picked up bodily until his eyes were level with Granny's. Dwarves, +being magical in themselves as it were, are quite resistant to magic but +her expression looked as though she was trying to weld his eyeballs to the +back of his skull. + +"Just repair it," she hissed. "Please?" + +"What, make a bodge job?" said the dwarf, his pipe clattering to the floor. + +"Yes." + +"Patch it up, you mean? Betray my training by doing half a job?" + +"Yes," said Granny. Her pupils were two little black holes. + +"Oh," said the dwarf. "Right, then." + + [Equal Rites, by Terry Pratchett] +%e passage +# p. 185 (actually uses four periods to mark a sentence ending in a elipsis) +%passage 10 +There may be universes where librarianship is considered a peaceful sort of +occupation, and where the risks are limited to large volumes falling off +the shelves on to one's head, but the keeper of a /magic/ library is no job +for the unwary. Spells have power, and merely writing them down and +shoving them between covers doesn't do anything to reduce it. The stuff +leaks. Books tend to react with one another, creating randomized magic +with a mind of its own. Books of magic are usually chained to their +shelves, but not to prevent them being stolen.... + + [Equal Rites, by Terry Pratchett] +%e passage %e title # # # -%title Mort (1) +%title Mort (11) +# p. 136 (Signet edition; passage is a footnote; +# Vetinari doesn't show up as recurring Patrician until /Sourcery/) %passage 1 -Ankh-Morpork had dallied with many forms of government and hand ended up - with that form of democracy known as One Man, One Vote. The Patrician was -the Man; he had the Vote. +Ankh-Morpork had dallied with many forms of government and had ended up +with that form of democracy known as One Man, One Vote. The Patrician was +the Man; he had the Vote. + + [Mort, by Terry Pratchett] +%e passage +# p. 11 +%passage 2 +Mort was getting interested in the rock. It had curly shells in it, relics +of the early days of the world when the Creator had made creatures out of +stone, no-one knew why. + +Mort was interested in lots of things. Why people's teeth fitted together +so neatly, for example. He'd given that one a lot of thought. Then there +was the puzzle of why the sun came out during the day, instead of at night +when the light would come in useful. He knew the standard explanation, +which somehow didn't seem satisfying. + +In short, Mort is one of those people who are more dangerous than a bag +full of rattlesnakes. He was determined to discover the underlying logic +behind the universe. + +Which was going to be hard, because there wasn't one. The Creator had a +lot of remarkably good ideas when he put the world together, but making it +understandable hadn't been one of them. + + [Mort, by Terry Pratchett] +%e passage +# p. 18 +%passage 3 +"But you're Death," said Mort. "You go around killing people!" + +I? KILL? said Death, obviously offended. CERTAINLY NOT. PEOPLE /GET/ +KILLED, BUT THAT'S THEIR BUSINESS. I JUST TAKE OVER FROM THEN ON. AFTER +ALL, IT'D BE A BLOODY STUPID WORLD IF PEOPLE GOT KILLED WITHOUT DYING, +WOULDN'T IT? + + [Mort, by Terry Pratchett] +%e passage +# p. 25 +%passage 4 +"Is it magic?" said Mort. + +WHAT DO YOU THINK? said Death. AM I REALLY HERE, BOY? + +"Yes," said Mort slowly. "I... I've watched people. They look at you but +the don't see you, I think. You do something to their minds." + +Death shook his head. + +THEY DO IT ALL THEMSELVES, he said. THERE'S NO MAGIC. PEOPLE CAN'T SEE ME, +THEY SIMPLY WON'T ALLOW THEMSELVES TO DO IT. UNTIL IT'S TIME, OF COURSE. +WIZARDS CAN SEE ME, AND CATS. BUT YOUR AVERAGE HUMAN... NO, NEVER. He blew +a smoke ring at the sky, and added, STRANGE BUT TRUE. + + [Mort, by Terry Pratchett] +%e passage +# pp. 48-49 (Binky is Death's white horse, who was left 'parked' on a +# castle's roof; Mort is Death's novice apprentice) +%passage 5 +They were on the roof before he spoke again. + +YOU TRIED TO WARN HIM, he said, removing Binky's nosebag. + +"Yes, sir. Sorry." + +YOU CANNOT INTERFERE WITH FATE. WHO ARE YOU TO JUDGE WHO SHOULD LIVE AND +WHO SHOULD DIE? + +Death watched Mort's expression carefully. + +ONLY THE GODS ARE ALLOWED TO DO THAT, he added. TO TINKER WITH THE FATE OF +EVEN ONE INDIVIDUAL COULD DESTROY THE WHOLE WORLD. DO YOU UNDERSTAND? + +Mort nodded miserably. + +"Are you going to send me home?" he said. + +Death reached down and swung him up behind the saddle. + +BECAUSE YOU SHOWED COMPASSION? NO. I MIGHT HAVE DONE IF YOU HAD SHOWN +PLEASURE. BUT YOU MUST LEARN THE COMPASSION PROPER TO YOUR TRADE. + +"What's that?" + +A /SHARP/ EDGE. + + [Mort, by Terry Pratchett] +%e passage +# pp. 59-61 (in Ankh-Morpork, Mort has accidentally walked through a wall +# into an immigrant Klatchian family's dining room; 'the creature +# who was not there' refers to Death during an earlier event) +%passage 6 +"I'm no demon! I'm a human!" he said, and stopped in shock as his words +emerged in perfect Klatch. + +"You're a thief?" said the father. "A murderer? To creep in thus, are you +a /tax-gatherer/?" His hand slipped under the table and came up holding a +meat cleaver honed to paper thinness. His wife screamed and dropped the +plate and clutched the youngest children to her. + +Mort watched the blade weave through the air, and gave in. + +"I bring you greetings from the uttermost circles of hell," he hazarded. + +The change was remarkable. The cleaver was lowered and the family broke +into broad smiles. + +"There is much luck to us if a demon visits," beamed the father. "What is +your wish, O foul spawn of Offler's loins?" + +"Sorry?" said Mort. + +"A demon brings blessing and good fortune on the man that helps it," said +the man. "How may we be of assistance, O evil dogsbreath of the nether +pit?" + +"Well, I'm not very hungry," said Mort, "but if you know where I can get a +fast horse, I could be in Sto Lat before sunset." + +The man beamed and bowed. "I know the very place, noxious extrusion of the +bowels, if you would be so good as to follow me." + +Mort hurried out after him. The ancient ancestor watched them go with a +critical expression, its jowls rhymically chewing. + +"That was what they call a demon around here?" it said. "Offler rot this +country of dampness, even their demons are third-rate, not a patch on the +demons we had in the Old Country." + +The wife placed a small bowl of rice in the folded middle pair of hands of +the Offler statue (it would be gone in the morning) and stood back. + +"Husband did say that last month at the /Curry Gardens/ he served a creature +who was not there," she said. "He was impressed." + +Ten minutes later the man returned and, in solemn silence, placed a small +heap of gold coins on the table. They represented enough wealth to +purchase quite a large part of the city. + +"He had a bag of them," he said. + +The family stared at the money for some time. The wife sighed. + +"Riches bring many problems," she said. "What are we to do?" + +"We return to Klatch," said the husband firmly, "where our children can grow +up in a proper country, true to the glorious traditions of our ancient race +and men do not need to work as waiters for wicked masters but can stand tall +and proud. And we must leave right now, fragrant blossom of the date palm." + +"Why so soon, O hard-working son of the desert?" + +"Because," said the man, "I have just sold the Patrician's champion +racehorse." + + [Mort, by Terry Pratchett] +%e passage +# p. 139-140 (passage ends mid-sentence) +%passage 7 +"You don't know much about monarchy, do you?" said Keli. + +"Um, no?" + +"She means better to be a dead queen in your own castle than a live +commoner somewhere else," said Cutwell, [...] + + [Mort, by Terry Pratchett] +%e passage +# p. 158 +%passage 8 +"You mean you won't help?" said Mort. "Not even if you can?" + +"Give the boy a prize," growled Albert. "And it's no good thinking you can +appeal to my better nature under this here crusty exterior," he added, +"'cos my interior's pretty damn crusty too." + + [Mort, by Terry Pratchett] +%e passage +# p. 159-160 (Death has come to an employment agency--a new concept in +# Ankh-Morpork--looking for a job) +%passage 9 +"And what was your previous position?" + +I BEG YOUR PARDON? + +"What did you do for a living?" said the thin young man behind the desk. + +I USHERED SOULS INTO THE NEXT WORLD. I WAS THE GRAVE OF ALL HOPE. I WAS +THE ULTIMATE REALITY. I WAS THE ASSASSIN AGAINST WHOM NO LOCK WOULD HOLD. + +"Yes, point taken, but do you have any particular skills?" + +I SUPPOSE A CERTAIN AMOUNT OF EXPERTISE WITH AGRICULTURAL IMPLEMENTS? he +ventured after a while. + +The young man shook his head firmly. + +NO? + + [Mort, by Terry Pratchett] +%e passage +# p. 205 +%passage 10 +Death raised his skull and sniffed the air. + +The sound cut through all the other noises in the hall and forced them +into silence. + +It is the kind of noise that is heard on the twilight edges of dreams, +the sort that you wake from in the cold sweat of mortal horror. It was +the snuffling under the door of dread. It was like the snuffling of a +hedgehog, but if so then it was the kind of hedgehog that crashes out of +the verges and flattens lorries. It was the kind of noise you wouldn't +want to hear twice; you wouldn't want to hear it /once/. + + [Mort, by Terry Pratchett] +%e passage +# p. 207 +%passage 11 +"Well, that was a lesson to all of us," the bursar continued, brushing dust +and candle wax off his robe. He looked up, expecting to see the statue of +Alberto Malich back on its pedestal. + +"Clearly even statues have feelings," he said. "I myself recall, when I +was but a first-year student, writing my name on his... well, never mind. +The point is, I propose here and now we replace the statue." + +Dead silence greeted this suggestion. + +"With, say, an exact likeness cast in gold. Suitably embellished with +jewels, as befits our great founder," he went on brightly. + +"And to make sure no students deface it in any way I suggest we then erect +it in the deepest cellar," he continued. + +"And then lock the door," he added. Several wizards began to cheer up. + +"And throw away the key?" said Rincewind. + +"And /weld/ the door," the bursar said. He had just remembered about The +Mended Drum. He thought for a while and remembered about the physical +fitness regime as well. + +"And then brick up the doorway," he said. There was a round of applause. + +"And throw away the brick layer!" chortled Rincewind, who felt he was +getting the hang of this. + +The bursar scowled at him. "No need to get carried away," he said. [Mort, by Terry Pratchett] %e passage @@ -5997,7 +6639,7 @@ IF YOU ASK ME, said Death, NOBODY COULD DO ANY BETTER THAN THAT... # Used for interaction with Death. # %section Death -%title Death Quotes (13) +%title Death Quotes (19) %passage 1 WHERE THE FIRST PRIMAL CELL WAS, THERE WAS I ALSO. WHERE MAN IS, THERE AM I. WHEN THE LAST LIFE CRAWLS UNDER FREEZING STARS, THERE WILL I BE. %e passage @@ -6046,6 +6688,27 @@ SHALL WE GO? # p. 251 %passage 13 I HAVE COME FOR THEE. +# The Light Fantastic, p. 52 (Signet edition; quote has quotation marks but +# including them here wouldn't fit with the rest) +%passage 14 +DARK IN HERE, ISN'T IT? +# Equal Rites, p. 14 (Signet edition; second sentence continues +# 'said the deep, heavy voice...') +%passage 15 +THERE IS NO GOING BACK. THERE IS NO GOING BACK. +# p. 15 (contradicts later descriptions of Death as existing outside of time; +# presumably it's just intended as a colloquial expression) +%passage 16 +I HAVEN'T GOT ALL DAY, YOU KNOW. +# p. 15 (same page) +%passage 17 +LIFE IS FOR THE LIVING. +# Mort, p. 148 (Signet edition) +%passage 18 +NO-ONE EVER WANTED TO TALK TO ME BEFORE. +# p. 149 +%passage 19 +I HAVEN'T GOT A SINGLE FRIEND. EVEN CATS FIND ME AMUSING. %e title %e section # diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 0656e2f63..bf9bc56bd 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -860,12 +860,16 @@ See the section below entitled ``Conduct'' for details. Dip an object into something. .lp #enhance Advance or check weapon and spell skills. +.lp #exploremode +Enter the explore mode. .lp #force Force a lock. .lp #invoke Invoke an object's special powers. .lp #jump Jump to another location. +.lp #kick +Kick something. .lp #loot Loot a box or bag on the floor beneath you, or the saddle from a steed standing next to you. @@ -1948,7 +1952,7 @@ There is a section of this Guidebook that discusses that. .pg The default name of the configuration file varies on different operating systems. On DOS and Windows, it is ``defaults.nh'' -in the same folder as nethack.exe or nethackW.exe. On Unix, linux +in the same folder as nethack.exe or nethackW.exe. On Unix, Linux and Mac OS X it is ``.nethackrc'' in the user's home directory. NETHACKOPTIONS can also be set to the full name of a file you want to use (possibly preceded by an `@'). @@ -2121,6 +2125,11 @@ The default is to randomly pick an appropriate gender. If you prefix a `!' or ``no'' to the value, you can exclude that gender from being picked randomly. Cannot be set with the `O' command. Persistent. +.lp getpos_coord +When using the `/' command to look around on the map with +``autodescribe'' on, display coordinates after the description. +The value specified should be the first letter of one of the following: +compass, map, or none. Default is none. .lp "help " If more information is available for an object looked at with the `/' command, ask if you want to see it (default on). Turning help @@ -2218,6 +2227,10 @@ Default '>'. .lp menu_objsyms Show object symbols in menu headings in menus where the object symbols act as menu accelerators (default off). +.lp menu_overlay +Do not clear the screen before drawing menus, and align +menus to the right edge of the screen. Only for the tty port. +(default on) .lp menu_previous_page Menu character accelerator to goto the previous menu page. Implemented by the Amiga, Gem and tty ports. diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 5ccc9bdef..988367732 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -1042,6 +1042,9 @@ Dip an object into something. \item[\tb{\#enhance}] Advance or check weapon and spell skills. %.lp +\item[\tb{\#exploremode}] +Enter the explore mode. +%.lp \item[\tb{\#force}] Force a lock. %.lp @@ -1051,6 +1054,9 @@ Invoke an object's special powers. \item[\tb{\#jump}] Jump to another location. %.lp +\item[\tb{\#kick}] +Kick something. +%.lp \item[\tb{\#loot}] Loot a box or bag on the floor beneath you, or the saddle from a steed standing next to you. @@ -2347,7 +2353,7 @@ There is a section of this Guidebook that discusses that. %.pg The default name of the configuration file varies on different operating systems. On DOS and Windows, it is ``{\tt defaults.nh}'' -in the same folder as nethack.exe or nethackW.exe. On Unix, linux +in the same folder as nethack.exe or nethackW.exe. On Unix, Linux and Mac OS X it is ``{\tt.nethackrc}'' in the user's home directory. NETHACKOPTIONS can also be set to the full name of a file you want to use (possibly preceded by an `{\tt @}'). @@ -2553,6 +2559,12 @@ If you prefix `{\tt !}' or ``{\tt no}'' to the value, you can exclude that gender from being picked randomly. Cannot be set with the `{\tt O}' command. Persistent. %.lp +\item[\ib{getpos\verb+_+coord}] +When using the `{\tt /}' command to look around on the map with +``{\tt autodescribe}'' on, display coordinates after the description. +The value specified should be the first letter of one of the following: +compass, map, or none. Default is none. +%.lp \item[\ib{help}] If more information is available for an object looked at with the `{\tt /}' command, ask if you want to see it (default on). @@ -2664,6 +2676,10 @@ Default `\verb+>+'. \item[\ib{menu\verb+_+objsyms}] Show object symbols in menu headings in menus where the object symbols act as menu accelerators (default off). +\item[\ib{menu\verb+_+overlay}] +Do not clear the screen before drawing menus, and align +menus to the right edge of the screen. Only for the tty port. +(default on) \item[\ib{menu\verb+_+previous\verb+_+page}] Menu character accelerator to goto the previous menu page. Implemented by the Amiga, Gem and tty ports. diff --git a/doc/fixes36.1 b/doc/fixes36.1 index cc6cf57a7..bcc189206 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -81,6 +81,37 @@ ensure sufficient messages are given to clarify the transition from detected vampire bats to fog clouds in Vlad's tower fix "killing by kicking something weird" when kicking an object causes death guard macros available for mextra fields similar to those for oextra fields +compile-time option for an alternate paniclog format for public server use +make monsters forget where they stepped when fleeing or teleporting +requiver pickup_thrown objects if quiver is empty +make mimics mimicing walls or trees also block light +stepping onto lava destroyed non-fireproof water walking boots but left other + vulnerable boot types intact +fix death reason when eating tainted glob of (not corpse) +fix death reason when petrified (avoid redundant 'while getting stoned') +use appropriate place name for drum of earthquake shakes +fix unmapped branch stairs on sokoban level +redraw map when hilite_pile is toggled to display the highlighting +make commands that accept a count prefix for item selection + show "Count:" like command repeating does +make vault guard accept names starting with number +fix weight of containers in special levels +make the raven medusa level shortsighted +fix possible segfault in lev_comp when map was too tall +fix "the ice is bridged with ice" when freezing castle's moat or Medusa's sea +make monsters and pets avoid poison gas clouds if it would damage them +covetous monsters may choose to teleport to downstairs or ladders +doppelganger posing as Rider would never change shape +since doppelganger posing as Rider could never revert to innate form, + protection from shape changers turned it into genuine Rider +don't create globs of ooze/slime/pudding with bknown flag set so pre-known to + be "uncursed" +do allow globs with same curse/bless state to merge even when that state is + known for one and unknown for the other; result will have bknown clear +fix pile mark after killing a monster carrying a potion which is destroyed +only list known blank scrolls and known blank spellbooks as likely candidates + when choosing an item to write on for applied magic marker +make status hilites use same color names as menucolors Platform- and/or Interface-Specific Fixes @@ -89,6 +120,8 @@ tty: M-N gave "Unknown command 'M-" with "'." finishing the sentence on the line below it, leaving bogus '.' displayed on the top row of the map tty: specifying all four of role, race, gender, and alignment still prompted for confirmation with "Is this ok?" before starting play +tty: responding with or during role, race, &c selection + behaved same as to quit; now it will pick [random] instead unix/X11: in top level Makefile, some commented out definitions of VARDATND misspelled pilemark.xbm (as pilemark.xpm) unix/tty: fix compile warning about 'has_colors' for some configurations @@ -110,15 +143,32 @@ General New Features -------------------- naming Sting or Orcrist now breaks illiterate conduct different feedback for reading a scroll of mail created by writing with marker -wizard mode #wizintrinsic reading non-cursed scroll of enchant weapon uncurses welded tin opener if hero has no jumping ability but knows the jumping spell, the #jump command will attempt to cast the spell -additional tribute passages for The Colour of Magic, Snuff, and Raising Steam +allow moving cursor to monsters with 'm' (nearest first) and 'M' (furthest + first) when asked for map location, or to objects with 'o' and 'O' +allow picking a used inventory letter from menu when #adjusting +zapping wand of opening at yourself, unlock carried boxes +dissolve iron bars by force-fighting with wielded potion of acid +poison breath leaves a trail of poison gas +allow knife and stiletto as possible tin opening tools +wizard mode #wizintrinsic command +additional tribute passages for The Colour of Magic, The Light Fantastic, + Equal Rites, Mort, Snuff, and Raising Steam +compile-time options SIMPLE_MAIL and SERVER_ADMIN_MSG for public server use +database entries for Cleaver, Sunsword, Frost and Fire brands, and + polymorph trap +allow showing coordinates when picking a position on the map and + autodescribe option is on +new status line conditions Stone Strngl Deaf Lev Fly Ride Platform- and/or Interface-Specific New Features ------------------------------------------------ +tty: menu_overlay -option to clear screen and align menus to left +tty: compile-time option to output escape codes for tile data hints +unix: compile-time option MSGHANDLER to pass messages to external program NetHack Community Patches (or Variation) Included diff --git a/include/botl.h b/include/botl.h index 8945fa293..e9c5644bb 100644 --- a/include/botl.h +++ b/include/botl.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 botl.h $NHDT-Date: 1433105378 2015/05/31 20:49:38 $ $NHDT-Branch: status_hilite $:$NHDT-Revision: 1.14 $ */ +/* NetHack 3.6 botl.h $NHDT-Date: 1452660165 2016/01/13 04:42:45 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.15 $ */ /* Copyright (c) Michael Allison, 2003 */ /* NetHack may be freely redistributed. See license for details. */ @@ -9,14 +9,22 @@ * than COLNO * * longest practical second status line at the moment is - * Astral Plane $:12345 HP:700(700) Pw:111(111) AC:-127 Xp:30/123456789 - * T:123456 Satiated Conf FoodPois Ill Blind Stun Hallu Overloaded - * -- or somewhat over 130 characters +Astral Plane \GXXXXNNNN:123456 HP:1000(1000) Pw:111(111) AC:-127 + Xp:30/123456789 T:123456 Stone Slime Strngl FoodPois TermIll + Satiated Overloaded Blind Deaf Stun Conf Hallu Lev Ride + * -- or a bit under 185 characters. '$' gets encoded even when it + * could be used as-is. The first five status conditions are fatal + * so it's rare to have more than one at a time. + * + * When the full line is wider than the map, the basic status line + * formatting will move less important fields to the end, so if/when + * truncation is necessary, it will chop off the least significant + * information. */ -#if COLNO <= 140 -#define MAXCO 160 +#if COLNO <= 160 +#define MAXCO 200 #else -#define MAXCO (COLNO + 20) +#define MAXCO (COLNO + 40) #endif #ifdef STATUS_VIA_WINDOWPORT @@ -53,22 +61,28 @@ enum statusfields { BL_FLUSH = -1, BL_TITLE = 0, BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, BL_ALIGN, BL_SCORE, BL_CAP, BL_GOLD, BL_ENE, BL_ENEMAX, BL_XP, BL_AC, BL_HD, BL_TIME, BL_HUNGER, BL_HP, BL_HPMAX, BL_LEVELDESC, BL_EXP, BL_CONDITION }; +#endif #define MAXBLSTATS BL_CONDITION+1 #define BEFORE 0 #define NOW 1 -#endif /* Boolean condition bits for the condition mask */ /* clang-format off */ -#define BL_MASK_BLIND 0x00000001L -#define BL_MASK_CONF 0x00000002L -#define BL_MASK_FOODPOIS 0x00000004L -#define BL_MASK_ILL 0x00000008L -#define BL_MASK_HALLU 0x00000010L -#define BL_MASK_STUNNED 0x00000020L -#define BL_MASK_SLIMED 0x00000040L +#define BL_MASK_STONE 0x00000001L +#define BL_MASK_SLIME 0x00000002L +#define BL_MASK_STRNGL 0x00000004L +#define BL_MASK_FOODPOIS 0x00000008L +#define BL_MASK_TERMILL 0x00000010L +#define BL_MASK_BLIND 0x00000020L +#define BL_MASK_DEAF 0x00000040L +#define BL_MASK_STUN 0x00000080L +#define BL_MASK_CONF 0x00000100L +#define BL_MASK_HALLU 0x00000200L +#define BL_MASK_LEV 0x00000400L +#define BL_MASK_FLY 0x00000800L +#define BL_MASK_RIDE 0x00001000L /* clang-format on */ #define REASSESS_ONLY TRUE diff --git a/include/config.h b/include/config.h index 141a6845a..121ce5407 100644 --- a/include/config.h +++ b/include/config.h @@ -206,6 +206,10 @@ #define NEWS "news" /* the file containing the latest hack news */ #define PANICLOG "paniclog" /* log of panic and impossible events */ +/* alternative paniclog format, better suited for public servers with + many players, as it saves the player name and the game start time */ +/* #define PANICLOG_FMT2 */ + /* * PERSMAX, POINTSMIN, ENTRYMAX, PERS_IS_UID: * These control the contents of 'record', the high-scores file. @@ -435,6 +439,39 @@ typedef unsigned char uchar; * bugs left here. */ +/* TTY_TILES_ESCCODES: Enable output of special console escape codes + * which act as hints for external programs such as EbonHack. + * + * Only for TTY_GRAPHICS. + * + * All of the escape codes are in the format ESC [ N z, where N can be + * one or more positive integer values, separated by semicolons. + * For example ESC [ 1 ; 0 ; 120 z + * + * Possible codes are: + * ESC [ 1 ; 0 ; n ; m z Start a glyph (aka a tile) number n, with flags m + * ESC [ 1 ; 1 z End a glyph. + * ESC [ 1 ; 2 ; n z Select a window n to output to. + * ESC [ 1 ; 3 z End of data. NetHack has finished sending data, + * and is waiting for input. + * + * Whenever NetHack outputs anything, it will first output the "select window" + * code. Whenever NetHack outputs a tile, it will first output the "start + * glyph" code, then the escape codes for color and the glyph character + * itself, and then the "end glyph" code. + * + * To compile NetHack with this, add tile.c to WINSRC and tile.o to WINOBJ + * in the hints file or Makefile. + * Set boolean option vt_tiledata in your config file to turn this on. + * Note that gnome-terminal at least doesn't work with this. */ +/* #define TTY_TILES_ESCCODES */ + +/* NetHack will execute an external program whenever a new message-window + * message is shown. The program to execute is given in environment variable + * NETHACK_MSGHANDLER. It will get the message as the only parameter. + * Only available with POSIX_TYPES or GNU C */ +/* #define MSGHANDLER */ + /* #define STATUS_VIA_WINDOWPORT */ /* re-work of the status line updating process */ /* #define STATUS_HILITES */ /* support hilites of status fields */ @@ -455,6 +492,12 @@ typedef unsigned char uchar; /* End of Section 4 */ +#ifdef TTY_TILES_ESCCODES +# ifndef USE_TILES +# define USE_TILES +# endif +#endif + #include "global.h" /* Define everything else according to choices above */ #endif /* CONFIG_H */ diff --git a/include/extern.h b/include/extern.h index 3bba9fe1d..d0789f205 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 extern.h $NHDT-Date: 1451174855 2015/12/27 00:07:35 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.526 $ */ +/* NetHack 3.6 extern.h $NHDT-Date: 1452123455 2016/01/06 23:37:35 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.535 $ */ /* Copyright (c) Steve Creps, 1988. */ /* NetHack may be freely redistributed. See license for details. */ @@ -204,6 +204,7 @@ E int FDECL(isok, (int, int)); E int FDECL(get_adjacent_loc, (const char *, const char *, XCHAR_P, XCHAR_P, coord *)); E const char *FDECL(click_to_cmd, (int, int, int)); +E char FDECL(get_count, (char *, CHAR_P, long, long *)); #ifdef HANGUPHANDLING E void FDECL(hangup, (int)); E void NDECL(end_of_input); @@ -309,6 +310,7 @@ E void FDECL(map_location, (int, int, int)); E void FDECL(feel_newsym, (XCHAR_P, XCHAR_P)); E void FDECL(feel_location, (XCHAR_P, XCHAR_P)); E void FDECL(newsym, (int, int)); +E void FDECL(newsym_force, (int, int)); E void FDECL(shieldeff, (XCHAR_P, XCHAR_P)); E void FDECL(tmp_at, (int, int)); E void FDECL(swallowed, (int)); @@ -498,6 +500,7 @@ E void FDECL(endmultishot, (BOOLEAN_P)); E void FDECL(hitfloor, (struct obj *)); E void FDECL(hurtle, (int, int, int, BOOLEAN_P)); E void FDECL(mhurtle, (struct monst *, int, int, int)); +E boolean FDECL(throwing_weapon, (struct obj *)); E void FDECL(throwit, (struct obj *, long, BOOLEAN_P)); E int FDECL(omon_adj, (struct monst *, struct obj *, BOOLEAN_P)); E int FDECL(thitmonst, (struct monst *, struct obj *)); @@ -1061,6 +1064,7 @@ E void FDECL(nocmov, (int x, int y)); #ifdef MAIL #ifdef UNIX E void NDECL(getmailstatus); +E void NDECL(ck_server_admin_msg); #endif E void NDECL(ckmailstatus); E void FDECL(readmail, (struct obj *)); @@ -1200,6 +1204,7 @@ E boolean FDECL(bad_location, (XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P)); E void FDECL(place_lregion, (XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, d_level *)); +E void NDECL(fixup_special); E void NDECL(fumaroles); E void NDECL(movebubbles); E void NDECL(water_friction); @@ -1497,9 +1502,10 @@ E boolean FDECL(lined_up, (struct monst *)); E struct obj *FDECL(m_carrying, (struct monst *, int)); E void FDECL(m_useupall, (struct monst *, struct obj *)); E void FDECL(m_useup, (struct monst *, struct obj *)); -E void FDECL(m_throw, - (struct monst *, int, int, int, int, int, struct obj *)); -E boolean FDECL(hits_bars, (struct obj **, int, int, int, int)); +E void FDECL(m_throw, (struct monst *, int, int, int, int, int, struct obj *)); +E void FDECL(hit_bars, (struct obj **, int, int, int, int, + BOOLEAN_P, BOOLEAN_P)); +E boolean FDECL(hits_bars, (struct obj **, int, int, int, int, int, int)); /* ### muse.c ### */ @@ -1653,11 +1659,12 @@ E struct symparse *FDECL(match_sym, (char *)); E void NDECL(set_playmode); E int FDECL(sym_val, (char *)); E const char *FDECL(clr2colorname, (int)); +E int FDECL(match_str2clr, (char *)); E boolean FDECL(add_menu_coloring, (char *)); E boolean FDECL(get_menu_coloring, (char *, int *, int *)); E void NDECL(free_menu_coloring); E boolean FDECL(msgtype_parse_add, (char *)); -E int FDECL(msgtype_type, (const char *)); +E int FDECL(msgtype_type, (const char *, BOOLEAN_P)); E void NDECL(msgtype_free); /* ### pager.c ### */ diff --git a/include/flag.h b/include/flag.h index bd6d2b2fc..ac175880b 100644 --- a/include/flag.h +++ b/include/flag.h @@ -167,6 +167,11 @@ struct sysflag { * */ +/* values for iflags.getpos_coords */ +#define GPCOORDS_NONE 'n' +#define GPCOORDS_MAP 'm' +#define GPCOORDS_COMPASS 'c' + struct instance_flags { /* stuff that really isn't option or platform related. They are * set and cleared during the game to control the internal @@ -185,6 +190,7 @@ struct instance_flags { boolean mon_polycontrol; /* debug: control monster polymorphs */ /* stuff that is related to options and/or user or platform preferences */ unsigned msg_history; /* hint: # of top lines to save */ + int getpos_coords; /* show coordinates when getting cursor position */ int menu_headings; /* ATR for menu headings */ int *opt_booldup; /* for duplication of boolean opts in config file */ int *opt_compdup; /* for duplication of compound opts in config file */ @@ -199,6 +205,7 @@ struct instance_flags { boolean mention_walls; /* give feedback when bumping walls */ boolean menu_tab_sep; /* Use tabs to separate option menu fields */ boolean menu_head_objsym; /* Show obj symbol in menu headings */ + boolean menu_overlay; /* Draw menus over the map */ boolean menu_requested; /* Flag for overloaded use of 'm' prefix * on some non-move commands */ boolean renameallowed; /* can change hero name during role selection */ @@ -258,6 +265,9 @@ struct instance_flags { #ifdef LAN_FEATURES boolean lan_mail; /* mail is initialized */ boolean lan_mail_fetched; /* mail is awaiting display */ +#endif +#ifdef TTY_TILES_ESCCODES + boolean vt_tiledata; /* output console codes for tile support in TTY */ #endif boolean wizweight; /* display weight of everything in wizard mode */ /* diff --git a/include/hack.h b/include/hack.h index 2eae9e6ba..816b7fee0 100644 --- a/include/hack.h +++ b/include/hack.h @@ -29,6 +29,9 @@ #define EXT_ENCUMBER 4 /* Overtaxed */ #define OVERLOADED 5 /* Overloaded */ +/* weight increment of heavy iron ball */ +#define IRON_BALL_W_INCR 160 + /* hunger states - see hu_stat in eat.c */ #define SATIATED 0 #define NOT_HUNGRY 1 diff --git a/include/monst.h b/include/monst.h index 3c88d0172..7196026f9 100644 --- a/include/monst.h +++ b/include/monst.h @@ -159,6 +159,16 @@ struct monst { #define is_vampshifter(mon) \ ((mon)->cham == PM_VAMPIRE || (mon)->cham == PM_VAMPIRE_LORD \ || (mon)->cham == PM_VLAD_THE_IMPALER) + +/* mimic appearances that block vision/light */ +#define is_lightblocker_mappear(mon) \ + (is_obj_mappear(mon, BOULDER) || \ + ((mon)->m_ap_type == M_AP_FURNITURE \ + && ((mon)->mappearance == S_hcdoor \ + || (mon)->mappearance == S_vcdoor \ + || (mon)->mappearance < S_ndoor /* = walls */ \ + || (mon)->mappearance == S_tree))) + #define is_door_mappear(mon) ((mon)->m_ap_type == M_AP_FURNITURE \ && ((mon)->mappearance == S_hcdoor || (mon)->mappearance == S_vcdoor)) #define is_obj_mappear(mon,otyp) ((mon)->m_ap_type == M_AP_OBJECT \ diff --git a/include/unixconf.h b/include/unixconf.h index bc6984eec..236994bce 100644 --- a/include/unixconf.h +++ b/include/unixconf.h @@ -191,9 +191,30 @@ #endif #endif +/* If SIMPLE_MAIL is defined, the mail spool file format is + "sender:message", one mail per line, and mails are + read within game, from demon-delivered mail scrolls. + The mail spool file will be deleted once the player + has read the message. */ +/* #define SIMPLE_MAIL */ + +#ifndef MAILCKFREQ +/* How often mail spool file is checked for new messages, in turns */ #define MAILCKFREQ 50 +#endif + #endif /* MAIL */ +/* If SERVER_ADMIN_MSG is defined and the file exists, players get + a message from the user defined in the file. The file format + is "sender:message" all in one line. */ +/* #define SERVER_ADMIN_MSG "adminmsg" */ +#ifndef SERVER_ADMIN_MSG_CKFREQ +/* How often admin message file is checked for new messages, in turns */ +#define SERVER_ADMIN_MSG_CKFREQ 25 +#endif + + /* * Some terminals or terminal emulators send two character sequence "ESC c" * when Alt+c is pressed. The altmeta run-time option allows the user to diff --git a/src/allmain.c b/src/allmain.c index 9f4329143..737dcf0d5 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 allmain.c $NHDT-Date: 1451344214 2015/12/28 23:10:14 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.68 $ */ +/* NetHack 3.6 allmain.c $NHDT-Date: 1451955079 2016/01/05 00:51:19 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ diff --git a/src/apply.c b/src/apply.c index 0af45749a..339f7f6d0 100644 --- a/src/apply.c +++ b/src/apply.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 apply.c $NHDT-Date: 1450582748 2015/12/20 03:39:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.217 $ */ +/* NetHack 3.6 apply.c $NHDT-Date: 1452660177 2016/01/13 04:42:57 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.219 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -773,8 +773,6 @@ beautiful() : "ugly"); } -#define WEAK 3 /* from eat.c */ - static const char look_str[] = "look %s."; STATIC_OVL int @@ -1782,6 +1780,7 @@ struct obj *obj; if (Deaf) /* make_deaf() won't give feedback when already deaf */ pline("Nothing seems to happen."); make_deaf((HDeaf & TIMEOUT) + lcount, TRUE); + context.botl = TRUE; break; } return; diff --git a/src/botl.c b/src/botl.c index 422f6d4ef..49cb38154 100644 --- a/src/botl.c +++ b/src/botl.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 botl.c $NHDT-Date: 1447978683 2015/11/20 00:18:03 $ $NHDT-Branch: master $:$NHDT-Revision: 1.69 $ */ +/* NetHack 3.6 botl.c $NHDT-Date: 1452660188 2016/01/13 04:43:08 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.70 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -78,52 +78,135 @@ bot1() STATIC_OVL void bot2() { - char newbot2[MAXCO]; + char newbot2[MAXCO], /* MAXCO: botl.h */ + /* dungeon location (and gold), hero health (HP, PW, AC), + experience (HD if poly'd, else Exp level and maybe Exp points), + time (in moves), varying number of status conditions */ + dloc[QBUFSZ], hlth[QBUFSZ], expr[QBUFSZ], tmmv[QBUFSZ], cond[QBUFSZ]; register char *nb; - int hp, hpmax; - int cap = near_capacity(); + unsigned dln, dx, hln, xln, tln, cln; + int hp, hpmax, cap; + long money; + /* + * Various min(x,9999)'s are to avoid having excessive values + * violate the field width assumptions in botl.h and should not + * impact normal play [not too sure about limiting spell power + * to 3 digits]. Particularly 64-bit long for gold which could + * require many more digits if someone figures out a way to get + * and carry a really large (or negative) amount of it. + * Turn counter is also long, but we'll risk that. + */ + + /* dungeon location plus gold */ + (void) describe_level(dloc); /* includes at least one trailing space */ + if ((money = money_cnt(invent)) < 0L) + money = 0L; /* ought to issue impossible() and then discard gold */ + Sprintf(eos(dloc), "%s:%-2ld", + encglyph(objnum_to_glyph(GOLD_PIECE)), min(money, 999999L)); + dln = strlen(dloc); + /* '$' encoded as \GXXXXNNNN is 9 chars longer than display will need */ + dx = strstri(dloc, "\\G") ? 9 : 0; + + /* health and armor class (has trailing space for AC 0..9) */ hp = Upolyd ? u.mh : u.uhp; hpmax = Upolyd ? u.mhmax : u.uhpmax; - if (hp < 0) hp = 0; - (void) describe_level(newbot2); - Sprintf(nb = eos(newbot2), "%s:%-2ld HP:%d(%d) Pw:%d(%d) AC:%-2d", - encglyph(objnum_to_glyph(GOLD_PIECE)), money_cnt(invent), hp, - hpmax, u.uen, u.uenmax, u.uac); + Sprintf(hlth, "HP:%d(%d) Pw:%d(%d) AC:%-2d", + min(hp, 9999), min(hpmax, 9999), + min(u.uen, 999), min(u.uenmax, 999), u.uac); + hln = strlen(hlth); + /* experience */ if (Upolyd) - Sprintf(nb = eos(nb), " HD:%d", mons[u.umonnum].mlevel); + Sprintf(expr, "HD:%d", mons[u.umonnum].mlevel); else if (flags.showexp) - Sprintf(nb = eos(nb), " Xp:%u/%-1ld", u.ulevel, u.uexp); + Sprintf(expr, "Xp:%u/%-1ld", u.ulevel, u.uexp); else - Sprintf(nb = eos(nb), " Exp:%u", u.ulevel); + Sprintf(expr, "Exp:%u", u.ulevel); + xln = strlen(expr); + /* time/move counter */ if (flags.time) - Sprintf(nb = eos(nb), " T:%ld", moves); - if (strcmp(hu_stat[u.uhs], " ")) { - Sprintf(nb = eos(nb), " "); - Strcat(newbot2, hu_stat[u.uhs]); - } - if (Confusion) - Sprintf(nb = eos(nb), " Conf"); + Sprintf(tmmv, "T:%ld", moves); + else + tmmv[0] = '\0'; + tln = strlen(tmmv); + + /* status conditions; worst ones first */ + cond[0] = '\0'; /* once non-empty, cond will have a leading space */ + nb = cond; + /* + * Stoned, Slimed, Strangled, and both types of Sick are all fatal + * unless remedied before timeout expires. Should we order them by + * shortest time left? [Probably not worth the effort, since it's + * unusual for more than one of them to apply at a time.] + */ + if (Stoned) + Strcpy(nb = eos(nb), " Stone"); + if (Slimed) + Strcpy(nb = eos(nb), " Slime"); + if (Strangled) + Strcpy(nb = eos(nb), " Strngl"); if (Sick) { if (u.usick_type & SICK_VOMITABLE) - Sprintf(nb = eos(nb), " FoodPois"); + Strcpy(nb = eos(nb), " FoodPois"); if (u.usick_type & SICK_NONVOMITABLE) - Sprintf(nb = eos(nb), " Ill"); + Strcpy(nb = eos(nb), " TermIll"); } - if (Blind) - Sprintf(nb = eos(nb), " Blind"); - if (Stunned) - Sprintf(nb = eos(nb), " Stun"); - if (Hallucination) - Sprintf(nb = eos(nb), " Hallu"); - if (Slimed) - Sprintf(nb = eos(nb), " Slime"); - if (cap > UNENCUMBERED) + if (u.uhs != NOT_HUNGRY) + Sprintf(nb = eos(nb), " %s", hu_stat[u.uhs]); + if ((cap = near_capacity()) > UNENCUMBERED) Sprintf(nb = eos(nb), " %s", enc_stat[cap]); + if (Blind) + Strcpy(nb = eos(nb), " Blind"); + if (Deaf) + Strcpy(nb = eos(nb), " Deaf"); + if (Stunned) + Strcpy(nb = eos(nb), " Stun"); + if (Confusion) + Strcpy(nb = eos(nb), " Conf"); + if (Hallucination) + Strcpy(nb = eos(nb), " Hallu"); + /* levitation and flying are mutually exclusive; riding is not */ + if (Levitation) + Strcpy(nb = eos(nb), " Lev"); + if (Flying) + Strcpy(nb = eos(nb), " Fly"); + if (u.usteed) + Strcpy(nb = eos(nb), " Ride"); + cln = strlen(cond); + + /* + * Put the pieces together. If they all fit, keep the traditional + * sequence. Otherwise, move least important parts to the end in + * case the interface side of things has to truncate. Note that + * dloc[] contains '$' encoded in ten character sequence \GXXXXNNNN + * so we want to test its display length rather than buffer length. + * + * We don't have an actual display limit here, so have to go by the + * width of the map. Since we're reordering rather than truncating, + * wider displays can still show wider status than the map if the + * interface supports that. + */ + if ((dln - dx) + 1 + hln + 1 + xln + 1 + tln + 1 + cln <= COLNO) { + Sprintf(newbot2, "%s %s %s %s %s", dloc, hlth, expr, tmmv, cond); + } else { + if (dln + 1 + hln + 1 + xln + 1 + tln + 1 + cln + 1 > MAXCO) { + panic("bot2: second status line exceeds MAXCO (%u > %d)", + (dln + 1 + hln + 1 + xln + 1 + tln + 1 + cln + 1), MAXCO); + } else if ((dln - dx) + 1 + hln + 1 + xln + 1 + cln <= COLNO) { + Sprintf(newbot2, "%s %s %s %s %s", dloc, hlth, expr, cond, tmmv); + } else if ((dln - dx) + 1 + hln + 1 + cln <= COLNO) { + Sprintf(newbot2, "%s %s %s %s %s", dloc, hlth, cond, expr, tmmv); + } else { + Sprintf(newbot2, "%s %s %s %s %s", hlth, cond, dloc, expr, tmmv); + } + /* only two or three consecutive spaces available to squeeze out */ + mungspaces(newbot2); + } + curs(WIN_STATUS, 1, 1); putmixed(WIN_STATUS, 0, newbot2); } @@ -300,11 +383,10 @@ struct istat_s { STATIC_DCL void NDECL(init_blstats); STATIC_DCL char *FDECL(anything_to_s, (char *, anything *, int)); -STATIC_DCL void FDECL(s_to_anything, (anything *, char *, int)); STATIC_OVL int FDECL(percentage, (struct istat_s *, struct istat_s *)); STATIC_OVL int FDECL(compare_blstats, (struct istat_s *, struct istat_s *)); - #ifdef STATUS_HILITES +STATIC_DCL void FDECL(s_to_anything, (anything *, char *, int)); STATIC_DCL boolean FDECL(assign_hilite, (char *, char *, char *, char *, BOOLEAN_P)); STATIC_DCL const char *FDECL(clridx_to_s, (char *, int)); @@ -338,35 +420,6 @@ STATIC_DCL struct istat_s initblstats[MAXBLSTATS] = { { (genericptr_t) 0 }, (char *) 0, 0, 0, BL_CONDITION} }; -static struct fieldid_t { - const char *fieldname; - enum statusfields fldid; -} fieldids[] = { - {"title", BL_TITLE}, - {"strength", BL_STR}, - {"dexterity", BL_DX}, - {"constitution", BL_CO}, - {"intelligence", BL_IN}, - {"wisdom", BL_WI}, - {"charisma", BL_CH}, - {"alignment", BL_ALIGN}, - {"score", BL_SCORE}, - {"carrying-capacity", BL_CAP}, - {"gold", BL_GOLD}, - {"power", BL_ENE}, - {"power-max", BL_ENEMAX}, - {"experience-level", BL_XP}, - {"armor-class", BL_AC}, - {"HD", BL_HD}, - {"time", BL_TIME}, - {"hunger", BL_HUNGER}, - {"hitpoints", BL_HP}, - {"hitpoints-max", BL_HPMAX}, - {"dungeon-level", BL_LEVELDESC}, - {"experience", BL_EXP}, - {"condition", BL_CONDITION}, -}; - struct istat_s blstats[2][MAXBLSTATS]; static boolean blinit = FALSE, update_all = FALSE; @@ -376,11 +429,11 @@ bot() char buf[BUFSZ]; register char *nb; static int idx = 0, idx_p, idxmax; - boolean updated = FALSE; unsigned anytype; + long money; int i, pc, chg, cap; struct istat_s *curr, *prev; - boolean valset[MAXBLSTATS], chgval = FALSE; + boolean valset[MAXBLSTATS], chgval = FALSE, updated = FALSE; if (!blinit) panic("bot before init."); @@ -390,41 +443,35 @@ bot() return; } - cap = near_capacity(); idx_p = idx; idx = 1 - idx; /* 0 -> 1, 1 -> 0 */ /* clear the "value set" indicators */ - (void) memset((genericptr_t) valset, 0, MAXBLSTATS * sizeof(boolean)); + (void) memset((genericptr_t) valset, 0, MAXBLSTATS * sizeof (boolean)); + + /* + * Note: min(x,9999) - we enforce the same maximum on hp, maxhp, + * pw, maxpw, and gold as basic status formatting so that the two + * modes of status display don't produce different information. + */ /* * Player name and title. */ - buf[0] = '\0'; - Strcpy(buf, plname); - if ('a' <= buf[0] && buf[0] <= 'z') - buf[0] += 'A' - 'a'; - buf[10] = 0; - Sprintf(nb = eos(buf), " the "); + Strcpy(nb = buf, plname); + nb[0] = highc(nb[0]); + nb[10] = '\0'; + Sprintf(nb = eos(nb), " the "); if (Upolyd) { - char mbot[BUFSZ]; - int k = 0; - - Strcpy(mbot, mons[u.umonnum].mname); - while (mbot[k] != 0) { - if ((k == 0 || (k > 0 && mbot[k - 1] == ' ')) && 'a' <= mbot[k] - && mbot[k] <= 'z') - mbot[k] += 'A' - 'a'; - k++; - } - Sprintf1(nb = eos(nb), mbot); + for (i = 0, nb = strcpy(eos(nb), mons[u.umonnum].mname); nb[i]; i++) + if (i == 0 || nb[i - 1] == ' ') + nb[i] = highc(nb[i]); } else - Sprintf1(nb = eos(nb), rank()); + Strcpy(nb = eos(nb), rank()); Sprintf(blstats[idx][BL_TITLE].val, "%-29s", buf); valset[BL_TITLE] = TRUE; /* indicate val already set */ /* Strength */ - buf[0] = '\0'; blstats[idx][BL_STR].a.a_int = ACURR(A_STR); if (ACURR(A_STR) > 18) { @@ -440,7 +487,6 @@ bot() valset[BL_STR] = TRUE; /* indicate val already set */ /* Dexterity, constitution, intelligence, wisdom, charisma. */ - blstats[idx][BL_DX].a.a_int = ACURR(A_DEX); blstats[idx][BL_CO].a.a_int = ACURR(A_CON); blstats[idx][BL_IN].a.a_int = ACURR(A_INT); @@ -448,130 +494,119 @@ bot() blstats[idx][BL_CH].a.a_int = ACURR(A_CHA); /* Alignment */ - - Strcpy(blstats[idx][BL_ALIGN].val, - (u.ualign.type == A_CHAOTIC) - ? "Chaotic" - : (u.ualign.type == A_NEUTRAL) ? "Neutral" : "Lawful"); + Strcpy(blstats[idx][BL_ALIGN].val, (u.ualign.type == A_CHAOTIC) + ? "Chaotic" + : (u.ualign.type == A_NEUTRAL) + ? "Neutral" + : "Lawful"); /* Score */ - blstats[idx][BL_SCORE].a.a_long = #ifdef SCORE_ON_BOTL - botl_score(); + botl_score() #else - 0; + 0L #endif - /* Hit points */ + ; - blstats[idx][BL_HP].a.a_int = Upolyd ? u.mh : u.uhp; - blstats[idx][BL_HPMAX].a.a_int = Upolyd ? u.mhmax : u.uhpmax; - if (blstats[idx][BL_HP].a.a_int < 0) - blstats[idx][BL_HP].a.a_int = 0; + /* Hit points */ + i = Upolyd ? u.mh : u.uhp; + if (i < 0) + i = 0; + blstats[idx][BL_HP].a.a_int = min(i, 9999); + i = Upolyd ? u.mhmax : u.uhpmax; + blstats[idx][BL_HPMAX].a.a_int = min(i, 9999); /* Dungeon level. */ - (void) describe_level(blstats[idx][BL_LEVELDESC].val); valset[BL_LEVELDESC] = TRUE; /* indicate val already set */ /* Gold */ - - blstats[idx][BL_GOLD].a.a_long = money_cnt(invent); + if ((money = money_cnt(invent)) < 0L) + money = 0L; /* ought to issue impossible() and then discard gold */ + blstats[idx][BL_GOLD].a.a_long = min(money, 999999L); /* * The tty port needs to display the current symbol for gold * as a field header, so to accommodate that we pass gold with * that already included. If a window port needs to use the text * gold amount without the leading "$:" the port will have to - * add 2 to the value pointer it was passed in status_update() + * skip past ':' to the value pointer it was passed in status_update() * for the BL_GOLD case. * * Another quirk of BL_GOLD is that the field display may have * changed if a new symbol set was loaded, or we entered or left * the rogue level. + * + * The currency prefix is encoded as ten character \GXXXXNNNN + * sequence. */ - Sprintf(blstats[idx][BL_GOLD].val, "%s:%ld", encglyph(objnum_to_glyph(GOLD_PIECE)), blstats[idx][BL_GOLD].a.a_long); valset[BL_GOLD] = TRUE; /* indicate val already set */ /* Power (magical energy) */ - - blstats[idx][BL_ENE].a.a_int = u.uen; - blstats[idx][BL_ENEMAX].a.a_int = u.uenmax; + blstats[idx][BL_ENE].a.a_int = min(u.uen, 999); + blstats[idx][BL_ENEMAX].a.a_int = min(u.uenmax, 999); /* Armor class */ - blstats[idx][BL_AC].a.a_int = u.uac; /* Monster level (if Upolyd) */ - - if (Upolyd) - blstats[idx][BL_HD].a.a_int = mons[u.umonnum].mlevel; - else - blstats[idx][BL_HD].a.a_int = 0; + blstats[idx][BL_HD].a.a_int = Upolyd ? mons[u.umonnum].mlevel : 0; /* Experience */ - blstats[idx][BL_XP].a.a_int = u.ulevel; blstats[idx][BL_EXP].a.a_int = u.uexp; /* Time (moves) */ - blstats[idx][BL_TIME].a.a_long = moves; /* Hunger */ - blstats[idx][BL_HUNGER].a.a_uint = u.uhs; - *(blstats[idx][BL_HUNGER].val) = '\0'; - if (strcmp(hu_stat[u.uhs], " ") != 0) - Strcpy(blstats[idx][BL_HUNGER].val, hu_stat[u.uhs]); + Strcpy(blstats[idx][BL_HUNGER].val, + (u.uhs != NOT_HUNGRY) ? hu_stat[u.uhs] : ""); valset[BL_HUNGER] = TRUE; /* Carrying capacity */ - - *(blstats[idx][BL_CAP].val) = '\0'; + cap = near_capacity(); blstats[idx][BL_CAP].a.a_int = cap; - if (cap > UNENCUMBERED) - Strcpy(blstats[idx][BL_CAP].val, enc_stat[cap]); + Strcpy(blstats[idx][BL_CAP].val, + (cap > UNENCUMBERED) ? enc_stat[cap] : ""); valset[BL_CAP] = TRUE; /* Conditions */ - + blstats[idx][BL_CONDITION].a.a_ulong = 0L; + if (Stoned) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_STONE; + if (Slimed) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_SLIME; + if (Strangled) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_STRNGL; + if (Sick && (u.usick_type & SICK_VOMITABLE) != 0) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_FOODPOIS; + if (Sick && (u.usick_type & SICK_NONVOMITABLE) != 0) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_TERMILL; + /* + * basic formatting puts hunger status and encumbrance here + */ if (Blind) blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_BLIND; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_BLIND; - + if (Deaf) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_DEAF; + if (Stunned) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_STUN; if (Confusion) blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_CONF; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_CONF; - - if (Sick && u.usick_type & SICK_VOMITABLE) - blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_FOODPOIS; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_FOODPOIS; - - if (Sick && u.usick_type & SICK_NONVOMITABLE) - blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_ILL; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_ILL; - if (Hallucination) blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_HALLU; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_HALLU; - - if (Stunned) - blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_STUNNED; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_STUNNED; - - if (Slimed) - blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_SLIMED; - else - blstats[idx][BL_CONDITION].a.a_ulong &= ~BL_MASK_SLIMED; + /* levitation and flying are mututally exclusive */ + if (Levitation) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_LEV; + if (Flying) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_FLY; + if (u.usteed) + blstats[idx][BL_CONDITION].a.a_ulong |= BL_MASK_RIDE; /* * Now pass the changed values to window port. @@ -587,10 +622,11 @@ bot() curr = &blstats[idx][i]; prev = &blstats[idx_p][i]; chg = 0; - if (update_all || ((chg = compare_blstats(prev, curr)) != 0) - || ((chgval = (valset[i] && strcmp(blstats[idx][i].val, - blstats[idx_p][i].val))) - != 0)) { + if (update_all + || ((chg = compare_blstats(prev, curr)) != 0) + || ((chgval = (valset[i] + && strcmp(blstats[idx][i].val, + blstats[idx_p][i].val))) != 0)) { idxmax = blstats[idx][i].idxmax; pc = (idxmax) ? percentage(curr, &blstats[idx][idxmax]) : 0; if (!valset[i]) @@ -599,9 +635,8 @@ bot() status_update(i, (genericptr_t) curr->val, valset[i] ? chgval : chg, pc); } else { - status_update(i, - /* send pointer to mask */ - (genericptr_t) &curr->a.a_ulong, chg, 0); + /* send pointer to mask */ + status_update(i, (genericptr_t) &curr->a.a_ulong, chg, 0); } updated = TRUE; } @@ -630,8 +665,8 @@ boolean reassessment; /* TRUE = just reassess fields w/o other initialization*/ { int i; - const char *fieldfmt = (const char *)0; - const char *fieldname = (const char *)0; + const char *fieldfmt = (const char *) 0; + const char *fieldname = (const char *) 0; if (!reassessment) { init_blstats(); @@ -861,6 +896,8 @@ int anytype; return buf; } +#ifdef STATUS_HILITES + STATIC_OVL void s_to_anything(a, buf, anytype) anything *a; @@ -909,6 +946,8 @@ int anytype; return; } +#endif + STATIC_OVL int compare_blstats(bl1, bl2) struct istat_s *bl1, *bl2; @@ -1040,6 +1079,35 @@ struct istat_s *bl, *maxbl; /* Core status hiliting support */ /****************************************************************************/ +static struct fieldid_t { + const char *fieldname; + enum statusfields fldid; +} fieldids[] = { + {"title", BL_TITLE}, + {"strength", BL_STR}, + {"dexterity", BL_DX}, + {"constitution", BL_CO}, + {"intelligence", BL_IN}, + {"wisdom", BL_WI}, + {"charisma", BL_CH}, + {"alignment", BL_ALIGN}, + {"score", BL_SCORE}, + {"carrying-capacity", BL_CAP}, + {"gold", BL_GOLD}, + {"power", BL_ENE}, + {"power-max", BL_ENEMAX}, + {"experience-level", BL_XP}, + {"armor-class", BL_AC}, + {"HD", BL_HD}, + {"time", BL_TIME}, + {"hunger", BL_HUNGER}, + {"hitpoints", BL_HP}, + {"hitpoints-max", BL_HPMAX}, + {"dungeon-level", BL_LEVELDESC}, + {"experience", BL_EXP}, + {"condition", BL_CONDITION}, +}; + struct hilite_s { boolean set; unsigned anytype; @@ -1111,6 +1179,7 @@ boolean from_configfile; { int i; anything it; + it = zeroany; for (i = 0; i < MAXBLSTATS; ++i) { (void) memset((genericptr_t) &status_hilites[i], 0, @@ -1189,15 +1258,11 @@ boolean from_configfile; /* actions */ for (i = 0; i < 2; ++i) { - if (!i) - how = sc; - else - how = sd; + how = !i ? sc : sd; if (!how) { if (!i) return FALSE; - else - break; /* sc is mandatory; sd is not */ + break; /* sc is mandatory; sd is not */ } if (strcmpi(how, "bold") == 0) { @@ -1207,21 +1272,11 @@ boolean from_configfile; } else if (strcmpi(how, "normal") == 0) { normal[i] = TRUE; } else { - int k; - char colorname[BUFSZ]; - for (k = 0; k < CLR_MAX; ++k) { - /* we have to make a copy to change space to dash */ - (void) strcpy(colorname, c_obj_colors[k]); - for (tmp = index(colorname, ' '); tmp; - tmp = index(colorname, ' ')) - *tmp = '-'; - if (strcmpi(how, colorname) == 0) { - coloridx[i] = k; - break; - } - } + int k = match_str2clr(how); + if (k >= CLR_MAX) return FALSE; + coloridx[i] = k; } } @@ -1275,10 +1330,10 @@ boolean all; for (idx = 0; idx < MAXBLSTATS; ++idx) { if (status_hilites[idx].set) status_threshold(idx, status_hilites[idx].anytype, - status_hilites[idx].threshold, - status_hilites[idx].behavior, - status_hilites[idx].coloridx[0], - status_hilites[idx].coloridx[1]); + status_hilites[idx].threshold, + status_hilites[idx].behavior, + status_hilites[idx].coloridx[0], + status_hilites[idx].coloridx[1]); else status_threshold(idx, blstats[0][idx].anytype, it, 0, 0, 0); @@ -1362,6 +1417,7 @@ int bufsiz; text = "normal"; } else { char *blank; + (void) strcpy(colorname, c_obj_colors[coloridx]); for (blank = index(colorname, ' '); blank; blank = index(colorname, ' ')) @@ -1438,6 +1494,7 @@ status_hilite_menu() for (i = 0; i < MAXBLSTATS; i++) { if (field_picks[i]) { menu_item *pick = (menu_item *) 0; + Sprintf(buf, "Threshold behavior options for %s:", fieldids[i].fieldname); tmpwin = create_nhwindow(NHW_MENU); diff --git a/src/cmd.c b/src/cmd.c index 191ab71f3..47cdf8a2e 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 cmd.c $NHDT-Date: 1451082253 2015/12/25 22:24:13 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.212 $ */ +/* NetHack 3.6 cmd.c $NHDT-Date: 1452660189 2016/01/13 04:43:09 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.219 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1140,6 +1140,7 @@ wiz_intrinsic(VOID_ARGS) if (!strcmp(intrinsics[i],"deafness")) { You("go deaf."); incr_itimeout(&HDeaf, 30); + context.botl = TRUE; } } else pline("Unavailable command '%s'.", @@ -2777,6 +2778,7 @@ struct ext_func_tab extcmdlist[] = { { "force", "force a lock", doforce, FALSE }, { "invoke", "invoke an object's powers", doinvoke, TRUE }, { "jump", "jump to a location", dojump, FALSE }, + { "kick", "kick something", dokick, FALSE }, { "loot", "loot a box on the floor", doloot, FALSE }, { "monster", "use a monster's special ability", domonability, TRUE }, { "name", "name a monster or an object", docallcmd, TRUE }, @@ -3864,6 +3866,60 @@ int x, y, mod; return cmd; } +char +get_count(allowchars, inkey, maxcount, count) +char *allowchars; +char inkey; +long maxcount; +long *count; +{ + char qbuf[QBUFSZ]; + int key; + long cnt = 0L; + boolean backspaced = FALSE; + /* this should be done in port code so that we have erase_char + and kill_char available; we can at least fake erase_char */ +#define STANDBY_erase_char '\177' + + for (;;) { + if (inkey) { + key = inkey; + inkey = '\0'; + } else + key = readchar(); + + if (digit(key)) { + cnt = 10L * cnt + (long) (key - '0'); + if (cnt < 0) + cnt = 0; + else if (maxcount > 0 && cnt > maxcount) + cnt = maxcount; + } else if (cnt && (key == '\b' || key == STANDBY_erase_char)) { + cnt = cnt / 10; + backspaced = TRUE; + } else if (key == '\033') { + break; + } else if (!allowchars || index(allowchars, key)) { + *count = cnt; + break; + } + + if (cnt > 9 || backspaced) { + clear_nhwindow(WIN_MESSAGE); + if (backspaced && !cnt) { + Sprintf(qbuf, "Count: "); + } else { + Sprintf(qbuf, "Count: %ld", cnt); + backspaced = FALSE; + } + pline1(qbuf); + mark_synch(); + } + } + return key; +} + + STATIC_OVL char * parse() { @@ -3882,25 +3938,12 @@ parse() #ifdef ALTMETA alt_esc = iflags.altmeta; /* readchar() hack */ #endif - if (!Cmd.num_pad || (foo = readchar()) == 'n') - for (;;) { - foo = readchar(); - if (foo >= '0' && foo <= '9') { - multi = 10 * multi + foo - '0'; - if (multi < 0 || multi >= LARGEST_INT) - multi = LARGEST_INT; - if (multi > 9) { - clear_nhwindow(WIN_MESSAGE); - Sprintf(in_line, "Count: %d", multi); - pline1(in_line); - mark_synch(); - } - last_multi = multi; - if (!multi && foo == '0') - prezero = TRUE; - } else - break; /* not a digit */ - } + if (!Cmd.num_pad || (foo = readchar()) == 'n') { + long tmpmulti = multi; + + foo = get_count(NULL, '\0', LARGEST_INT, &tmpmulti); + last_multi = multi = tmpmulti; + } #ifdef ALTMETA alt_esc = FALSE; /* readchar() reset */ #endif diff --git a/src/detect.c b/src/detect.c index 1e5b23edc..c29ad83eb 100644 --- a/src/detect.c +++ b/src/detect.c @@ -1363,7 +1363,7 @@ register int aflag; /* intrinsic autosearch vs explicit searching */ unblock_point(x, y); /* vision */ exercise(A_WIS, TRUE); nomul(0); - feel_location(x, y); /* make sure it shows up */ + feel_newsym(x, y); /* make sure it shows up */ You("find a hidden passage."); } else { /* Be careful not to find anything in an SCORR or SDOOR */ @@ -1553,6 +1553,8 @@ int which_subset; /* when not full, whether to suppress objs and/or traps */ } } } + if (glyph == cmap_to_glyph(S_darkroom)) + glyph = cmap_to_glyph(S_room); /* FIXME: dirty hack */ show_glyph(x, y, glyph); } diff --git a/src/display.c b/src/display.c index e75f74d53..09fd943eb 100644 --- a/src/display.c +++ b/src/display.c @@ -1201,8 +1201,7 @@ set_mimic_blocking() for (mon = fmon; mon; mon = mon->nmon) { if (DEADMONSTER(mon)) continue; - if (mon->minvis && (is_door_mappear(mon) - || is_obj_mappear(mon,BOULDER))) { + if (mon->minvis && is_lightblocker_mappear(mon)) { if (See_invisible) block_point(mon->mx, mon->my); else @@ -1319,6 +1318,21 @@ static gbuf_entry gbuf[ROWNO][COLNO]; static char gbuf_start[ROWNO]; static char gbuf_stop[ROWNO]; +/* FIXME: This is a dirty hack, because newsym() doesn't distinguish + * between object piles and single objects, it doesn't mark the location + * for update. */ +void +newsym_force(x, y) +register int x, y; +{ + newsym(x,y); + gbuf[y][x].new = 1; + if (gbuf_start[y] > x) + gbuf_start[y] = x; + if (gbuf_stop[y] < x) + gbuf_stop[y] = x; +} + /* * Store the glyph in the 3rd screen for later flushing. */ diff --git a/src/do_name.c b/src/do_name.c index 889609034..8f0768e3b 100644 --- a/src/do_name.c +++ b/src/do_name.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 do_name.c $NHDT-Date: 1450178550 2015/12/15 11:22:30 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.80 $ */ +/* NetHack 3.6 do_name.c $NHDT-Date: 1452669022 2016/01/13 07:10:22 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.90 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -6,6 +6,10 @@ STATIC_DCL char *NDECL(nextmbuf); STATIC_DCL void FDECL(getpos_help, (BOOLEAN_P, const char *)); +STATIC_DCL int FDECL(CFDECLSPEC cmp_coord_distu, (const void *, + const void *)); +STATIC_DCL void FDECL(gather_locs, (coord **, int *, BOOLEAN_P)); +STATIC_DCL void FDECL(auto_describe, (int, int)); STATIC_DCL void NDECL(do_mname); STATIC_DCL boolean FDECL(alreadynamed, (struct monst *, char *, char *)); STATIC_DCL void FDECL(do_oname, (struct obj *)); @@ -30,7 +34,7 @@ nextmbuf() /* function for getpos() to highlight desired map locations. * parameter value 0 = initialize, 1 = highlight, 2 = done */ -void FDECL((*getpos_hilitefunc), (int)) = (void FDECL((*), (int))) 0; +static void FDECL((*getpos_hilitefunc), (int)) = (void FDECL((*), (int))) 0; void getpos_sethilite(f) @@ -55,6 +59,8 @@ const char *goal; putstr(tmpwin, 0, "Use [HJKL] to move the cursor 8 units at a time."); putstr(tmpwin, 0, "Or enter a background symbol (ex. <)."); putstr(tmpwin, 0, "Use @ to move the cursor on yourself."); + putstr(tmpwin, 0, "Use m or M to move the cursor to next monster."); + putstr(tmpwin, 0, "Use o or O to move the cursor to next object."); if (getpos_hilitefunc) putstr(tmpwin, 0, "Use $ to display valid locations."); putstr(tmpwin, 0, "Use # to toggle automatic description."); @@ -71,6 +77,144 @@ const char *goal; destroy_nhwindow(tmpwin); } +STATIC_OVL int +cmp_coord_distu(a, b) +const void *a; +const void *b; +{ + const coord *c1 = a; + const coord *c2 = b; + int dx, dy, dist_1, dist_2; + + dx = u.ux - c1->x; + dy = u.uy - c1->y; + dist_1 = max(abs(dx), abs(dy)); + dx = u.ux - c2->x; + dy = u.uy - c2->y; + dist_2 = max(abs(dx), abs(dy)); + + if (dist_1 == dist_2) + return (c1->y != c2->y) ? (c1->y - c2->y) : (c1->x - c2->x); + + return dist_1 - dist_2; +} + +/* gather locations for monsters or objects shown on the map */ +STATIC_OVL void +gather_locs(arr_p, cnt_p, do_mons) +coord **arr_p; +int *cnt_p; +boolean do_mons; +{ + int x, y, pass, glyph, idx, + tail = (do_mons ? monnum_to_glyph(PM_LONG_WORM_TAIL) : 0), + boulder = (!do_mons ? objnum_to_glyph(BOULDER) : 0), + rock = (!do_mons ? objnum_to_glyph(ROCK) : 0); + + /* + * We always include the hero's location even if there is no monster + * (invisible hero without see invisible) or object (usual case) + * displayed there. That way, the count will always be at least 1, + * and player has a visual indicator (cursor returns to hero's spot) + * highlighting when successive 'm's or 'o's have cycled all the way + * through all monsters or objects. + * + * Hero's spot will always sort to array[0] because it will always + * be the shortest distance (namely, 0 units) away from . + */ + *cnt_p = idx = 0; + for (pass = 0; pass < 2; pass++) { + for (x = 1; x < COLNO; x++) + for (y = 0; y < ROWNO; y++) { + /* TODO: if glyph is a pile glyph, convert to ordinary one + * in order to keep tail/boulder/rock check simple. + */ + glyph = glyph_at(x, y); + /* unlike '/M', this skips monsters revealed by + warning glyphs and remembered invisible ones */ + if ((x == u.ux && y == u.uy) + || (do_mons ? (glyph_is_monster(glyph) && glyph != tail) + : (glyph_is_object(glyph) + && glyph != boulder && glyph != rock))) { + if (!pass) { + ++*cnt_p; + } else { + (*arr_p)[idx].x = x; + (*arr_p)[idx].y = y; + ++idx; + } + } + } + + if (!pass) /* end of first pass */ + *arr_p = (coord *) alloc(*cnt_p * sizeof (coord)); + else /* end of second pass */ + qsort(*arr_p, *cnt_p, sizeof (coord), cmp_coord_distu); + } /* pass */ +} + +char * +dxdy_to_dist_descr(dx, dy) +int dx, dy; +{ + /* [12] suffices, but guard against long translation for direction-name */ + static char buf[20]; + int dst; + + if (!dx && !dy) { + Sprintf(buf, "here"); + } else if ((dst = xytod(dx, dy)) != -1) { + /* explicit direction; 'one step' is implicit */ + Sprintf(buf, "%s", directionname(dst)); + } else { + buf[0] = '\0'; + /* 9999: protect buf[] against overflow caused by invalid values */ + if (dy) { + if (abs(dy) > 9999) + dy = sgn(dy) * 9999; + Sprintf(eos(buf), "%d%c%s", abs(dy), (dy > 0) ? 's' : 'n', + dx ? "," : ""); + } + if (dx) { + if (abs(dx) > 9999) + dx = sgn(dx) * 9999; + Sprintf(eos(buf), "%d%c", abs(dx), (dx > 0) ? 'e' : 'w'); + } + } + return buf; +} + +STATIC_OVL void +auto_describe(cx, cy) +int cx, cy; +{ + coord cc; + int sym = 0, dx, dy; + char tmpbuf[BUFSZ]; + const char *firstmatch = "unknown"; + + cc.x = cx; + cc.y = cy; + if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch)) { + tmpbuf[0] = '\0'; + switch (iflags.getpos_coords) { + default: + break; + case GPCOORDS_COMPASS: + dx = cc.x - u.ux; + dy = cc.y - u.uy; + Sprintf(tmpbuf, " (%s)", dxdy_to_dist_descr(dx, dy)); + break; + case GPCOORDS_MAP: + Sprintf(tmpbuf, " (%d,%d)", cc.x, cc.y); + break; + } + pline("%s%s", firstmatch, tmpbuf); + curs(WIN_MAP, cx, cy); + flush_screen(0); + } +} + int getpos(ccp, force, goal) coord *ccp; @@ -85,6 +229,8 @@ const char *goal; static const char pick_chars[] = ".,;:"; const char *cp; boolean hilite_state = FALSE; + coord *monarr = (coord *) 0, *objarr = (coord *) 0; + int moncount = 0, monidx = 0, objcount = 0, objidx = 0; if (!goal) goal = "desired location"; @@ -109,18 +255,7 @@ const char *goal; flush_screen(0); show_goal_msg = FALSE; } else if (iflags.autodescribe && !msg_given && !hilite_state) { - coord cc; - int sym = 0; - char tmpbuf[BUFSZ]; - const char *firstmatch = NULL; - - cc.x = cx; - cc.y = cy; - if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch)) { - pline1(firstmatch); - curs(WIN_MAP, cx, cy); - flush_screen(0); - } + auto_describe(cx, cy); } c = nh_poskey(&tx, &ty, &sidx); @@ -192,7 +327,7 @@ const char *goal; if (c == '?' || redraw_cmd(c)) { if (c == '?') getpos_help(force, goal); - else /* ^R */ + else /* ^R */ docrt(); /* redraw */ /* update message window to reflect that we're still targetting */ show_goal_msg = TRUE; @@ -213,14 +348,46 @@ const char *goal; show_goal_msg = TRUE; msg_given = TRUE; goto nxtc; - } else if (c == '@') { + } else if (c == '@') { /* return to hero's spot */ + /* reset 'm','M' and 'o','O'; otherwise, there's no way for player + to achieve that except by manually cycling through all spots */ + monidx = objidx = 0; cx = u.ux; cy = u.uy; goto nxtc; + } else if (c == 'm' || c == 'M') { /* nearest or farthest monster */ + if (!monarr) { + gather_locs(&monarr, &moncount, TRUE); + monidx = 0; /* monarr[0] is hero's spot */ + } + if (c == 'm') { + monidx = (monidx + 1) % moncount; + } else { + if (--monidx < 0) + monidx = moncount - 1; + } + cx = monarr[monidx].x; + cy = monarr[monidx].y; + goto nxtc; + } else if (c == 'o' || c == 'O') { /* nearest or farthest object */ + if (!objarr) { + gather_locs(&objarr, &objcount, FALSE); + objidx = 0; /* objarr[0] is hero's spot */ + } + if (c == 'o') { + objidx = (objidx + 1) % objcount; + } else { + if (--objidx < 0) + objidx = objcount - 1; + } + cx = objarr[objidx].x; + cy = objarr[objidx].y; + goto nxtc; } else { if (!index(quitchars, c)) { char matching[MAXPCHARS]; int pass, lo_x, lo_y, hi_x, hi_y, k = 0; + (void) memset((genericptr_t) matching, 0, sizeof matching); for (sidx = 1; sidx < MAXPCHARS; sidx++) if (c == defsyms[sidx].sym || c == (int) showsyms[sidx]) @@ -307,6 +474,10 @@ const char *goal; clear_nhwindow(WIN_MESSAGE); ccp->x = cx; ccp->y = cy; + if (monarr) + free((genericptr_t) monarr); + if (objarr) + free((genericptr_t) objarr); getpos_hilitefunc = (void FDECL((*), (int))) 0; return result; } diff --git a/src/do_wear.c b/src/do_wear.c index ea73cace8..bedda5298 100644 --- a/src/do_wear.c +++ b/src/do_wear.c @@ -730,8 +730,9 @@ Amulet_on() case AMULET_OF_STRANGULATION: if (can_be_strangled(&youmonst)) { makeknown(AMULET_OF_STRANGULATION); - pline("It constricts your throat!"); Strangled = 6L; + context.botl = TRUE; + pline("It constricts your throat!"); } break; case AMULET_OF_RESTFUL_SLEEP: { @@ -780,11 +781,12 @@ Amulet_off() break; case AMULET_OF_STRANGULATION: if (Strangled) { + Strangled = 0L; + context.botl = TRUE; if (Breathless) Your("%s is no longer constricted!", body_part(NECK)); else You("can breathe more easily!"); - Strangled = 0L; } break; case AMULET_OF_RESTFUL_SLEEP: diff --git a/src/dog.c b/src/dog.c index efcb76892..a5f8a5a75 100644 --- a/src/dog.c +++ b/src/dog.c @@ -325,8 +325,7 @@ boolean with_you; xyflags = mtmp->mtrack[0].y; xlocale = mtmp->mtrack[1].x; ylocale = mtmp->mtrack[1].y; - mtmp->mtrack[0].x = mtmp->mtrack[0].y = 0; - mtmp->mtrack[1].x = mtmp->mtrack[1].y = 0; + memset(mtmp->mtrack, 0, sizeof(mtmp->mtrack)); if (mtmp == u.usteed) return; /* don't place steed on the map */ diff --git a/src/dothrow.c b/src/dothrow.c index 8de02854d..fa02a1186 100644 --- a/src/dothrow.c +++ b/src/dothrow.c @@ -16,7 +16,6 @@ STATIC_DCL void FDECL(check_shop_obj, (struct obj *, XCHAR_P, XCHAR_P, BOOLEAN_P)); STATIC_DCL void FDECL(breakmsg, (struct obj *, BOOLEAN_P)); STATIC_DCL boolean FDECL(toss_up, (struct obj *, BOOLEAN_P)); -STATIC_DCL boolean FDECL(throwing_weapon, (struct obj *)); STATIC_DCL void FDECL(sho_obj_return_to_u, (struct obj * obj)); STATIC_DCL boolean FDECL(mhurtle_step, (genericptr_t, int, int)); @@ -943,7 +942,7 @@ boolean hitsroof; } /* return true for weapon meant to be thrown; excludes ammo */ -STATIC_OVL boolean +boolean throwing_weapon(obj) struct obj *obj; { diff --git a/src/eat.c b/src/eat.c index d041976dd..265a868c3 100644 --- a/src/eat.c +++ b/src/eat.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 eat.c $NHDT-Date: 1451086430 2015/12/25 23:33:50 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.157 $ */ +/* NetHack 3.6 eat.c $NHDT-Date: 1452660191 2016/01/13 04:43:11 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.161 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1431,6 +1431,8 @@ struct obj *otmp; case ELVEN_DAGGER: case ORCISH_DAGGER: case ATHAME: + case KNIFE: + case STILETTO: case CRYSKNIFE: tmp = 3; break; @@ -1477,8 +1479,10 @@ int Hear_again(VOID_ARGS) { /* Chance of deafness going away while fainted/sleeping/etc. */ - if (!rn2(2)) + if (!rn2(2)) { make_deaf(0L, FALSE); + context.botl = TRUE; + } return 0; } @@ -1512,6 +1516,7 @@ struct obj *obj; where = (u.usteed) ? "saddle" : surface(u.ux, u.uy); pline_The("world spins and %s %s.", what, where); incr_itimeout(&HDeaf, duration); + context.botl = TRUE; nomul(-duration); multi_reason = "unconscious from rotten food"; nomovemsg = "You are conscious again."; @@ -2836,14 +2841,15 @@ boolean incr; /* stop what you're doing, then faint */ stop_occupation(); You("faint from lack of food."); - if (!Levitation) - selftouch("Falling, you"); incr_itimeout(&HDeaf, duration); + context.botl = TRUE; nomul(-duration); multi_reason = "fainted from lack of food"; nomovemsg = "You regain consciousness."; afternmv = unfaint; newhs = FAINTED; + if (!Levitation) + selftouch("Falling, you"); } } else if (u.uhunger < -(int) (200 + 20 * ACURR(A_CON))) { u.uhs = STARVED; diff --git a/src/end.c b/src/end.c index 5e5231856..7e53467e7 100644 --- a/src/end.c +++ b/src/end.c @@ -503,6 +503,42 @@ int how; return; } +/* some special cases for overriding while-helpless reason */ +static const struct { + int why, unmulti; + const char *exclude, *include; +} death_fixups[] = { + /* "petrified by , while getting stoned" -- "while getting stoned" + prevented any last-second recovery, but it was not the cause of + "petrified by " */ + { STONING, 1, "getting stoned", (char *) 0 }, + /* "died of starvation, while fainted from lack of food" is accurate + but sounds a fairly silly (and doesn't actually appear unless you + splice together death and while-helpless from xlogfile) */ + { STARVING, 0, "fainted from lack of food", "fainted" }, +}; + +/* clear away while-helpless when the cause of death caused that + helplessness (ie, "petrified by while getting stoned") */ +STATIC_DCL void +fixup_death(how) +int how; +{ + int i; + + for (i = 0; i < SIZE(death_fixups); ++i) + if (death_fixups[i].why == how + && !strcmp(death_fixups[i].exclude, multi_reason)) { + if (death_fixups[i].include) /* substitute an alternate reason */ + multi_reason = death_fixups[i].include; + else /* remove the helplessness reason */ + multi_reason = (char *) 0; + if (death_fixups[i].unmulti) /* possibly hide helplessness */ + multi = 0L; + break; + } +} + #if defined(WIN32) && !defined(SYSCF) #define NOTIFY_NETHACK_BUGS #endif @@ -1002,6 +1038,8 @@ int how; if (how == ESCAPED || how == PANICKED) killer.format = NO_KILLER_PREFIX; + fixup_death(how); /* actually, fixup multi_reason */ + if (how != PANICKED) { /* these affect score and/or bones, but avoid them during panic */ taken = paybill((how == ESCAPED) ? -1 : (how != QUIT)); diff --git a/src/files.c b/src/files.c index 059090b1f..8836b2b90 100644 --- a/src/files.c +++ b/src/files.c @@ -3120,6 +3120,11 @@ const char *reason; /* explanation */ program_state.in_paniclog = 1; lfile = fopen_datafile(PANICLOG, "a", TROUBLEPREFIX); if (lfile) { +#ifdef PANICLOG_FMT2 + (void) fprintf(lfile, "%ld %s: %s %s\n", + ubirthday, (plname ? plname : "(none)"), + type, reason); +#else time_t now = getnow(); int uid = getuid(); char playmode = wizard ? 'D' : discover ? 'X' : '-'; @@ -3127,6 +3132,7 @@ const char *reason; /* explanation */ (void) fprintf(lfile, "%s %08ld %06ld %d %c: %s %s\n", version_string(buf), yyyymmdd(now), hhmmss(now), uid, playmode, type, reason); +#endif /* !PANICLOG_FMT2 */ (void) fclose(lfile); } program_state.in_paniclog = 0; diff --git a/src/hack.c b/src/hack.c index 3f6514678..098546579 100644 --- a/src/hack.c +++ b/src/hack.c @@ -827,6 +827,9 @@ int mode; } else if (mode == TEST_TRAV) { struct obj *obj; + /* never travel through boulders in Sokoban */ + if (Sokoban) return FALSE; + /* don't pick two boulders in a row, unless there's a way thru */ if (sobj_at(BOULDER, ux, uy) && !Sokoban) { if (!Passes_walls @@ -1434,6 +1437,19 @@ domove() } } + if (context.forcefight && levl[x][y].typ == IRONBARS && uwep) { + struct obj *obj = uwep; + if (breaktest(obj)) { + if (obj->quan > 1L) + obj = splitobj(obj, 1L); + else + setuwep((struct obj *)0); + freeinv(obj); + } + hit_bars(&obj, u.ux, u.uy, x, y, TRUE, TRUE); + return; + } + /* specifying 'F' with no monster wastes a turn */ if (context.forcefight /* remembered an 'I' && didn't use a move command */ diff --git a/src/invent.c b/src/invent.c index 3f0c15b85..6a2a910bd 100644 --- a/src/invent.c +++ b/src/invent.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 invent.c $NHDT-Date: 1450306195 2015/12/16 22:49:55 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.180 $ */ +/* NetHack 3.6 invent.c $NHDT-Date: 1452650438 2016/01/13 02:00:38 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.188 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -434,6 +434,7 @@ struct obj *obj; { struct obj *otmp, *prev; int saved_otyp = (int) obj->otyp; /* for panic */ + boolean obj_was_thrown; if (obj->where != OBJ_FREE) panic("addinv: obj not free"); @@ -442,6 +443,7 @@ struct obj *obj; obj->no_charge = 0; /* should not be set in hero's invent */ if (Has_contents(obj)) picked_container(obj); /* clear no_charge */ + obj_was_thrown = obj->was_thrown; obj->was_thrown = 0; /* not meaningful for invent */ addinv_core1(obj); @@ -476,6 +478,10 @@ struct obj *obj; } obj->where = OBJ_INVENT; + /* fill empty quiver if obj was thrown */ + if (flags.pickup_thrown && !uquiver && obj_was_thrown + && (throwing_weapon(obj) || is_ammo(obj))) + setuqwep(obj); added: addinv_core2(obj); carry_obj_effects(obj); /* carrying affects the obj */ @@ -964,8 +970,8 @@ register const char *let, *word; boolean allownone = FALSE; boolean useboulder = FALSE; xchar foox = 0; - long cnt, prevcnt; - boolean prezero; + long cnt; + boolean cntgiven = FALSE; long dummymask; if (*let == ALLOW_COUNT) @@ -1128,6 +1134,9 @@ register const char *let, *word; /* worn armor or accessory covered by cursed worn armor */ || (taking_off(word) && inaccessible_equipment(otmp, (const char *) 0, TRUE)) + || (!strcmp(word, "write on") + && (!(otyp == SCR_BLANK_PAPER || otyp == SPE_BLANK_PAPER) + || !otmp->dknown || !objects[otyp].oc_name_known)) ) { /* acceptable but not listed as likely candidate */ foo--; @@ -1154,12 +1163,15 @@ register const char *let, *word; if (!foo && !allowall && !allownone) { You("don't have anything %sto %s.", foox ? "else " : "", word); return (struct obj *) 0; + } else if (!strcmp(word, "write on")) { /* ugly check for magic marker */ + /* we wanted all scrolls and books in altlets[], but that came with + 'allowall' which we don't want since it prevents "silly thing" + result if anything other than scroll or spellbook is chosen */ + allowall = FALSE; } for (;;) { cnt = 0; - if (allowcnt == 2) - allowcnt = 1; /* abort previous count */ - prezero = FALSE; + cntgiven = FALSE; if (!buf[0]) { Sprintf(qbuf, "What do you want to %s? [*]", word); } else { @@ -1169,28 +1181,17 @@ register const char *let, *word; ilet = readchar(); else ilet = yn_function(qbuf, (char *) 0, '\0'); - if (digit(ilet) && !allowcnt) { - pline("No count allowed with this command."); - continue; - } - if (ilet == '0') - prezero = TRUE; - while (digit(ilet)) { - if (ilet != '?' && ilet != '*') - savech(ilet); - /* accumulate unless cnt has overflowed */ - if (allowcnt < 3) { - prevcnt = cnt; - cnt = 10L * cnt + (long) (ilet - '0'); - /* signal presence of cnt */ - allowcnt = (cnt >= prevcnt) ? 2 : 3; + if (digit(ilet)) { + long tmpcnt = 0; + if (!allowcnt) { + pline("No count allowed with this command."); + continue; + } + ilet = get_count(NULL, ilet, LARGEST_INT, &tmpcnt); + if (tmpcnt) { + cnt = tmpcnt; + cntgiven = TRUE; } - ilet = readchar(); - } - if (allowcnt == 3) { - /* overflow detected; force cnt to be invalid */ - cnt = -1L; - allowcnt = 2; } if (index(quitchars, ilet)) { if (flags.verbose) @@ -1231,9 +1232,7 @@ register const char *let, *word; continue; if (allowcnt && ctmp >= 0) { cnt = ctmp; - if (!cnt) - prezero = TRUE; - allowcnt = 2; + cntgiven = TRUE; } if (ilet == '\033') { if (flags.verbose) @@ -1261,23 +1260,21 @@ register const char *let, *word; * to your money supply. The LRS is the tax bureau * from Larn. */ - if (allowcnt == 2 && cnt <= 0) { - if (cnt < 0 || !prezero) + if (cntgiven && cnt <= 0) { + if (cnt < 0) pline_The( "LRS would be very interested to know you have that much."); return (struct obj *) 0; } } - if (allowcnt == 2 && !strcmp(word, "throw")) { + if (cntgiven && !strcmp(word, "throw")) { /* permit counts for throwing gold, but don't accept * counts for other things since the throw code will * split off a single item anyway */ - if (ilet != def_oc_syms[COIN_CLASS].sym - && !(otmp && otmp->oclass == COIN_CLASS)) - allowcnt = 1; - if (cnt == 0 && prezero) + if (cnt == 0) return (struct obj *) 0; - if (cnt > 1) { + if (cnt > 1 && (ilet != def_oc_syms[COIN_CLASS].sym + && !(otmp && otmp->oclass == COIN_CLASS))) { You("can only throw one item at a time."); continue; } @@ -1305,7 +1302,7 @@ register const char *let, *word; silly_thing(word, otmp); return (struct obj *) 0; } - if (allowcnt == 2) { /* cnt given */ + if (cntgiven) { if (cnt == 0) return (struct obj *) 0; if (cnt != otmp->quan) { @@ -1328,7 +1325,7 @@ struct obj *otmp; #if 1 /* 'P','R' vs 'W','T' handling is obsolete */ nhUse(otmp); #else - const char *s1, *s2, *s3, *what; + const char *s1, *s2, *s3; int ocls = otmp->oclass, otyp = otmp->otyp; s1 = s2 = s3 = 0; @@ -1347,14 +1344,10 @@ struct obj *otmp; else if (!strcmp(word, "take off")) s1 = "R", s2 = "remove", s3 = ""; } - if (s1) { - what = "that"; - /* quantity for armor and accessory objects is always 1, - but some things should be referred to as plural */ - if (otyp == LENSES || is_gloves(otmp) || is_boots(otmp)) - what = "those"; - pline("Use the '%s' command to %s %s%s.", s1, s2, what, s3); - } else + if (s1) + pline("Use the '%s' command to %s %s%s.", s1, s2, + !is_plural(otmp) ? "that" : "those", s3); + else #endif pline(silly_thing_to, word); } @@ -2193,7 +2186,7 @@ char avoidlet; } end_menu(win, "Inventory letters used:"); - n = select_menu(win, PICK_NONE, &selected); + n = select_menu(win, PICK_ONE, &selected); if (n > 0) { ret = selected[0].item.a_char; free((genericptr_t) selected); @@ -2891,24 +2884,46 @@ mergable(otmp, obj) register struct obj *otmp, *obj; { int objnamelth = 0, otmpnamelth = 0; + if (obj == otmp) return FALSE; /* already the same object */ if (obj->otyp != otmp->otyp) + return FALSE; /* different types */ + if (obj->nomerge) /* explicitly marked to prevent merge */ return FALSE; + /* coins of the same kind will always merge */ if (obj->oclass == COIN_CLASS) return TRUE; + if (obj->unpaid != otmp->unpaid || obj->spe != otmp->spe || obj->dknown != otmp->dknown - || (obj->bknown != otmp->bknown && !Role_if(PM_PRIEST)) || obj->cursed != otmp->cursed || obj->blessed != otmp->blessed || obj->no_charge != otmp->no_charge || obj->obroken != otmp->obroken || obj->otrapped != otmp->otrapped || obj->lamplit != otmp->lamplit - || obj->greased != otmp->greased || obj->oeroded != otmp->oeroded - || obj->oeroded2 != otmp->oeroded2 || obj->bypass != otmp->bypass) + || obj->bypass != otmp->bypass) return FALSE; - if (obj->nomerge) /* explicitly marked to prevent merge */ + if (obj->oclass == FOOD_CLASS + && (obj->oeaten != otmp->oeaten || obj->orotten != otmp->orotten)) + return FALSE; + + if (obj->globby) { + /* globs won't merge if they have different bless/curse + state, but will merge non-bknown with bknown */ + if (obj->bknown != otmp->bknown) + obj->bknown = otmp->bknown = 0; + if (obj->rknown != otmp->rknown) + obj->rknown = otmp->rknown = 0; + if (obj->greased != otmp->greased) + obj->greased = otmp->greased = 0; + /* checks beyond this point aren't applicable to globs */ + return TRUE; + } + + if ((obj->bknown != otmp->bknown && !Role_if(PM_PRIEST)) + || obj->oeroded != otmp->oeroded || obj->oeroded2 != otmp->oeroded2 + || obj->greased != otmp->greased) return FALSE; if ((obj->oclass == WEAPON_CLASS || obj->oclass == ARMOR_CLASS) @@ -2916,10 +2931,6 @@ register struct obj *otmp, *obj; || obj->rknown != otmp->rknown)) return FALSE; - if (obj->oclass == FOOD_CLASS - && (obj->oeaten != otmp->oeaten || obj->orotten != otmp->orotten)) - return FALSE; - if (obj->otyp == CORPSE || obj->otyp == EGG || obj->otyp == TIN) { if (obj->corpsenm != otmp->corpsenm) return FALSE; @@ -3424,6 +3435,7 @@ doorganize() /* inventory organizer by Del Lamb */ names, strip off the name of the one being moved */ if (olth && !obj->oartifact && !mergable(otmp, obj)) { char *holdname = ONAME(obj); + ONAME(obj) = (char *) 0; /* restore name iff merging is still not possible */ if (!mergable(otmp, obj)) { diff --git a/src/mail.c b/src/mail.c index fb9c07c50..7c3546835 100644 --- a/src/mail.c +++ b/src/mail.c @@ -1,10 +1,14 @@ -/* NetHack 3.6 mail.c $NHDT-Date: 1450261364 2015/12/16 10:22:44 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.22 $ */ +/* NetHack 3.6 mail.c $NHDT-Date: 1451955080 2016/01/05 00:51:20 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.25 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ #include "hack.h" #ifdef MAIL +#ifdef SIMPLE_MAIL +# include +# include +#endif /* SIMPLE_MAIL */ #include "mail.h" /* @@ -466,6 +470,8 @@ struct obj *otmp UNUSED; void ckmailstatus() { + ck_server_admin_msg(); + if (!mailbox || u.uswallow || !flags.biff #ifdef MAILCKFREQ || moves < laststattime + MAILCKFREQ @@ -498,6 +504,112 @@ ckmailstatus() } } +#if defined(SIMPLE_MAIL) || defined(SERVER_ADMIN_MSG) +void +read_simplemail(mbox, adminmsg) +char *mbox; +boolean adminmsg; +{ + FILE* mb = fopen(mbox, "r"); + char curline[128], *msg; + boolean seen_one_already = FALSE; +#ifdef SIMPLE_MAIL + struct flock fl = { 0 }; +#endif + const char *msgfrom = adminmsg + ? "The voice of %s booms through the caverns:" + : "This message is from '%s'."; + + if (!mb) + goto bail; + +#ifdef SIMPLE_MAIL + fl.l_type = F_RDLCK; + fl.l_whence = SEEK_SET; + fl.l_start = 0; + fl.l_len = 0; + errno = 0; +#endif + + /* Allow this call to block. */ + if (!adminmsg +#ifdef SIMPLE_MAIL + && fcntl (fileno (mb), F_SETLKW, &fl) == -1 +#endif + ) + goto bail; + + while (fgets(curline, 128, mb) != NULL) { + if (!adminmsg) { +#ifdef SIMPLE_MAIL + fl.l_type = F_UNLCK; + fcntl (fileno(mb), F_UNLCK, &fl); +#endif + pline("There is a%s message on this scroll.", + seen_one_already ? "nother" : ""); + } + msg = strchr(curline, ':'); + + if (!msg) + goto bail; + + *msg = '\0'; + msg++; + msg[strlen(msg) - 1] = '\0'; /* kill newline */ + + pline(msgfrom, curline); + if (adminmsg) + verbalize(msg); + else + pline("It reads: \"%s\".", msg); + + seen_one_already = TRUE; +#ifdef SIMPLE_MAIL + errno = 0; + if (!adminmsg) { + fl.l_type = F_RDLCK; + fcntl(fileno(mb), F_SETLKW, &fl); + } +#endif + } + +#ifdef SIMPLE_MAIL + if (!adminmsg) { + fl.l_type = F_UNLCK; + fcntl(fileno(mb), F_UNLCK, &fl); + } +#endif + fclose(mb); + if (adminmsg) + display_nhwindow(WIN_MESSAGE, TRUE); + else + unlink(mailbox); + return; +bail: + /* bail out _professionally_ */ + if (!adminmsg) + pline("It appears to be all gibberish."); +} +#endif /* SIMPLE_MAIL */ + +void +ck_server_admin_msg() +{ +#ifdef SERVER_ADMIN_MSG + static struct stat ost,nst; + static long lastchk = 0; + + if (moves < lastchk + SERVER_ADMIN_MSG_CKFREQ) return; + lastchk = moves; + + if (!stat(SERVER_ADMIN_MSG, &nst)) { + if (nst.st_mtime > ost.st_mtime) + read_simplemail(SERVER_ADMIN_MSG, TRUE); + ost.st_mtime = nst.st_mtime; + } +#endif /* SERVER_ADMIN_MSG */ +} + /*ARGSUSED*/ void readmail(otmp) @@ -505,7 +617,12 @@ struct obj *otmp UNUSED; { #ifdef DEF_MAILREADER /* This implies that UNIX is defined */ register const char *mr = 0; - +#endif /* DEF_MAILREADER */ +#ifdef SIMPLE_MAIL + read_simplemail(mailbox, FALSE); + return; +#endif /* SIMPLE_MAIL */ +#ifdef DEF_MAILREADER /* This implies that UNIX is defined */ display_nhwindow(WIN_MESSAGE, FALSE); if (!(mr = nh_getenv("MAILREADER"))) mr = DEF_MAILREADER; diff --git a/src/mkmaze.c b/src/mkmaze.c index 100b0b525..246dafea4 100644 --- a/src/mkmaze.c +++ b/src/mkmaze.c @@ -19,7 +19,6 @@ STATIC_DCL void FDECL(maze0xy, (coord *)); STATIC_DCL boolean FDECL(put_lregion_here, (XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, XCHAR_P, BOOLEAN_P, d_level *)); -STATIC_DCL void NDECL(fixup_special); STATIC_DCL void NDECL(setup_waterlevel); STATIC_DCL void NDECL(unsetup_waterlevel); @@ -123,13 +122,9 @@ int wall_there, dx, dy; return spine; } -/* - * Wall cleanup. This function has two purposes: (1) remove walls that - * are totally surrounded by stone - they are redundant. (2) correct - * the types so that they extend and connect to each other. - */ +/* Remove walls totally surrounded by stone */ void -wallification(x1, y1, x2, y2) +wall_cleanup(x1, y1, x2, y2) int x1, y1, x2, y2; { uchar type; @@ -138,9 +133,9 @@ int x1, y1, x2, y2; /* sanity check on incoming variables */ if (x1 < 0 || x2 >= COLNO || x1 > x2 || y1 < 0 || y2 >= ROWNO || y1 > y2) - panic("wallification: bad bounds (%d,%d) to (%d,%d)", x1, y1, x2, y2); + panic("wall_cleanup: bad bounds (%d,%d) to (%d,%d)", x1, y1, x2, y2); - /* Step 1: change walls surrounded by rock to rock. */ + /* change walls surrounded by rock to rock. */ for (x = x1; x <= x2; x++) for (y = y1; y <= y2; y++) { lev = &levl[x][y]; @@ -153,10 +148,9 @@ int x1, y1, x2, y2; lev->typ = STONE; } } - - fix_wall_spines(x1,y1,x2,y2); } +/* Correct wall types so they extend and connect to each other */ void fix_wall_spines(x1, y1, x2, y2) int x1, y1, x2, y2; @@ -181,11 +175,7 @@ int x1, y1, x2, y2; if (x1<0 || x2>=COLNO || x1>x2 || y1<0 || y2>=ROWNO || y1>y2) panic("wall_extends: bad bounds (%d,%d) to (%d,%d)",x1,y1,x2,y2); - /* - * Step 2: set the correct wall type. We can't combine steps - * 1 and 2 into a single sweep because we depend on knowing if - * the surrounding positions are stone. - */ + /* set the correct wall type. */ for (x = x1; x <= x2; x++) for (y = y1; y <= y2; y++) { lev = &levl[x][y]; @@ -217,6 +207,14 @@ int x1, y1, x2, y2; } } +void +wallification(x1, y1, x2, y2) +int x1, y1, x2, y2; +{ + wall_cleanup(x1,y1,x2,y2); + fix_wall_spines(x1,y1,x2,y2); +} + STATIC_OVL boolean okay(x, y, dir) int x, y; @@ -363,7 +361,7 @@ d_level *lev; static boolean was_waterlevel; /* ugh... this shouldn't be needed */ /* this is special stuff that the level compiler cannot (yet) handle */ -STATIC_OVL void +void fixup_special() { register lev_region *r = lregions; @@ -578,7 +576,6 @@ register const char *s; if (*protofile) { Strcat(protofile, LEV_EXT); if (load_special(protofile)) { - fixup_special(); /* some levels can end up with monsters on dead mon list, including light source monsters */ dmonsfree(); diff --git a/src/mkobj.c b/src/mkobj.c index 9a1023117..a6f8bfd29 100644 --- a/src/mkobj.c +++ b/src/mkobj.c @@ -819,11 +819,9 @@ boolean artif; } if (Is_pudding(otmp)) { otmp->globby = 1; - otmp->known = otmp->bknown = otmp->rknown = otmp->dknown = 1; - otmp->corpsenm = - PM_GRAY_OOZE + (otmp->otyp - GLOB_OF_GRAY_OOZE); - /* this ensures that they don't fail merging because of - * BUC status or other irrelevancies */ + otmp->known = otmp->dknown = 1; + otmp->corpsenm = PM_GRAY_OOZE + + (otmp->otyp - GLOB_OF_GRAY_OOZE); } else { if (otmp->otyp != CORPSE && otmp->otyp != MEAT_RING && otmp->otyp != KELP_FROND && !rn2(6)) { diff --git a/src/mon.c b/src/mon.c index 40cdb0dca..802d20bff 100644 --- a/src/mon.c +++ b/src/mon.c @@ -1172,6 +1172,9 @@ long flag; boolean wantpool, poolok, lavaok, nodiag; boolean rockok = FALSE, treeok = FALSE, thrudoor; int maxx, maxy; + boolean poisongas_ok, in_poisongas; + NhRegion *gas_reg; + int gas_glyph = cmap_to_glyph(S_poisoncloud); x = mon->mx; y = mon->my; @@ -1183,6 +1186,11 @@ long flag; || (is_swimmer(mdat) && !wantpool)); lavaok = (is_flyer(mdat) || is_clinger(mdat) || likes_lava(mdat)); thrudoor = ((flag & (ALLOW_WALL | BUSTDOOR)) != 0L); + poisongas_ok = ((nonliving(mdat) || is_vampshifter(mon) + || breathless(mdat)) || resists_poison(mon)); + in_poisongas = ((gas_reg = visible_region_at(x,y)) != 0 + && gas_reg->glyph == gas_glyph); + if (flag & ALLOW_DIG) { struct obj *mw_tmp; @@ -1231,6 +1239,11 @@ nexttry: /* eels prefer the water, but if there is no water nearby, || ((levl[nx][ny].doormask & D_LOCKED) && !(flag & UNLOCKDOOR))) && !thrudoor) continue; + /* avoid poison gas? */ + if (!poisongas_ok && !in_poisongas + && (gas_reg = visible_region_at(nx,ny)) != 0 + && gas_reg->glyph == gas_glyph) + continue; /* first diagonal checks (tight squeezes handled below) */ if (nx != x && ny != y && (nodiag @@ -1653,6 +1666,8 @@ struct permonst *mptr; /* reflects mtmp->data _prior_ to mtmp's death */ remove_monster(mtmp->mx, mtmp->my); if (emits_light(mptr)) del_light_source(LS_MONSTER, monst_to_any(mtmp)); + if (mtmp->m_ap_type) + seemimic(mtmp); newsym(mtmp->mx, mtmp->my); unstuck(mtmp); fill_pit(mtmp->mx, mtmp->my); @@ -2616,8 +2631,7 @@ void seemimic(mtmp) register struct monst *mtmp; { - boolean is_blocker_appear = (is_door_mappear(mtmp) - || is_obj_mappear(mtmp, BOULDER)); + boolean is_blocker_appear = (is_lightblocker_mappear(mtmp)); if (has_mcorpsenm(mtmp)) freemcorpsenm(mtmp); @@ -3143,8 +3157,9 @@ boolean msg; /* "The oldmon turns into a newmon!" */ struct permonst *olddata = mtmp->data; char oldname[BUFSZ], l_oldname[BUFSZ], newname[BUFSZ]; - /* Riders are immune to polymorph and green slime */ - if (is_rider(mtmp->data)) + /* Riders are immune to polymorph and green slime + (but apparent Rider might actually be a doppelganger) */ + if (is_rider(mtmp->data) && mtmp->cham == NON_PM) return 0; if (msg) { diff --git a/src/monmove.c b/src/monmove.c index 8fc93b745..86432a6c5 100644 --- a/src/monmove.c +++ b/src/monmove.c @@ -271,6 +271,8 @@ boolean fleemsg; } mtmp->mflee = 1; } + /* ignore recently-stepped spaces when made to flee */ + memset(mtmp->mtrack, 0, sizeof(mtmp->mtrack)); } STATIC_OVL void diff --git a/src/mthrowu.c b/src/mthrowu.c index b63a47900..54ef961fd 100644 --- a/src/mthrowu.c +++ b/src/mthrowu.c @@ -318,7 +318,9 @@ struct obj *obj; /* missile (or stack providing it) */ || IS_ROCK(levl[bhitpos.x + dx][bhitpos.y + dy].typ) || closed_door(bhitpos.x + dx, bhitpos.y + dy) || (levl[bhitpos.x + dx][bhitpos.y + dy].typ == IRONBARS - && hits_bars(&singleobj, bhitpos.x, bhitpos.y, 0, 0))) { + && hits_bars(&singleobj, + bhitpos.x, bhitpos.y, + bhitpos.x + dx, bhitpos.y + dy, 0, 0))) { (void) drop_throw(singleobj, 0, bhitpos.x, bhitpos.y); return; } @@ -455,7 +457,10 @@ struct obj *obj; /* missile (or stack providing it) */ || closed_door(bhitpos.x + dx, bhitpos.y + dy) /* missile might hit iron bars */ || (levl[bhitpos.x + dx][bhitpos.y + dy].typ == IRONBARS - && hits_bars(&singleobj, bhitpos.x, bhitpos.y, !rn2(5), 0)) + && hits_bars(&singleobj, + bhitpos.x, bhitpos.y, + bhitpos.x + dx, bhitpos.y + dy, + !rn2(5), 0)) /* Thrown objects "sink" */ || IS_SINK(levl[bhitpos.x][bhitpos.y].typ)) { if (singleobj) /* hits_bars might have destroyed it */ @@ -831,11 +836,45 @@ int type; return (struct obj *) 0; } +void +hit_bars(objp, objx, objy, barsx, barsy, your_fault, from_invent) +struct obj **objp; /* *objp will be set to NULL if object breaks */ +int objx, objy, barsx, barsy; +boolean your_fault, from_invent; +{ + struct obj *otmp = *objp; + int obj_type = otmp->otyp; + boolean unbreakable = (levl[barsx][barsy].wall_info & W_NONDIGGABLE) != 0; + + if (your_fault + ? hero_breaks(otmp, objx, objy, from_invent) + : breaks(otmp, objx, objy)) { + *objp = 0; /* object is now gone */ + /* breakage makes its own noises */ + if (obj_type == POT_ACID) { + if (cansee(barsx, barsy) && !unbreakable) + pline_The("iron bars are dissolved!"); + else + You_hear(Hallucination ? "angry snakes!" : "a hissing noise."); + if (!unbreakable) + dissolve_bars(barsx, barsy); + } + } + else if (obj_type == BOULDER || obj_type == HEAVY_IRON_BALL) + pline("Whang!"); + else if (otmp->oclass == COIN_CLASS + || objects[obj_type].oc_material == GOLD + || objects[obj_type].oc_material == SILVER) + pline("Clink!"); + else + pline("Clonk!"); +} + /* TRUE iff thrown/kicked/rolled object doesn't pass through iron bars */ boolean -hits_bars(obj_p, x, y, always_hit, whodidit) +hits_bars(obj_p, x, y, barsx, barsy, always_hit, whodidit) struct obj **obj_p; /* *obj_p will be set to NULL if object breaks */ -int x, y; +int x, y, barsx, barsy; int always_hit; /* caller can force a hit for items which would fit through */ int whodidit; /* 1==hero, 0=other, -1==just check whether it'll pass thru */ { @@ -885,17 +924,7 @@ int whodidit; /* 1==hero, 0=other, -1==just check whether it'll pass thru */ } if (hits && whodidit != -1) { - if (whodidit ? hero_breaks(otmp, x, y, FALSE) : breaks(otmp, x, y)) - *obj_p = otmp = 0; /* object is now gone */ - /* breakage makes its own noises */ - else if (obj_type == BOULDER || obj_type == HEAVY_IRON_BALL) - pline("Whang!"); - else if (otmp->oclass == COIN_CLASS - || objects[obj_type].oc_material == GOLD - || objects[obj_type].oc_material == SILVER) - pline("Clink!"); - else - pline("Clonk!"); + hit_bars(obj_p, x,y, barsx,barsy, whodidit, FALSE); } return hits; diff --git a/src/music.c b/src/music.c index 89ff06127..f21a19483 100644 --- a/src/music.c +++ b/src/music.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 music.c $NHDT-Date: 1446808448 2015/11/06 11:14:08 $ $NHDT-Branch: master $:$NHDT-Revision: 1.40 $ */ +/* NetHack 3.6 music.c $NHDT-Date: 1452660194 2016/01/13 04:43:14 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.42 $ */ /* Copyright (c) 1989 by Jean-Christophe Collet */ /* NetHack may be freely redistributed. See license for details. */ @@ -426,6 +426,23 @@ int force; } } +const char * +generic_lvl_desc() +{ + if (Is_astralevel(&u.uz)) + return "astral plane"; + else if (In_endgame(&u.uz)) + return "plane"; + else if (Is_sanctum(&u.uz)) + return "sanctum"; + else if (In_sokoban(&u.uz)) + return "puzzle"; + else if (In_V_tower(&u.uz)) + return "tower"; + else + return "dungeon"; +} + /* * The player is trying to extract something from his/her instrument. */ @@ -537,7 +554,8 @@ struct obj *instr; consume_obj_charge(instr, TRUE); You("produce a heavy, thunderous rolling!"); - pline_The("entire dungeon is shaking around you!"); + pline_The("entire %s is shaking around you!", + generic_lvl_desc()); do_earthquake((u.ulevel - 1) / 3 + 1); /* shake up monsters in a much larger radius... */ awaken_monsters(ROWNO * COLNO); @@ -549,6 +567,7 @@ struct obj *instr; awaken_monsters(u.ulevel * 40); incr_itimeout(&HDeaf, rn1(20, 30)); exercise(A_WIS, FALSE); + context.botl = TRUE; break; default: impossible("What a weird instrument (%d)!", instr->otyp); diff --git a/src/objnam.c b/src/objnam.c index 339a478a5..8e98e07b8 100644 --- a/src/objnam.c +++ b/src/objnam.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 objnam.c $NHDT-Date: 1451683056 2016/01/01 21:17:36 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.162 $ */ +/* NetHack 3.6 objnam.c $NHDT-Date: 1452043772 2016/01/06 01:29:32 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.163 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1102,6 +1102,8 @@ register struct obj *otmp; || is_flammable(otmp)); } +/* format a corpse name (xname() omits monster type; doname() calls us); + eatcorpse() also uses us for death reason when eating tainted glob */ char * corpse_xname(otmp, adjective, cxn_flags) struct obj *otmp; @@ -1118,10 +1120,14 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */ /* include "an" for "an ogre corpse */ any_prefix = (cxn_flags & CXN_ARTICLE) != 0, /* leave off suffix (do_name() appends "corpse" itself) */ - omit_corpse = (cxn_flags & CXN_NOCORPSE) != 0, possessive = FALSE; + omit_corpse = (cxn_flags & CXN_NOCORPSE) != 0, + possessive = FALSE, + glob = (otmp->otyp != CORPSE && otmp->globby); const char *mname; - if (omndx == NON_PM) { /* paranoia */ + if (glob) { + mname = OBJ_NAME(objects[otmp->otyp]); /* "glob of " */ + } else if (omndx == NON_PM) { /* paranoia */ mname = "thing"; /* [Possible enhancement: check whether corpse has monster traits attached in order to use priestname() for priests and minions.] */ @@ -1172,7 +1178,9 @@ unsigned cxn_flags; /* bitmask of CXN_xxx values */ any_prefix = FALSE; } - if (!omit_corpse) { + if (glob) { + ; /* omit_corpse doesn't apply; quantity is always 1 */ + } else if (!omit_corpse) { Strcat(nambuf, " corpse"); /* makeplural(nambuf) => append "s" to "corpse" */ if (otmp->quan > 1L && !ignore_quan) { @@ -3525,7 +3533,7 @@ typfnd: } otmp->owt = weight(otmp); if (very && otmp->otyp == HEAVY_IRON_BALL) - otmp->owt += 160; + otmp->owt += IRON_BALL_W_INCR; return otmp; } diff --git a/src/options.c b/src/options.c index 3e923e046..58a6f281f 100644 --- a/src/options.c +++ b/src/options.c @@ -149,6 +149,11 @@ static struct Bool_Opt { /* for menu debugging only*/ { "menu_tab_sep", &iflags.menu_tab_sep, FALSE, SET_IN_WIZGAME }, { "menu_objsyms", &iflags.menu_head_objsym, FALSE, SET_IN_GAME }, +#ifdef TTY_GRAPHICS + { "menu_overlay", &iflags.menu_overlay, TRUE, SET_IN_GAME }, +#else + { "menu_overlay", (boolean *) 0, FALSE, SET_IN_FILE }, +#endif { "mouse_support", &iflags.wc_mouse_support, TRUE, DISP_IN_GAME }, /*WC*/ #ifdef NEWS { "news", &iflags.news, TRUE, DISP_IN_GAME }, @@ -220,6 +225,11 @@ static struct Bool_Opt { { "use_inverse", &iflags.wc_inverse, FALSE, SET_IN_GAME }, /*WC*/ #endif { "verbose", &flags.verbose, TRUE, SET_IN_GAME }, +#ifdef TTY_TILES_ESCCODES + { "vt_tiledata", &iflags.vt_tiledata, FALSE, SET_IN_FILE }, +#else + { "vt_tiledata", (boolean *) 0, FALSE, SET_IN_FILE }, +#endif { "wizweight", &iflags.wizweight, FALSE, SET_IN_WIZGAME }, { "wraptext", &iflags.wc2_wraptext, FALSE, SET_IN_GAME }, #ifdef ZEROCOMP @@ -284,6 +294,7 @@ static struct Comp_Opt { DISP_IN_GAME }, /*WC*/ { "fruit", "the name of a fruit you enjoy eating", PL_FSIZ, SET_IN_GAME }, { "gender", "your starting gender (male or female)", 8, DISP_IN_GAME }, + { "getpos_coord", "show coordinates when getting cursor position", 1, SET_IN_GAME }, { "horsename", "the name of your (first) horse (e.g., horsename:Silver)", PL_PSIZ, DISP_IN_GAME }, { "map_mode", "map display mode under Windows", 20, DISP_IN_GAME }, /*WC*/ @@ -675,6 +686,7 @@ initoptions_init() iflags.prevmsg_window = 's'; #endif iflags.menu_headings = ATR_INVERSE; + iflags.getpos_coords = GPCOORDS_NONE; /* hero's role, race, &c haven't been chosen yet */ flags.initrole = flags.initrace = flags.initgend = flags.initalign = @@ -1230,6 +1242,11 @@ static const struct { { "light cyan", CLR_BRIGHT_CYAN }, { "white", CLR_WHITE }, { NULL, CLR_BLACK }, /* everything after this is an alias */ + { "transparent", NO_COLOR }, + { "nocolor", NO_COLOR }, + { "purple", CLR_MAGENTA }, + { "light purple", CLR_BRIGHT_MAGENTA }, + { "bright purple", CLR_BRIGHT_MAGENTA }, { "grey", CLR_GRAY }, { "bright red", CLR_ORANGE }, { "bright green", CLR_BRIGHT_GREEN }, @@ -1262,6 +1279,26 @@ int clr; return (char *) 0; } +int +match_str2clr(str) +char *str; +{ + int i, c = NO_COLOR; + + /* allow "lightblue", "light blue", and "light-blue" to match "light blue" + (also junk like "_l i-gh_t---b l u e" but we won't worry about that); + also copes with trailing space; mungspaces removed any leading space */ + for (i = 0; i < SIZE(colornames); i++) + if (colornames[i].name + && fuzzymatch(str, colornames[i].name, " -_", TRUE)) { + c = colornames[i].color; + break; + } + if (i == SIZE(colornames) && (*str >= '0' && *str <= '9')) + c = atoi(str); + return c; +} + const char * attr2attrname(attr) int attr; @@ -1455,8 +1492,9 @@ int idx; /* 0 .. */ } int -msgtype_type(msg) +msgtype_type(msg, norepeat) const char *msg; +boolean norepeat; /* called from Norep(via pline) */ { struct plinemsg_type *tmp = plinemsg_types; @@ -1465,7 +1503,7 @@ const char *msg; return tmp->msgtype; tmp = tmp->next; } - return MSGTYP_NORMAL; + return norepeat ? MSGTYP_NOREP : MSGTYP_NORMAL; } int @@ -1550,19 +1588,8 @@ char *str; if ((amp = index(tmps, '&')) != 0) *amp = '\0'; - /* allow "lightblue", "light blue", and "light-blue" to match "light blue" - (also junk like "_l i-gh_t---b l u e" but we won't worry about that); - also copes with trailing space; mungspaces removed any leading space */ - for (i = 0; i < SIZE(colornames); i++) - if (colornames[i].name - && fuzzymatch(tmps, colornames[i].name, " -_", TRUE)) { - c = colornames[i].color; - break; - } - if (i == SIZE(colornames) && (*tmps >= '0' && *tmps <= '9')) - c = atoi(tmps); - - if (c > 15) + c = match_str2clr(tmps); + if (c >= CLR_MAX) return FALSE; if (amp) { @@ -2321,6 +2348,24 @@ boolean tinitial, tfrom_file; return; } + fullname = "getpos_coord"; + if (match_optname(opts, fullname, 6, TRUE)) { + if (duplicate) + complain_about_duplicate(opts, 1); + if (negated) { + iflags.getpos_coords = GPCOORDS_NONE; + return; + } else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) { + if (tolower(*op) == GPCOORDS_NONE + || tolower(*op) == GPCOORDS_COMPASS + || tolower(*op) == GPCOORDS_MAP) { + iflags.getpos_coords = tolower(*op); + } else + badoption(opts); + } + return; + } + fullname = "warnings"; if (match_optname(opts, fullname, 5, TRUE)) { if (duplicate) @@ -3384,6 +3429,7 @@ boolean tinitial, tfrom_file; need_redraw = TRUE; /* darkroom refresh */ } else if ((boolopt[i].addr) == &iflags.use_inverse || (boolopt[i].addr) == &flags.showrace + || (boolopt[i].addr) == &iflags.hilite_pile || (boolopt[i].addr) == &iflags.hilite_pet) { need_redraw = TRUE; #ifdef TEXTCOLOR @@ -3996,6 +4042,27 @@ boolean setinitial, setfromfile; free((genericptr_t) mode_pick); } destroy_nhwindow(tmpwin); + } else if (!strcmp("getpos_coord", optname)) { + menu_item *window_pick = (menu_item *) 0; + + tmpwin = create_nhwindow(NHW_MENU); + start_menu(tmpwin); + any = zeroany; + any.a_char = GPCOORDS_COMPASS; + add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_COMPASS, + 0, ATR_NONE, "compass", MENU_UNSELECTED); + any.a_char = GPCOORDS_MAP; + add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_MAP, + 0, ATR_NONE, "map", MENU_UNSELECTED); + any.a_char = GPCOORDS_NONE; + add_menu(tmpwin, NO_GLYPH, &any, GPCOORDS_NONE, + 0, ATR_NONE, "none", MENU_UNSELECTED); + end_menu(tmpwin, "Select coordinate display when picking a position:"); + if (select_menu(tmpwin, PICK_ONE, &window_pick) > 0) { + iflags.getpos_coords = window_pick->item.a_char; + free((genericptr_t) window_pick); + } + destroy_nhwindow(tmpwin); } else if (!strcmp("msg_window", optname)) { #ifdef TTY_GRAPHICS /* by Christian W. Cooper */ @@ -4743,6 +4810,11 @@ char *buf; Sprintf(buf, "%s", rolestring(flags.initrole, roles, name.m)); } else if (!strcmp(optname, "runmode")) { Sprintf(buf, "%s", runmodes[flags.runmode]); + } else if (!strcmp(optname, "getpos_coord")) { + Sprintf(buf, "%s", + (iflags.getpos_coords == GPCOORDS_MAP) ? "map" + : (iflags.getpos_coords == GPCOORDS_COMPASS) ? "compass" + : "none"); } else if (!strcmp(optname, "scores")) { Sprintf(buf, "%d top/%d around%s", flags.end_top, flags.end_around, flags.end_own ? "/own" : ""); diff --git a/src/pline.c b/src/pline.c index ce4b60702..141532cad 100644 --- a/src/pline.c +++ b/src/pline.c @@ -10,6 +10,9 @@ static boolean no_repeat = FALSE; static char prevmsg[BUFSZ]; static char *FDECL(You_buf, (int)); +#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) +static void FDECL(execplinehandler, (const char *)); +#endif /*VARARGS1*/ /* Note that these declarations rely on knowledge of the internals @@ -83,22 +86,27 @@ VA_DECL(const char *, line) iflags.last_msg = PLNMSG_UNKNOWN; return; } -#ifndef MAC - if (no_repeat && !strcmp(line, toplines)) + + msgtyp = msgtype_type(line, no_repeat); + if (msgtyp == MSGTYP_NOSHOW + || (msgtyp == MSGTYP_NOREP && !strcmp(line, prevmsg))) return; -#endif /* MAC */ if (vision_full_recalc) vision_recalc(0); if (u.ux) flush_screen(1); /* %% */ - msgtyp = msgtype_type(line); - if (msgtyp == MSGTYP_NOSHOW) return; - if (msgtyp == MSGTYP_NOREP && !strcmp(line, prevmsg)) return; + putstr(WIN_MESSAGE, 0, line); + +#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) + execplinehandler(line); +#endif + /* this gets cleared after every pline message */ iflags.last_msg = PLNMSG_UNKNOWN; - strncpy(prevmsg, line, BUFSZ); - if (msgtyp == MSGTYP_STOP) display_nhwindow(WIN_MESSAGE, TRUE); /* --more-- */ + strncpy(prevmsg, line, BUFSZ), prevmsg[BUFSZ - 1] = '\0'; + if (msgtyp == MSGTYP_STOP) + display_nhwindow(WIN_MESSAGE, TRUE); /* --more-- */ #if !(defined(USE_STDARG) || defined(USE_VARARGS)) /* provide closing brace for the nested block @@ -585,4 +593,42 @@ struct obj *otmp2; } } +#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) +static boolean use_pline_handler = TRUE; +static void +execplinehandler(line) +const char *line; +{ + int f; + const char *args[3]; + char *env; + + if (!use_pline_handler) + return; + + if (!(env = nh_getenv("NETHACK_MSGHANDLER"))) { + use_pline_handler = FALSE; + return; + } + + f = fork(); + if (f == 0) { /* child */ + args[0] = env; + args[1] = line; + args[2] = NULL; + (void) setgid(getgid()); + (void) setuid(getuid()); + (void) execv(args[0], (char *const *) args); + perror((char *) 0); + (void) fprintf(stderr, "Exec to message handler %s failed.\n", + env); + terminate(EXIT_FAILURE); + } else if (f == -1) { + perror((char *) 0); + use_pline_handler = FALSE; + pline("Fork to message handler failed."); + } +} +#endif /* defined(POSIX_TYPES) || defined(__GNUC__) */ + /*pline.c*/ diff --git a/src/polyself.c b/src/polyself.c index 9cdc83be8..68936af8d 100644 --- a/src/polyself.c +++ b/src/polyself.c @@ -114,6 +114,7 @@ float_vs_flight() BFlying |= I_SPECIAL; else BFlying &= ~I_SPECIAL; + context.botl = TRUE; } /* for changing into form that's immune to strangulation */ @@ -127,10 +128,11 @@ boolean on; vulnerable form into another causes the counter to be reset */ if (uamul && uamul->otyp == AMULET_OF_STRANGULATION && can_be_strangled(&youmonst)) { + Strangled = 6L; + context.botl = TRUE; Your("%s %s your %s!", simpleonames(uamul), Strangled ? "still constricts" : "begins constricting", body_part(NECK)); /* "throat" */ - Strangled = 6L; makeknown(AMULET_OF_STRANGULATION); } @@ -138,6 +140,7 @@ boolean on; } else { if (Strangled && !can_be_strangled(&youmonst)) { Strangled = 0L; + context.botl = TRUE; You("are no longer being strangled."); } } diff --git a/src/potion.c b/src/potion.c index c18c560b9..484b89806 100644 --- a/src/potion.c +++ b/src/potion.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 potion.c $NHDT-Date: 1450667491 2015/12/21 03:11:31 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.124 $ */ +/* NetHack 3.6 potion.c $NHDT-Date: 1452660195 2016/01/13 04:43:15 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.126 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -165,12 +165,12 @@ const char *msg; if (Unaware) msg = 0; #endif - if ((!xtime && old) || (xtime && !old)) { + set_itimeout(&Slimed, xtime); + if ((xtime != 0L) ^ (old != 0L)) { + context.botl = TRUE; if (msg) pline1(msg); - context.botl = 1; } - set_itimeout(&Slimed, xtime); if (!Slimed) dealloc_killer(find_delayed_killer(SLIMED)); } @@ -189,12 +189,12 @@ const char *killername; if (Unaware) msg = 0; #endif - if ((!xtime && old) || (xtime && !old)) { + set_itimeout(&Stoned, xtime); + if ((xtime != 0L) ^ (old != 0L)) { + context.botl = TRUE; if (msg) pline1(msg); - /* context.botl = 1; --- Stoned is not a status line item */ } - set_itimeout(&Stoned, xtime); if (!Stoned) dealloc_killer(find_delayed_killer(STONED)); else if (!old) @@ -211,11 +211,11 @@ boolean talk; if (Unaware) talk = FALSE; + set_itimeout(&Vomiting, xtime); + context.botl = TRUE; if (!xtime && old) if (talk) You_feel("much less nauseated now."); - - set_itimeout(&Vomiting, xtime); } static const char vismsg[] = "vision seems to %s for a moment but is %s now."; @@ -292,7 +292,7 @@ boolean talk; set_itimeout(&Blinded, xtime); if (u_could_see ^ can_see_now) { /* one or the other but not both */ - context.botl = 1; + context.botl = TRUE; vision_full_recalc = 1; /* blindness just got toggled */ /* this vision recalculation used to be deferred until moveloop(), but that made it possible for vision @@ -383,7 +383,7 @@ long mask; /* nonzero if resistance status should change by mask */ (eg. Qt windowport's equipped items display) */ update_inventory(); - context.botl = 1; + context.botl = TRUE; if (talk) pline(message, verb); } @@ -396,26 +396,16 @@ long xtime; boolean talk; { long old = HDeaf; - boolean toggled = FALSE; if (Unaware) talk = FALSE; - if (!xtime && old) { - if (talk) - You("can hear again."); - toggled = TRUE; - } else if (xtime && !old) { - if (talk) - You("are unable to hear anything."); - toggled = TRUE; - } - /* deafness isn't presently shown on status line, but - request a status update in case that changes someday */ - if (toggled) - context.botl = TRUE; - set_itimeout(&HDeaf, xtime); + if ((xtime != 0L) ^ (old != 0L)) { + context.botl = TRUE; + if (talk) + You(old ? "can hear again." : "are unable to hear anything."); + } } STATIC_OVL void diff --git a/src/read.c b/src/read.c index 94619ba11..4ba274146 100644 --- a/src/read.c +++ b/src/read.c @@ -2271,7 +2271,7 @@ struct obj *sobj; You("are being punished for your misbehavior!"); if (Punished) { Your("iron ball gets heavier."); - uball->owt += 160 * (1 + sobj->cursed); + uball->owt += IRON_BALL_W_INCR * (1 + sobj->cursed); return; } if (amorphous(youmonst.data) || is_whirly(youmonst.data) diff --git a/src/shk.c b/src/shk.c index ca3893b1f..b2208d399 100644 --- a/src/shk.c +++ b/src/shk.c @@ -3118,8 +3118,6 @@ quit: return 0; } -#define HUNGRY 2 - STATIC_OVL long getprice(obj, shk_buying) register struct obj *obj; diff --git a/src/sp_lev.c b/src/sp_lev.c index 61740b436..c4428d7ad 100644 --- a/src/sp_lev.c +++ b/src/sp_lev.c @@ -1873,11 +1873,12 @@ struct mkroom *croom; } } } else { + struct obj *cobj = container_obj[container_idx - 1]; remove_object(otmp); - if (container_obj[container_idx - 1]) - (void) add_to_container(container_obj[container_idx - 1], - otmp); - else { + if (cobj) { + (void) add_to_container(cobj, otmp); + cobj->owt = weight(cobj); + } else { obj_extract_self(otmp); obfree(otmp, NULL); return; @@ -5863,11 +5864,16 @@ sp_lev *lvl; count_features(); - if (coder->premapped) - sokoban_detect(); if (coder->solidify) solidify_map(); + /* This must be done before sokoban_detect(), + * otherwise branch stairs won't be premapped. */ + fixup_special(); + + if (coder->premapped) + sokoban_detect(); + if (coder->frame) { struct sp_frame *tmpframe; do { diff --git a/src/steed.c b/src/steed.c index 1129a27cc..4070bbf74 100644 --- a/src/steed.c +++ b/src/steed.c @@ -285,7 +285,7 @@ boolean force; /* Quietly force this animal */ } if (!can_saddle(mtmp) || !can_ride(mtmp)) { You_cant("ride such a creature."); - return (0); + return FALSE; } /* Is the player impaired? */ @@ -332,7 +332,8 @@ boolean force; /* Quietly force this animal */ u.usteed = mtmp; remove_monster(mtmp->mx, mtmp->my); teleds(mtmp->mx, mtmp->my, TRUE); - return (TRUE); + context.botl = TRUE; + return TRUE; } /* You and your steed have moved */ @@ -610,11 +611,11 @@ int reason; /* Player was thrown off etc. */ in_steed_dismounting = TRUE; (void) float_down(0L, W_SADDLE); in_steed_dismounting = FALSE; - context.botl = 1; + context.botl = TRUE; (void) encumber_msg(); vision_full_recalc = 1; } else - context.botl = 1; + context.botl = TRUE; /* polearms behave differently when not mounted */ if (uwep && is_pole(uwep)) unweapon = TRUE; diff --git a/src/teleport.c b/src/teleport.c index 5faf0135c..43e97da63 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -980,6 +980,7 @@ register int x, y; } } + memset(mtmp->mtrack, 0, sizeof(mtmp->mtrack)); place_monster(mtmp, x, y); /* put monster down */ update_monster_region(mtmp); diff --git a/src/timeout.c b/src/timeout.c index e50ae39b2..7370b8b05 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 timeout.c $NHDT-Date: 1446861771 2015/11/07 02:02:51 $ $NHDT-Branch: master $:$NHDT-Revision: 1.63 $ */ +/* NetHack 3.6 timeout.c $NHDT-Date: 1452660198 2016/01/13 04:43:18 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.64 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -345,6 +345,7 @@ nh_timeout() case DEAF: set_itimeout(&HDeaf, 1L); make_deaf(0L, TRUE); + context.botl = TRUE; if (!Deaf) stop_occupation(); break; @@ -443,6 +444,7 @@ boolean wakeup_msg; /* caller can follow with a direct call to Hear_again() if there's a need to override this when wakeup_msg is true */ incr_itimeout(&HDeaf, how_long); + context.botl = TRUE; afternmv = Hear_again; /* this won't give any messages */ } /* early wakeup from combat won't be possible until next monster turn */ @@ -1288,6 +1290,7 @@ do_storms() /* Even if already deaf, we sense the thunder's vibrations. */ pline("Kaboom!!! Boom!! Boom!!"); incr_itimeout(&HDeaf, rn1(20, 30)); + context.botl = TRUE; if (!u.uinvulnerable) { stop_occupation(); nomul(-3); diff --git a/src/trap.c b/src/trap.c index b5cda7a5b..91bc589d3 100644 --- a/src/trap.c +++ b/src/trap.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 trap.c $NHDT-Date: 1451176031 2015/12/27 00:27:11 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.252 $ */ +/* NetHack 3.6 trap.c $NHDT-Date: 1452660199 2016/01/13 04:43:19 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.255 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1889,7 +1889,9 @@ int style; if (dist > 0 && isok(bhitpos.x + dx, bhitpos.y + dy) && levl[bhitpos.x + dx][bhitpos.y + dy].typ == IRONBARS) { x2 = bhitpos.x, y2 = bhitpos.y; /* object stops here */ - if (hits_bars(&singleobj, x2, y2, !rn2(20), 0)) { + if (hits_bars(&singleobj, + x2, y2, x2+dx, y2+dy, + !rn2(20), 0)) { if (!singleobj) { used_up = TRUE; launch_drop_spot((struct obj *) 0, 0, 0); @@ -2731,6 +2733,7 @@ boolean byplayer; void float_up() { + context.botl = TRUE; if (u.utrap) { if (u.utraptype == TT_PIT) { u.utrap = 0; @@ -2809,6 +2812,7 @@ long hmask, emask; /* might cancel timeout */ float_vs_flight(); /* before nomul() rather than after */ return 0; } + context.botl = TRUE; nomul(0); /* stop running or resting */ if (BFlying) { /* controlled flight no longer overridden by levitation */ @@ -3064,10 +3068,12 @@ domagictrap() if (!Deaf) { You_hear("a deafening roar!"); incr_itimeout(&HDeaf, rn1(20, 30)); + context.botl = TRUE; } else { /* magic vibrations still hit you */ You_feel("rankled."); incr_itimeout(&HDeaf, rn1(5, 15)); + context.botl = TRUE; } while (cnt--) (void) makemon((struct permonst *) 0, u.ux, u.uy, NO_MM_FLAGS); @@ -4999,13 +5005,13 @@ lava_effects() && objects[obj->otyp].oc_oprop != FIRE_RES && obj->otyp != SCR_FIRE && obj->otyp != SPE_FIREBALL && !obj_resists(obj, 0, 0)) /* for invocation items */ - obj->in_use = TRUE; + obj->in_use = 1; /* Check whether we should burn away boots *first* so we know whether to * make the player sink into the lava. Assumption: water walking only * comes from boots. */ - if (Wwalking && uarmf && is_organic(uarmf) && !uarmf->oerodeproof) { + if (uarmf && is_organic(uarmf) && !uarmf->oerodeproof) { obj = uarmf; pline("%s into flame!", Yobjnam2(obj, "burst")); iflags.in_lava_effects++; /* (see above) */ @@ -5119,6 +5125,9 @@ sink_into_lava() You("sink below the surface and die."); burn_away_slime(); /* add insult to injury? */ done(DISSOLVED); + /* can only get here via life-saving; try to get away from lava */ + u.utrap = 0; + (void) safe_teleds(TRUE); } else if (!u.umoved) { /* can't fully turn into slime while in lava, but might not have it be burned away until you've come awfully close */ diff --git a/src/vault.c b/src/vault.c index 5b73dadc5..18c1d9a16 100644 --- a/src/vault.c +++ b/src/vault.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 vault.c $NHDT-Date: 1446078792 2015/10/29 00:33:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.39 $ */ +/* NetHack 3.6 vault.c $NHDT-Date: 1452132199 2016/01/07 02:03:19 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.42 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -342,7 +342,7 @@ invault() newsym(guard->mx, guard->my); if (u.uswallow) { /* can't interrogate hero, don't interrogate engulfer */ - verbalize("What's going on here?"); + if (!Deaf) verbalize("What's going on here?"); if (gsensed) pline_The("other presence vanishes."); mongone(guard); @@ -351,8 +351,8 @@ invault() if (youmonst.m_ap_type == M_AP_OBJECT || u.uundetected) { if (youmonst.m_ap_type == M_AP_OBJECT && youmonst.mappearance != GOLD_PIECE) - verbalize("Hey! Who left that %s in here?", - mimic_obj_name(&youmonst)); + if (!Deaf) verbalize("Hey! Who left that %s in here?", + mimic_obj_name(&youmonst)); /* You're mimicking some object or you're hidden. */ pline("Puzzled, %s turns around and leaves.", mhe(guard)); mongone(guard); @@ -362,7 +362,10 @@ invault() /* [we ought to record whether this this message has already been given in order to vary it upon repeat visits, but discarding the monster and its egd data renders that hard] */ - verbalize("I'll be back when you're ready to speak to me!"); + if (Deaf) + pline("%s huffs and turns to leave.", noit_Monnam(guard)); + else + verbalize("I'll be back when you're ready to speak to me!"); mongone(guard); return; } @@ -374,9 +377,10 @@ invault() } trycount = 5; do { - getlin("\"Hello stranger, who are you?\" -", buf); + getlin(Deaf ? "You are required to supply your name. -" : + "\"Hello stranger, who are you?\" -", buf); (void) mungspaces(buf); - } while (!letter(buf[0]) && --trycount > 0); + } while (!buf[0] && --trycount > 0); if (u.ualign.type == A_LAWFUL /* ignore trailing text, in case player includes rank */ @@ -387,12 +391,22 @@ invault() if (!strcmpi(buf, "Croesus") || !strcmpi(buf, "Kroisos") || !strcmpi(buf, "Creosote")) { if (!mvitals[PM_CROESUS].died) { - verbalize( + if (Deaf) { + if (!Blind) pline("%s waves goodbye.", noit_Monnam(guard)); + } else { + verbalize( "Oh, yes, of course. Sorry to have disturbed you."); + } mongone(guard); } else { setmangry(guard); - verbalize("Back from the dead, are you? I'll remedy that!"); + if (Deaf) { + if (!Blind) + pline("%s mouths something and looks very angry!", + noit_Monnam(guard)); + } else { + verbalize("Back from the dead, are you? I'll remedy that!"); + } /* don't want guard to waste next turn wielding a weapon */ if (!MON_WEP(guard)) { guard->weapon_check = NEED_HTH_WEAPON; @@ -401,18 +415,37 @@ invault() } return; } - verbalize("I don't know you."); + if (Deaf) + pline("%s doesn't %srecognize you.", noit_Monnam(guard), + (Blind) ? "" : "appear to "); + else + verbalize("I don't know you."); umoney = money_cnt(invent); - if (Deaf) { - ; - } else if (!umoney && !hidden_gold()) { - verbalize("Please follow me."); + if (!umoney && !hidden_gold()) { + if (Deaf) + pline("%s stomps%s.", noit_Monnam(guard), + (Blind) ? "" : " and beckons"); + else + verbalize("Please follow me."); } else { - if (!umoney) - verbalize("You have hidden gold."); - verbalize( - "Most likely all your gold was stolen from this vault."); - verbalize("Please drop that gold and follow me."); + if (!umoney) { + if (Deaf) { + if (!Blind) + pline("%s glares at you%s.", noit_Monnam(guard), + invent ? "r stuff" : ""); + } else { + verbalize("You have hidden gold."); + } + } + if (Deaf) { + if (!Blind) + pline("%s holds out %s palm and beckons with %s other hand.", + noit_Monnam(guard), mhis(guard), mhis(guard)); + } else { + verbalize( + "Most likely all your gold was stolen from this vault."); + verbalize("Please drop that gold and follow me."); + } } EGD(guard)->gdx = gx; EGD(guard)->gdy = gy; @@ -578,8 +611,9 @@ register struct monst *grd; return -1; /* teleported guard - treat as monster */ if (egrd->witness) { - verbalize("How dare you %s that gold, scoundrel!", - (egrd->witness & GD_EATGOLD) ? "consume" : "destroy"); + if (!Deaf) + verbalize("How dare you %s that gold, scoundrel!", + (egrd->witness & GD_EATGOLD) ? "consume" : "destroy"); egrd->witness = 0; grd->mpeaceful = 0; return -1; @@ -655,12 +689,22 @@ register struct monst *grd; } if (egrd->warncnt < 6) { egrd->warncnt = 6; - if (!Deaf) + if (Deaf) { + if (!Blind) + pline("%s holds out %s palm demandingly!", + noit_Monnam(grd), mhis(grd)); + } else { verbalize("Drop all your gold, scoundrel!"); + } return 0; } else { - if (!Deaf) + if (Deaf) { + if (!Blind) + pline("%s rubs %s hands with enraged delight!", + noit_Monnam(grd), mhis(grd)); + } else { verbalize("So be it, rogue!"); + } grd->mpeaceful = 0; return -1; } diff --git a/src/vision.c b/src/vision.c index 77475af96..2dcc85b8b 100644 --- a/src/vision.c +++ b/src/vision.c @@ -175,9 +175,9 @@ register struct rm *lev; if (obj->otyp == BOULDER) return 1; - /* Mimics mimicing a door or boulder block light. */ + /* Mimics mimicing a door or boulder or ... block light. */ if ((mon = m_at(x, y)) && (!mon->minvis || See_invisible) - && (is_door_mappear(mon) || is_obj_mappear(mon,BOULDER))) + && is_lightblocker_mappear(mon)) return 1; return 0; diff --git a/src/weapon.c b/src/weapon.c index cc14f35ec..cdbd440db 100644 --- a/src/weapon.c +++ b/src/weapon.c @@ -304,12 +304,12 @@ struct monst *mon; if (ptr == &mons[PM_SHADE] && !shade_glare(otmp)) tmp = 0; - /* "very heavy iron ball"; weight increase is in increments of 160 */ + /* "very heavy iron ball"; weight increase is in increments */ if (otyp == HEAVY_IRON_BALL && tmp > 0) { int wt = (int) objects[HEAVY_IRON_BALL].oc_weight; if ((int) otmp->owt > wt) { - wt = ((int) otmp->owt - wt) / 160; + wt = ((int) otmp->owt - wt) / IRON_BALL_W_INCR; tmp += rnd(4 * wt); if (tmp > 25) tmp = 25; /* objects[].oc_wldam */ diff --git a/src/windows.c b/src/windows.c index 1423f8cf1..ce6691347 100644 --- a/src/windows.c +++ b/src/windows.c @@ -751,8 +751,9 @@ hup_get_color_string(VOID_ARGS) /*ARGSUSED*/ static void hup_status_update(idx, ptr, chg, percent) -int idx UNUSED, chg UNUSED, percent UNUSED; +int idx UNUSED; genericptr_t ptr UNUSED; +int chg UNUSED, percent UNUSED; { return; } @@ -855,8 +856,9 @@ boolean enable; void genl_status_update(idx, ptr, chg, percent) -int idx, chg, percent; +int idx; genericptr_t ptr; +int chg UNUSED, percent UNUSED; { char newbot1[MAXCO], newbot2[MAXCO]; long cond, *condptr = (long *) ptr; @@ -879,20 +881,32 @@ genericptr_t ptr; case BL_CONDITION: cond = *condptr; *status_vals[idx] = '\0'; - if (cond & BL_MASK_BLIND) - Strcat(status_vals[idx], " Blind"); - if (cond & BL_MASK_CONF) - Strcat(status_vals[idx], " Conf"); + if (cond & BL_MASK_STONE) + Strcat(status_vals[idx], " Stone"); + if (cond & BL_MASK_SLIME) + Strcat(status_vals[idx], " Slime"); + if (cond & BL_MASK_STRNGL) + Strcat(status_vals[idx], " Strngl"); if (cond & BL_MASK_FOODPOIS) Strcat(status_vals[idx], " FoodPois"); - if (cond & BL_MASK_ILL) - Strcat(status_vals[idx], " Ill"); - if (cond & BL_MASK_STUNNED) + if (cond & BL_MASK_TERMILL) + Strcat(status_vals[idx], " TermIll"); + if (cond & BL_MASK_BLIND) + Strcat(status_vals[idx], " Blind"); + if (cond & BL_MASK_DEAF) + Strcat(status_vals[idx], " Deaf"); + if (cond & BL_MASK_STUN) Strcat(status_vals[idx], " Stun"); + if (cond & BL_MASK_CONF) + Strcat(status_vals[idx], " Conf"); if (cond & BL_MASK_HALLU) Strcat(status_vals[idx], " Hallu"); - if (cond & BL_MASK_SLIMED) - Strcat(status_vals[idx], " Slime"); + if (cond & BL_MASK_LEV) + Strcat(status_vals[idx], " Lev"); + if (cond & BL_MASK_FLY) + Strcat(status_vals[idx], " Fly"); + if (cond & BL_MASK_RIDE) + Strcat(status_vals[idx], " Ride"); break; default: Sprintf(status_vals[idx], diff --git a/src/wizard.c b/src/wizard.c index facacc799..57d4d6cbe 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -306,11 +306,49 @@ register struct monst *mtmp; return dstrat; } +void +choose_stairs(sx, sy) +xchar *sx; +xchar *sy; +{ + xchar x = 0, y = 0; + + if (builds_up(&u.uz)) { + if (xdnstair) { + x = xdnstair; + y = ydnstair; + } else if (xdnladder) { + x = xdnladder; + y = ydnladder; + } + } else { + if (xupstair) { + x = xupstair; + y = yupstair; + } else if (xupladder) { + x = xupladder; + y = yupladder; + } + } + + if (!x && sstairs.sx) { + x = sstairs.sx; + y = sstairs.sy; + } + + if (x && y) { + *sx = x; + *sy = y; + } + +} + int tactics(mtmp) register struct monst *mtmp; { unsigned long strat = strategy(mtmp); + xchar sx = 0, sy = 0; mtmp->mstrategy = (mtmp->mstrategy & (STRAT_WAITMASK | STRAT_APPEARMSG)) | strat; @@ -318,15 +356,14 @@ register struct monst *mtmp; switch (strat) { case STRAT_HEAL: /* hide and recover */ /* if wounded, hole up on or near the stairs (to block them) */ - /* unless, of course, there are no stairs (e.g. endlevel) */ + choose_stairs(&sx, &sy); mtmp->mavenge = 1; /* covetous monsters attack while fleeing */ if (In_W_tower(mtmp->mx, mtmp->my, &u.uz) - || (mtmp->iswiz && !xupstair && !mon_has_amulet(mtmp))) { + || (mtmp->iswiz && !sx && !mon_has_amulet(mtmp))) { if (!rn2(3 + mtmp->mhp / 10)) (void) rloc(mtmp, TRUE); - } else if (xupstair - && (mtmp->mx != xupstair || mtmp->my != yupstair)) { - (void) mnearto(mtmp, xupstair, yupstair, TRUE); + } else if (sx && (mtmp->mx != sx || mtmp->my != sy)) { + (void) mnearto(mtmp, sx, sy, TRUE); } /* if you're not around, cast healing spells */ if (distu(mtmp->mx, mtmp->my) > (BOLT_LIM * BOLT_LIM)) diff --git a/src/zap.c b/src/zap.c index 677921c2e..4f3dc5707 100644 --- a/src/zap.c +++ b/src/zap.c @@ -1875,10 +1875,14 @@ struct obj *obj, *otmp; You_hear("a crumbling sound."); } } else { + int oox = obj->ox; + int ooy = obj->oy; if (context.mon_moving ? !breaks(obj, obj->ox, obj->oy) : !hero_breaks(obj, obj->ox, obj->oy, FALSE)) maybelearnit = FALSE; /* nothing broke */ + else + newsym_force(oox,ooy); res = 0; } if (maybelearnit) @@ -2368,7 +2372,13 @@ boolean ordinary; } if (u.utrap) { /* escape web or bear trap */ (void) openholdingtrap(&youmonst, &learn_it); - } else { /* trigger previously escaped trapdoor */ + } else { + struct obj *otmp; + /* unlock carried boxes */ + for (otmp = invent; otmp; otmp = otmp->nobj) + if (Is_box(otmp)) + (void) boxlock(otmp, obj); + /* trigger previously escaped trapdoor */ (void) openfallingtrap(&youmonst, TRUE, &learn_it); } break; @@ -3097,6 +3107,7 @@ struct obj **pobj; /* object tossed/used, set to NULL /* iron bars will block anything big enough */ if ((weapon == THROWN_WEAPON || weapon == KICKED_WEAPON) && typ == IRONBARS && hits_bars(pobj, x - ddx, y - ddy, + bhitpos.x, bhitpos.y, point_blank ? 0 : !rn2(5), 1)) { /* caveat: obj might now be null... */ obj = *pobj; @@ -4227,8 +4238,8 @@ short exploding_wand_typ; case ZT_COLD: if (is_pool(x, y) || is_lava(x, y)) { - boolean lava = is_lava(x, y); - boolean moat = is_moat(x, y); + boolean lava = is_lava(x, y), + moat = is_moat(x, y); if (lev->typ == WATER) { /* For now, don't let WATER freeze. */ @@ -4238,23 +4249,25 @@ short exploding_wand_typ; You_hear("a soft crackling."); rangemod -= 1000; /* stop */ } else { + char buf[BUFSZ]; + + Strcpy(buf, waterbody_name(x, y)); /* for MOAT */ rangemod -= 3; if (lev->typ == DRAWBRIDGE_UP) { lev->drawbridgemask &= ~DB_UNDER; /* clear lava */ lev->drawbridgemask |= (lava ? DB_FLOOR : DB_ICE); } else { if (!lava) - lev->icedpool = - (lev->typ == POOL ? ICED_POOL : ICED_MOAT); - lev->typ = (lava ? ROOM : ICE); + lev->icedpool = (lev->typ == POOL) ? ICED_POOL + : ICED_MOAT; + lev->typ = lava ? ROOM : ICE; } bury_objs(x, y); if (see_it) { if (lava) Norep("The lava cools and solidifies."); else if (moat) - Norep("The %s is bridged with ice!", - waterbody_name(x, y)); + Norep("The %s is bridged with ice!", buf); else Norep("The water freezes."); newsym(x, y); @@ -4305,6 +4318,10 @@ short exploding_wand_typ; } break; /* ZT_COLD */ + case ZT_POISON_GAS: + (void) create_gas_cloud(x, y, 1, 8); + break; + case ZT_ACID: if (lev->typ == IRONBARS) { if ((lev->wall_info & W_NONDIGGABLE) != 0) { diff --git a/sys/unix/hints/linux b/sys/unix/hints/linux index a9b612edb..888fd9050 100644 --- a/sys/unix/hints/linux +++ b/sys/unix/hints/linux @@ -23,6 +23,7 @@ POSTINSTALL=cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INS CFLAGS=-g -O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE +CFLAGS+=-DTIMED_DELAY CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" LINK=$(CC) diff --git a/sys/unix/hints/linux-chroot b/sys/unix/hints/linux-chroot index d8af97580..404f4db98 100644 --- a/sys/unix/hints/linux-chroot +++ b/sys/unix/hints/linux-chroot @@ -27,6 +27,7 @@ POSTINSTALL=cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INS CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" CFLAGS=-g -O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE +CFLAGS+=-DTIMED_DELAY CFLAGS+=-DHACKDIR=\"$(HACKDIR)\" CFLAGS+=-DVAR_PLAYGROUND=\"$(HACKDIR)/var\" diff --git a/util/lev_main.c b/util/lev_main.c index d3350e178..c95441bce 100644 --- a/util/lev_main.c +++ b/util/lev_main.c @@ -1351,7 +1351,7 @@ sp_lev *sp; register char *s1, *s2; int max_len = 0; int max_hig = 0; - char *tmpmap[ROWNO]; + char *tmpmap[MAP_Y_LIM+1]; int dx, dy; char *mbuf; @@ -1378,6 +1378,8 @@ sp_lev *sp; /* Then parse it now */ while (map && *map) { + if (max_hig > MAP_Y_LIM) + break; tmpmap[max_hig] = (char *) alloc(max_len); s1 = index(map, '\n'); if (s1) { diff --git a/util/makedefs.c b/util/makedefs.c index 0e340b478..a20660c7c 100644 --- a/util/makedefs.c +++ b/util/makedefs.c @@ -1323,6 +1323,9 @@ static const char *build_opts[] = { #ifdef TEXTCOLOR "color", #endif +#ifdef TTY_TILES_ESCCODES + "console escape codes for tile hinting", +#endif #ifdef COM_COMPL "command line completion", #endif @@ -1347,6 +1350,9 @@ static const char *build_opts[] = { #ifdef HOLD_LOCKFILE_OPEN "exclusive lock on level 0 file", #endif +#if defined(MSGHANDLER) && (defined(POSIX_TYPES) || defined(__GNUC__)) + "external program as a message handler", +#endif #ifdef LOGFILE "log file", #endif diff --git a/win/X11/dialogs.c b/win/X11/dialogs.c index e05e7ad17..d7c24dd55 100644 --- a/win/X11/dialogs.c +++ b/win/X11/dialogs.c @@ -1,25 +1,24 @@ /* * Copyright 1991 University of Wisconsin-Madison * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the University of Wisconsin-Madison not - * be used in advertising or publicity pertaining to distribution of the + * documentation, and that the name of the University of Wisconsin-Madison + * not be used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. The University of * Wisconsin-Madison makes no representations about the suitability of this * software for any purpose. It is provided "as is" without express or * implied warranty. * - * THE UNIVERSITY OF WISCONSIN-MADISON DISCLAIMS ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * THE UNIVERSITY OF WISCONSIN-MADISON DISCLAIMS ALL WARRANTIES WITH REGARD + * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS, IN NO EVENT SHALL THE UNIVERSITY OF WISCONSIN-MADISON BE LIABLE - *FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Tim Theisen Department of Computer Sciences * tim@cs.wisc.edu University of Wisconsin-Madison @@ -32,24 +31,24 @@ * * + Make the cancel button optional. * + Put an #ifdef SPECIAL_CMAP around code to fix a colormap bug. - * We don't need it here. + * We don't need it here. * + Add the function positionpopup() from another part of ghostview - * to this code. + * to this code. * * Modified 2/93, Various. * + Added workaround for SYSV include problem. * + Changed the default width response text widget to be as wide as the - * window itself. Suggestion from David E. Wexelblat, dwex@goblin.org. + * window itself. Suggestion from David E. Wexelblat, dwex@goblin.org. * * Modified 5/2015, anonymous. * + Include nethack's lint.h to get nhStr() macro. * + Use nhStr() on string literals (or macros from - * that hide string literals) to cast away implicit 'const' in order - * to suppress "warning: assignment discards qualifers from pointer - * target type" issued by 'gcc -Wwrite-strings' as used by nethack. - * (For this file, always the second parameter to XtSetArg().) + * that hide string literals) to cast away implicit 'const' in order + * to suppress "warning: assignment discards qualifers from pointer + * target type" issued by 'gcc -Wwrite-strings' as used by nethack. + * (For this file, always the second parameter to XtSetArg().) * - * $NHDT-Date: 1432512808 2015/05/25 00:13:28 $ $NHDT-Branch: master $:$NHDT-Revision: 1.6 $ + * $NHDT-Date: 1452594032 2016/01/12 10:20:32 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.7 $ */ #ifndef SYSV @@ -85,10 +84,10 @@ static const char cancel_accelerators[] = "#override\n\ :[: set() notify() unset()\n"; /* for keyboards w/o an ESC */ /* Create a dialog widget. It is just a form widget with - * a label prompt - * a text response - * an okay button - * an optional cancel button + * a label prompt + * a text response + * an okay button + * an optional cancel button */ Widget CreateDialog(parent, name, okay_callback, cancel_callback) diff --git a/win/X11/winmisc.c b/win/X11/winmisc.c index 78e1b73b9..fa73f9980 100644 --- a/win/X11/winmisc.c +++ b/win/X11/winmisc.c @@ -1,11 +1,11 @@ -/* NetHack 3.6 winmisc.c $NHDT-Date: 1432512807 2015/05/25 00:13:27 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */ -/* Copyright (c) Dean Luick, 1992 */ +/* NetHack 3.6 winmisc.c $NHDT-Date: 1452593730 2016/01/12 10:15:30 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.15 $ */ +/* Copyright (c) Dean Luick, 1992 */ /* NetHack may be freely redistributed. See license for details. */ /* * Misc. popup windows: player selection and extended commands. * - * + Global functions: player_selection() and get_ext_cmd(). + * + Global functions: player_selection() and get_ext_cmd(). */ #ifndef SYSV @@ -727,6 +727,9 @@ Cardinal *num_params; if (ch == '\0') { /* don't accept nul char/modifier event */ /* don't beep */ return; + } else if (ch == '?') { + extend_help(); + return; } else if (index("\033\n\r", ch)) { if (ch == '\033') { /* unselect while still visible */ @@ -745,8 +748,14 @@ Cardinal *num_params; return; } - /* too much time has elapsed */ - if ((xkey->time - ec_time) > 500) + /* + * If too much time has elapsed, treat current key as starting a new + * choice, otherwise it is a continuation of the choice in progress. + * Extra letters might be needed to disambiguate between choices + * ("ride" vs "rub", for instance), or player may just be typing in + * the whole word. + */ + if ((xkey->time - ec_time) > 2500) /* 2.5 seconds */ ec_active = FALSE; if (!ec_active) { @@ -816,21 +825,21 @@ init_extended_commands_popup() /* * Create a popup widget of the following form: * - * popup_label - * ----------- ------------ - * |left_name| |right_name| - * ----------- ------------ - * ------------------------ - * | name1 | - * ------------------------ - * ------------------------ - * | name2 | - * ------------------------ - * . - * . - * ------------------------ - * | nameN | - * ------------------------ + * popup_label + * ----------- ------------ + * |left_name| |right_name| + * ----------- ------------ + * ------------------------ + * | name1 | + * ------------------------ + * ------------------------ + * | name2 | + * ------------------------ + * . + * . + * ------------------------ + * | nameN | + * ------------------------ */ static Widget make_menu(popup_name, popup_label, popup_translations, left_name, @@ -854,15 +863,14 @@ Widget *formp; /* return */ int i; Arg args[8]; Cardinal num_args; - Dimension width, max_width; + Dimension width, other_width, max_width, border_width, + height, cumulative_height, screen_height; int distance, skip; - commands = (Widget *) alloc((unsigned) num_names * sizeof(Widget)); + commands = (Widget *) alloc((unsigned) num_names * sizeof (Widget)); num_args = 0; - XtSetArg(args[num_args], XtNallowShellResize, True); - num_args++; - + XtSetArg(args[num_args], XtNallowShellResize, True); num_args++; popup = XtCreatePopupShell(popup_name, transientShellWidgetClass, toplevel, args, num_args); XtOverrideTranslations( @@ -871,60 +879,71 @@ Widget *formp; /* return */ num_args = 0; XtSetArg(args[num_args], XtNforceBars, False); num_args++; XtSetArg(args[num_args], XtNallowVert, True); num_args++; + XtSetArg(args[num_args], XtNtranslations, + XtParseTranslationTable(popup_translations)); num_args++; view = XtCreateManagedWidget("menuformview", viewportWidgetClass, popup, args, num_args); num_args = 0; - XtSetArg(args[num_args], XtNtranslations, - XtParseTranslationTable(popup_translations)); - num_args++; *formp = form = XtCreateManagedWidget("menuform", formWidgetClass, view, args, num_args); - /* Get the default distance between objects in the form widget. */ + /* + * Get the default distance between objects in the viewport widget. + * (Something is fishy here: 'distance' ends up being 0 but there + * is a non-zero gap between the borders of the internal widgets. + * It matches exactly the default value of 4 for defaultDistance.) + */ num_args = 0; - XtSetArg(args[num_args], nhStr(XtNdefaultDistance), &distance); - num_args++; + XtSetArg(args[num_args], nhStr(XtNdefaultDistance), &distance); num_args++; + XtSetArg(args[num_args], nhStr(XtNborderWidth), &border_width); num_args++; XtGetValues(view, args, num_args); + if (!distance) + distance = 4; /* * Create the label. */ num_args = 0; - XtSetArg(args[num_args], XtNborderWidth, 0); - num_args++; + XtSetArg(args[num_args], XtNborderWidth, 0); num_args++; label = XtCreateManagedWidget(popup_label, labelWidgetClass, form, args, num_args); + cumulative_height = 0; + XtSetArg(args[0], XtNheight, &height); + XtGetValues(label, args, ONE); + cumulative_height += distance + height; /* no border for label */ + /* * Create the left button. */ num_args = 0; - XtSetArg(args[num_args], nhStr(XtNfromVert), label); - num_args++; - /* - XtSetArg(args[num_args], nhStr(XtNshapeStyle), - XmuShapeRoundedRectangle); num_args++; - */ + XtSetArg(args[num_args], nhStr(XtNfromVert), label); num_args++; +#if 0 + XtSetArg(args[num_args], nhStr(XtNshapeStyle), + XmuShapeRoundedRectangle); num_args++; +#endif left = XtCreateManagedWidget(left_name, commandWidgetClass, form, args, num_args); XtAddCallback(left, XtNcallback, left_callback, (XtPointer) 0); - skip = 3 * distance; /* triple the spacing */ - if (!skip) - skip = 3; + skip = (distance < 4) ? 8 : 2 * distance; + + num_args = 0; + XtSetArg(args[0], XtNheight, &height); + XtGetValues(left, args, ONE); + cumulative_height += distance + height + 2 * border_width; /* * Create right button. */ num_args = 0; - XtSetArg(args[num_args], nhStr(XtNfromHoriz), left); - num_args++; - XtSetArg(args[num_args], nhStr(XtNfromVert), label); - num_args++; - /* - XtSetArg(args[num_args], nhStr(XtNshapeStyle), - XmuShapeRoundedRectangle); num_args++; - */ + XtSetArg(args[num_args], nhStr(XtNfromHoriz), left); num_args++; + XtSetArg(args[num_args], nhStr(XtNhorizDistance), skip); num_args++; + XtSetArg(args[num_args], nhStr(XtNfromVert), label); num_args++; +#if 0 + XtSetArg(args[num_args], nhStr(XtNshapeStyle), + XmuShapeRoundedRectangle); num_args++; +#endif right = XtCreateManagedWidget(right_name, commandWidgetClass, form, args, num_args); XtAddCallback(right, XtNcallback, right_callback, (XtPointer) 0); @@ -939,29 +958,33 @@ Widget *formp; /* return */ if (!widget_names[i]) continue; num_args = 0; - XtSetArg(args[num_args], nhStr(XtNfromVert), above); - num_args++; + XtSetArg(args[num_args], nhStr(XtNfromVert), above); num_args++; if (above == left) { /* if first, we are farther apart */ - XtSetArg(args[num_args], nhStr(XtNvertDistance), skip); - num_args++; - } + XtSetArg(args[num_args], nhStr(XtNvertDistance), skip); num_args++; + cumulative_height += skip; + } else + cumulative_height += distance; + cumulative_height += height + 2 * border_width; *curr = XtCreateManagedWidget(widget_names[i], commandWidgetClass, form, args, num_args); XtAddCallback(*curr, XtNcallback, name_callback, (XtPointer) i); above = *curr++; } + cumulative_height += distance; /* space at bottom of form */ /* - * Now find the largest width. Start with the width dismiss + help - * buttons, since they are adjacent. + * Now find the largest width. Start with width of left + right buttons + * ('dismiss' + 'help' or 'quit' + 'random'), since they are adjacent. */ XtSetArg(args[0], XtNwidth, &max_width); XtGetValues(left, args, ONE); XtSetArg(args[0], XtNwidth, &width); XtGetValues(right, args, ONE); - max_width = max_width + width + distance; + /* doesn't count leftmost 'distance + border_width' and + rightmost 'border_width + distance' since all entries have those */ + max_width = max_width + border_width + skip + border_width + width; /* Next, the title. */ XtSetArg(args[0], XtNwidth, &width); @@ -980,6 +1003,40 @@ Widget *formp; /* return */ curr++; } + /* + * Re-do the two side-by-side widgets to take up half the width each. + * + * With max_width and skip both having even values, we never have to + * tweak left or right to maybe be one pixel wider than the other. + */ + if (max_width % 2) + ++max_width; + XtSetArg(args[0], XtNwidth, &width); + XtGetValues(left, args, ONE); + XtSetArg(args[0], XtNwidth, &other_width); + XtGetValues(right, args, ONE); + if (width + border_width + skip / 2 < max_width / 2 + && other_width + border_width + skip / 2 < max_width / 2) { + /* both are narrower than half */ + width = other_width = max_width / 2 - border_width - skip / 2; + XtSetArg(args[0], XtNwidth, width); + XtSetValues(left, args, ONE); + XtSetArg(args[0], XtNwidth, other_width); + XtSetValues(right, args, ONE); + } else if (width + border_width + skip / 2 < max_width / 2) { + /* 'other_width' (right) is half or more */ + width = max_width - other_width - 2 * border_width - skip; + XtSetArg(args[0], XtNwidth, width); + XtSetValues(left, args, ONE); + } else if (other_width + border_width + skip / 2 < max_width / 2) { + /* 'width' (left) is half or more */ + other_width = max_width - width - 2 * border_width - skip; + XtSetArg(args[0], XtNwidth, other_width); + XtSetValues(right, args, ONE); + } else { + ; /* both are exactly half... */ + } + /* * Finally, set all of the single line widgets to the largest width. */ @@ -999,6 +1056,31 @@ Widget *formp; /* return */ else free((char *) commands); + /* + * We actually want height of topmost background window, which + * may or may not be the root window. + * + * On OSX, screen height includes the space taken up by the + * desktop title bar, which isn't accessible to applications + * unless the preference settings for X11 are changed to force + * full-screen mode (so by default, this 'screen_height' value + * ends up being bigger than the available size...). + */ + screen_height = XHeightOfScreen(XtScreen(popup)); + + /* + * If the menu's complete height is too big for the display, + * forcing the height to be smaller will cause the vertical + * scroll bar (enabled but not forced above) to be included. + */ + if (cumulative_height >= screen_height) { + /* trial and error: 25 is a guesstimate for scrollbar width on + width adjustment and for title bar height on height adjustment */ + num_args = 0; + XtSetArg(args[num_args], XtNwidth, max_width + 25); num_args++; + XtSetArg(args[num_args], XtNheight, screen_height - 25); num_args++; + XtSetValues(popup, args, num_args); + } XtRealizeWidget(popup); XSetWMProtocols(XtDisplay(popup), XtWindow(popup), &wm_delete_window, 1); diff --git a/win/tty/wintty.c b/win/tty/wintty.c index 96cc9b1ee..82f96f1b0 100644 --- a/win/tty/wintty.c +++ b/win/tty/wintty.c @@ -37,6 +37,15 @@ extern void msmsg(const char *, ...); #endif #endif +#ifdef TTY_TILES_ESCCODES +extern short glyph2tile[]; +#define TILE_ANSI_COMMAND 'z' +#define AVTC_GLYPH_START 0 +#define AVTC_GLYPH_END 1 +#define AVTC_SELECT_WINDOW 2 +#define AVTC_INLINE_SYNC 3 +#endif + extern char mapped_menu_cmds[]; /* from options.c */ /* this is only needed until tty_status_* routines are written */ @@ -175,6 +184,36 @@ static const char default_menu_cmds[] = { MENU_INVERT_PAGE, MENU_SEARCH, 0 /* null terminator */ }; +#ifdef TTY_TILES_ESCCODES +static int vt_tile_current_window = -2; + +void +print_vt_code(i, c, d) +int i, c, d; +{ + if (iflags.vt_tiledata) { + if (c >= 0) { + if (i == AVTC_SELECT_WINDOW) { + if (c == vt_tile_current_window) return; + vt_tile_current_window = c; + } + if (d >= 0) + printf("\033[1;%d;%d;%d%c", i, c, d, TILE_ANSI_COMMAND); + else + printf("\033[1;%d;%d%c", i, c, TILE_ANSI_COMMAND); + } else { + printf("\033[1;%d%c", i, TILE_ANSI_COMMAND); + } + } +} +#else +# define print_vt_code(i, c, d) ; +#endif /* !TTY_TILES_ESCCODES */ +#define print_vt_code1(i) print_vt_code((i), -1, -1) +#define print_vt_code2(i,c) print_vt_code((i), (c), -1) +#define print_vt_code3(i,c,d) print_vt_code((i), (c), (d)) + + /* clean up and quit */ STATIC_OVL void bail(mesg) @@ -441,7 +480,8 @@ makepicks: Strcpy(pbuf, "Pick a role or profession"); end_menu(win, pbuf); n = select_menu(win, PICK_ONE, &selected); - choice = (n == 1) ? selected[0].item.a_int : ROLE_NONE; + choice = (n == 1) ? selected[0].item.a_int + : (n == 0) ? ROLE_RANDOM : ROLE_NONE; if (selected) free((genericptr_t) selected), selected = 0; destroy_nhwindow(win); @@ -526,7 +566,7 @@ makepicks: end_menu(win, pbuf); n = select_menu(win, PICK_ONE, &selected); choice = (n == 1) ? selected[0].item.a_int - : ROLE_NONE; + : (n == 0) ? ROLE_RANDOM : ROLE_NONE; if (selected) free((genericptr_t) selected), selected = 0; destroy_nhwindow(win); @@ -615,7 +655,7 @@ makepicks: end_menu(win, pbuf); n = select_menu(win, PICK_ONE, &selected); choice = (n == 1) ? selected[0].item.a_int - : ROLE_NONE; + : (n == 0) ? ROLE_RANDOM : ROLE_NONE; if (selected) free((genericptr_t) selected), selected = 0; destroy_nhwindow(win); @@ -700,7 +740,7 @@ makepicks: end_menu(win, pbuf); n = select_menu(win, PICK_ONE, &selected); choice = (n == 1) ? selected[0].item.a_int - : ROLE_NONE; + : (n == 0) ? ROLE_RANDOM : ROLE_NONE; if (selected) free((genericptr_t) selected), selected = 0; destroy_nhwindow(win); @@ -1426,6 +1466,8 @@ winid window; panic(winpanicstr, window); ttyDisplay->lastwin = window; + print_vt_code2(AVTC_SELECT_WINDOW, window); + switch (cw->type) { case NHW_MESSAGE: if (ttyDisplay->toplin) { @@ -2059,6 +2101,8 @@ boolean blocking; /* with ttys, all windows are blocking */ ttyDisplay->lastwin = window; ttyDisplay->rawprint = 0; + print_vt_code2(AVTC_SELECT_WINDOW, window); + switch (cw->type) { case NHW_MESSAGE: if (ttyDisplay->toplin == 1) { @@ -2107,13 +2151,15 @@ boolean blocking; /* with ttys, all windows are blocking */ if (ttyDisplay->toplin == 1) tty_display_nhwindow(WIN_MESSAGE, TRUE); #ifdef H2344_BROKEN - if (cw->maxrow >= (int) ttyDisplay->rows) + if (cw->maxrow >= (int) ttyDisplay->rows + || !iflags.menu_overlay) #else - if (cw->offx == 10 || cw->maxrow >= (int) ttyDisplay->rows) + if (cw->offx == 10 || cw->maxrow >= (int) ttyDisplay->rows + || !iflags.menu_overlay) #endif { cw->offx = 0; - if (cw->offy) { + if (cw->offy || iflags.menu_overlay) { tty_curs(window, 1, 0); cl_eos(); } else @@ -2142,6 +2188,8 @@ winid window; if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) panic(winpanicstr, window); + print_vt_code2(AVTC_SELECT_WINDOW, window); + switch (cw->type) { case NHW_MESSAGE: if (ttyDisplay->toplin) @@ -2211,6 +2259,8 @@ register int x, y; /* not xchar: perhaps xchar is unsigned and panic(winpanicstr, window); ttyDisplay->lastwin = window; + print_vt_code2(AVTC_SELECT_WINDOW, window); + #if defined(USE_TILES) && defined(MSDOS) adjust_cursor_flags(cw); #endif @@ -2299,6 +2349,8 @@ char ch; if (window == WIN_ERR || (cw = wins[window]) == (struct WinDesc *) 0) panic(winpanicstr, window); + print_vt_code2(AVTC_SELECT_WINDOW, window); + switch (cw->type) { case NHW_STATUS: case NHW_MAP: @@ -2366,6 +2418,8 @@ const char *str; ttyDisplay->lastwin = window; + print_vt_code2(AVTC_SELECT_WINDOW, window); + switch (cw->type) { case NHW_MESSAGE: /* really do this later */ @@ -3062,9 +3116,13 @@ int bkglyph UNUSED; /* map glyph to character and color */ (void) mapglyph(glyph, &ch, &color, &special, x, y); + print_vt_code2(AVTC_SELECT_WINDOW, window); + /* Move the cursor. */ tty_curs(window, x, y); + print_vt_code3(AVTC_GLYPH_START, glyph2tile[glyph], special); + #ifndef NO_TERMS if (ul_hack && ch == '_') { /* non-destructive underscore */ (void) putchar((char) ' '); @@ -3108,6 +3166,8 @@ int bkglyph UNUSED; #endif } + print_vt_code1(AVTC_GLYPH_END); + wins[window]->curx++; /* one character over */ ttyDisplay->curx++; /* the real cursor moved too */ } @@ -3118,6 +3178,7 @@ const char *str; { if (ttyDisplay) ttyDisplay->rawprint++; + print_vt_code2(AVTC_SELECT_WINDOW, NHW_BASE); #if defined(MICRO) || defined(WIN32CON) msmsg("%s\n", str); #else @@ -3132,6 +3193,7 @@ const char *str; { if (ttyDisplay) ttyDisplay->rawprint++; + print_vt_code2(AVTC_SELECT_WINDOW, NHW_BASE); term_start_raw_bold(); #if defined(MICRO) || defined(WIN32CON) msmsg("%s", str); @@ -3161,6 +3223,7 @@ tty_nhgetch() char nestbuf; #endif + print_vt_code1(AVTC_INLINE_SYNC); (void) fflush(stdout); /* Note: if raw_print() and wait_synch() get called to report terminal * initialization problems, then wins[] and ttyDisplay might not be @@ -3183,6 +3246,14 @@ tty_nhgetch() i = '\033'; /* same for EOF */ if (ttyDisplay && ttyDisplay->toplin == 1) ttyDisplay->toplin = 2; +#ifdef TTY_TILES_ESCCODES + { + /* hack to force output of the window select code */ + int tmp = vt_tile_current_window; + vt_tile_current_window++; + print_vt_code2(AVTC_SELECT_WINDOW, tmp); + } +#endif /* TTY_TILES_ESCCODES */ return i; } @@ -3316,17 +3387,23 @@ tty_status_init() * -- ptr is usually a "char *", unless fldindex is BL_CONDITION. * If fldindex is BL_CONDITION, then ptr is a long value with * any or none of the following bits set (from botl.h): - * BL_MASK_BLIND 0x00000001L - * BL_MASK_CONF 0x00000002L - * BL_MASK_FOODPOIS 0x00000004L - * BL_MASK_ILL 0x00000008L - * BL_MASK_HALLU 0x00000010L - * BL_MASK_STUNNED 0x00000020L - * BL_MASK_SLIMED 0x00000040L - * -- The value passed for BL_GOLD includes a leading - * symbol for GOLD "$:nnn". If the window port needs to use - * the textual gold amount without the leading "$:" the port - * will have to add 2 to the passed "ptr" for the BL_GOLD case. + * BL_MASK_STONE 0x00000001L + * BL_MASK_SLIME 0x00000002L + * BL_MASK_STRNGL 0x00000004L + * BL_MASK_FOODPOIS 0x00000008L + * BL_MASK_TERMILL 0x00000010L + * BL_MASK_BLIND 0x00000020L + * BL_MASK_DEAF 0x00000040L + * BL_MASK_STUN 0x00000080L + * BL_MASK_CONF 0x00000100L + * BL_MASK_HALLU 0x00000200L + * BL_MASK_LEV 0x00000400L + * BL_MASK_FLY 0x00000800L + * BL_MASK_RIDE 0x00001000L + * -- The value passed for BL_GOLD includes an encoded leading + * symbol for GOLD "\GXXXXNNNN:nnn". If the window port needs to use + * the textual gold amount without the leading "$:" the port will + * have to skip past ':' in the passed "ptr" for the BL_GOLD case. */ void tty_status_update(fldidx, ptr, chg, percent) @@ -3341,8 +3418,6 @@ genericptr_t ptr; * BL_HILITE_INVERSE -2 + 3 = 1 (statusattr[1]) * BL_HILITE_BOLD -3 + 3 = 0 (statusattr[0]) */ - int statusattr[] = { ATR_BOLD, ATR_INVERSE, ATR_NONE }; - int attridx = 0; long value = -1L; static boolean beenhere = FALSE; enum statusfields fieldorder[2][15] = { @@ -3353,6 +3428,13 @@ genericptr_t ptr; BL_AC, BL_XP, BL_EXP, BL_HD, BL_TIME, BL_HUNGER, BL_CAP, BL_CONDITION, BL_FLUSH } }; +#ifdef STATUS_HILITES + static int statusattr[] = { ATR_BOLD, ATR_INVERSE, ATR_NONE }; + int attridx = 0; +#else + nhUse(chg); + nhUse(percent); +#endif if (fldidx != BL_FLUSH) { if (!status_activefields[fldidx]) @@ -3361,20 +3443,32 @@ genericptr_t ptr; case BL_CONDITION: cond = *condptr; *status_vals[fldidx] = '\0'; - if (cond & BL_MASK_BLIND) - Strcat(status_vals[fldidx], " Blind"); - if (cond & BL_MASK_CONF) - Strcat(status_vals[fldidx], " Conf"); + if (cond & BL_MASK_STONE) + Strcat(status_vals[fldidx], " Stone"); + if (cond & BL_MASK_SLIME) + Strcat(status_vals[fldidx], " Slime"); + if (cond & BL_MASK_STRNGL) + Strcat(status_vals[fldidx], " Strngl"); if (cond & BL_MASK_FOODPOIS) Strcat(status_vals[fldidx], " FoodPois"); - if (cond & BL_MASK_ILL) - Strcat(status_vals[fldidx], " Ill"); - if (cond & BL_MASK_STUNNED) + if (cond & BL_MASK_TERMILL) + Strcat(status_vals[fldidx], " TermIll"); + if (cond & BL_MASK_BLIND) + Strcat(status_vals[fldidx], " Blind"); + if (cond & BL_MASK_DEAF) + Strcat(status_vals[fldidx], " Deaf"); + if (cond & BL_MASK_STUN) Strcat(status_vals[fldidx], " Stun"); + if (cond & BL_MASK_CONF) + Strcat(status_vals[fldidx], " Conf"); if (cond & BL_MASK_HALLU) Strcat(status_vals[fldidx], " Hallu"); - if (cond & BL_MASK_SLIMED) - Strcat(status_vals[fldidx], " Slime"); + if (cond & BL_MASK_LEV) + Strcat(status_vals[fldidx], " Lev"); + if (cond & BL_MASK_FLY) + Strcat(status_vals[fldidx], " Fly"); + if (cond & BL_MASK_RIDE) + Strcat(status_vals[fldidx], " Ride"); value = cond; break; default: @@ -3483,23 +3577,26 @@ genericptr_t ptr; int fldidx1 = fieldorder[0][i]; if (status_activefields[fldidx1]) { - if (tty_status_colors[fldidx1] < 0 && - tty_status_colors[fldidx1] >= -3) { +#ifdef STATUS_HILITES + if (tty_status_colors[fldidx1] < 0 + && tty_status_colors[fldidx1] >= -3) { /* attribute, not a color */ attridx = tty_status_colors[fldidx1] + 3; term_start_attr(statusattr[attridx]); putstr(WIN_STATUS, 0, status_vals[fldidx1]); term_end_attr(statusattr[attridx]); + } else #ifdef TEXTCOLOR - } else if (tty_status_colors[fldidx1] != CLR_MAX) { + if (tty_status_colors[fldidx1] != CLR_MAX) { if (tty_status_colors[fldidx1] != NO_COLOR) term_start_color(tty_status_colors[fldidx1]); putstr(WIN_STATUS, 0, status_vals[fldidx1]); if (tty_status_colors[fldidx1] != NO_COLOR) term_end_color(); -#endif } else - putstr(WIN_STATUS, 0, status_vals[fldidx1]); +#endif +#endif /* STATUS_HILITES */ + putstr(WIN_STATUS, 0, status_vals[fldidx1]); } } curs(WIN_STATUS, 1, 1); @@ -3507,28 +3604,31 @@ genericptr_t ptr; int fldidx2 = fieldorder[1][i]; if (status_activefields[fldidx2]) { - if (tty_status_colors[fldidx2] < 0 && - tty_status_colors[fldidx2] >= -3) { +#ifdef STATUS_HILITES + if (tty_status_colors[fldidx2] < 0 + && tty_status_colors[fldidx2] >= -3) { /* attribute, not a color */ attridx = tty_status_colors[fldidx2] + 3; term_start_attr(statusattr[attridx]); putstr(WIN_STATUS, 0, status_vals[fldidx2]); term_end_attr(statusattr[attridx]); + } else #ifdef TEXTCOLOR - } else if (tty_status_colors[fldidx2] != CLR_MAX) { + if (tty_status_colors[fldidx2] != CLR_MAX) { if (tty_status_colors[fldidx2] != NO_COLOR) term_start_color(tty_status_colors[fldidx2]); if (fldidx2 == BL_GOLD) { /* putmixed() due to GOLD glyph */ - putmixed(WIN_STATUS, 0, status_vals[fldidx2]); + putmixed(WIN_STATUS, 0, status_vals[fldidx2]); } else { - putstr(WIN_STATUS, 0, status_vals[fldidx2]); + putstr(WIN_STATUS, 0, status_vals[fldidx2]); } if (tty_status_colors[fldidx2] != NO_COLOR) term_end_color(); -#endif } else - putstr(WIN_STATUS, 0, status_vals[fldidx2]); +#endif +#endif /* STATUS_HILITES */ + putstr(WIN_STATUS, 0, status_vals[fldidx2]); } } return; diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index 073cd1501..a483bf223 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -2819,18 +2819,23 @@ status_update(int fldindex, genericptr_t ptr, int chg, int percentage) -- ptr is usually a "char *", unless fldindex is BL_CONDITION. If fldindex is BL_CONDITION, then ptr is a long value with any or none of the following bits set (from botl.h): - BL_MASK_BLIND 0x00000001L - BL_MASK_CONF 0x00000002L - BL_MASK_FOODPOIS 0x00000004L - BL_MASK_ILL 0x00000008L - BL_MASK_HALLU 0x00000010L - BL_MASK_STUNNED 0x00000020L - BL_MASK_SLIMED 0x00000040L - -- The value passed for BL_GOLD includes a leading - symbol for GOLD "$:nnn". If the window port needs to use - the textual gold amount without the leading "$:" the port - will have to add 2 to the passed "ptr" for the BL_GOLD -case. + BL_MASK_STONE 0x00000001L + BL_MASK_SLIME 0x00000002L + BL_MASK_STRNGL 0x00000004L + BL_MASK_FOODPOIS 0x00000008L + BL_MASK_TERMILL 0x00000010L + BL_MASK_BLIND 0x00000020L + BL_MASK_DEAF 0x00000040L + BL_MASK_STUN 0x00000080L + BL_MASK_CONF 0x00000100L + BL_MASK_HALLU 0x00000200L + BL_MASK_LEV 0x00000400L + BL_MASK_FLY 0x00000800L + BL_MASK_RIDE 0x00001000L + -- The value passed for BL_GOLD includes an encoded leading + symbol for GOLD "\GXXXXNNNN:nnn". If window port needs + textual gold amount without the leading "$:" the port will + have to skip past ':' in passed "ptr" for the BL_GOLD case. */ void mswin_status_update(int idx, genericptr_t ptr, int chg, int percent) @@ -2851,20 +2856,32 @@ mswin_status_update(int idx, genericptr_t ptr, int chg, int percent) case BL_CONDITION: { cond = *condptr; *_status_vals[idx] = '\0'; - if (cond & BL_MASK_BLIND) - Strcat(_status_vals[idx], " Blind"); - if (cond & BL_MASK_CONF) - Strcat(_status_vals[idx], " Conf"); + if (cond & BL_MASK_STONE) + Strcat(_status_vals[idx], " Stone"); + if (cond & BL_MASK_SLIME) + Strcat(_status_vals[idx], " Slime"); + if (cond & BL_MASK_STRNGL) + Strcat(_status_vals[idx], " Strngl"); if (cond & BL_MASK_FOODPOIS) Strcat(_status_vals[idx], " FoodPois"); - if (cond & BL_MASK_ILL) - Strcat(_status_vals[idx], " Ill"); - if (cond & BL_MASK_STUNNED) + if (cond & BL_MASK_TERMILL) + Strcat(_status_vals[idx], " TermIll"); + if (cond & BL_MASK_BLIND) + Strcat(_status_vals[idx], " Blind"); + if (cond & BL_MASK_DEAF) + Strcat(_status_vals[idx], " Deaf"); + if (cond & BL_MASK_STUN) Strcat(_status_vals[idx], " Stun"); + if (cond & BL_MASK_CONF) + Strcat(_status_vals[idx], " Conf"); if (cond & BL_MASK_HALLU) Strcat(_status_vals[idx], " Hallu"); - if (cond & BL_MASK_SLIMED) - Strcat(_status_vals[idx], " Slime"); + if (cond & BL_MASK_LEV) + Strcat(_status_vals[idx], " Lev"); + if (cond & BL_MASK_FLY) + Strcat(_status_vals[idx], " Fly"); + if (cond & BL_MASK_RIDE) + Strcat(_status_vals[idx], " Ride"); value = cond; } break; case BL_GOLD: {