diff --git a/dat/tower.des b/dat/tower.des index 17c6fd8f2..c58fb8b5e 100644 --- a/dat/tower.des +++ b/dat/tower.des @@ -19,15 +19,17 @@ MAP |.| |.| |.| --- --- --- ENDMAP +$niches = { (03,01), (03,09), (07,01), (07,09), (11,01), (11,09) } +SHUFFLE: $niches LADDER:(11,05),down # The lord and his court MONSTER:('V',"Vlad the Impaler"),(06,05) -MONSTER:'V',(03,09) -MONSTER:'V',(07,09) -MONSTER:'V',(11,09) -MONSTER:'V',(03,01) -MONSTER:'V',(07,01) -MONSTER:'V',(11,01) +MONSTER:'V',$niches[0] +MONSTER:'V',$niches[1] +MONSTER:'V',$niches[2] +MONSTER:'V',$niches[3] +MONSTER:'V',$niches[4] +MONSTER:'V',$niches[5] # The doors DOOR:closed,(08,03) DOOR:closed,(10,03) @@ -38,12 +40,17 @@ DOOR:locked,(10,07) DOOR:closed,(03,06) # treasures OBJECT:('(',"chest"),(07,05) -OBJECT:('(',"chest"),(03,09) -OBJECT:('(',"chest"),(07,09) -OBJECT:('(',"chest"),(11,09) -OBJECT:('(',"chest"),(03,01) -OBJECT:('(',"chest"),(07,01) -OBJECT:('(',"chest"),(11,01) + +OBJECT:('(',"chest"),$niches[0] +OBJECT:('(',"chest"),$niches[1] +OBJECT:('(',"chest"),$niches[2] +OBJECT:('(',"chest"),$niches[3] +CONTAINER:('(',"chest"),$niches[4] { + OBJECT:('(', "wax candle"), quantity:4d2 +} +CONTAINER:('(',"chest"),$niches[5] { + OBJECT:('(', "tallow candle"), quantity:4d2 +} # We have to protect the tower against outside attacks NON_DIGGABLE:(00,00,14,10) diff --git a/dat/tribute b/dat/tribute index d60bba5d8..c8eb3524e 100644 --- a/dat/tribute +++ b/dat/tribute @@ -11,13 +11,13 @@ # %title The Colour of Magic (2) %passage 1 -It has been remarked before that those who are sensitive to radiation in the -far octarine - the eighth colour, the pigment of the Imagination - can see -things that others cannot. +It has been remarked before that those who are sensitive to radiation in +the far octarine - the eighth colour, the pigment of the Imagination - can +see things that others cannot. -Thus it was that Rincewind, hurrying through the crowded, flare-lit, evening -bazarrs of Morpork with the Luggage trundling behind him, jostled a tall -figure, turned to deliver a few suitable curses, and beheld Death. +Thus it was that Rincewind, hurrying through the crowded, flare-lit, +evening bazarrs of Morpork with the Luggage trundling behind him, jostled a +tall figure, turned to deliver a few suitable curses, and beheld Death. It had to be Death. No-one else went around with empty eye sockets and, of course, the scythe over one shoulder was another clue. @@ -26,20 +26,20 @@ course, the scythe over one shoulder was another clue. %e passage 1 %passage 2 As he was drawn towards the Eye the terror-struck Rincewind raised the box -protectively, and at the same time heard the picture imp say, 'They're about -ripe now, can't hold them any longer. Every-one smile, please.' +protectively, and at the same time heard the picture imp say, 'They're +about ripe now, can't hold them any longer. Every-one smile, please.' There was a - - flash of light so white and so bright - - it didn't seem like light at all. Bel-Shamharoth screamed, a sound that started in the far ultrasonic and -finished somewhere in Rincewind's bowels. The tentacles went momentarily as -stiff as rods, hurling their various cargos around the room, before bunching -up protectively in front of the abused Eye. The whole mass dropped into the -pit and a moment later the big slab was snatched up by several dozen tentacles -and slammed into place, leaving a number of thrashing limbs trapped around the -edge. +finished somewhere in Rincewind's bowels. The tentacles went momentarily +as stiff as rods, hurling their various cargos around the room, before +bunching up protectively in front of the abused Eye. The whole mass +dropped into the pit and a moment later the big slab was snatched up by +several dozen tentacles and slammed into place, leaving a number of +thrashing limbs trapped around the edge. [The Colour of Magic, by Terry Pratchett] %e passage 2 @@ -52,10 +52,10 @@ edge. 'Cohen is my name, boy' Belthan'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 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 ...' +'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 ...' 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 @@ -64,23 +64,23 @@ legend.' [The Light Fantastic, by Terry Pratchett] %e passage 1 %passage 2 -Death sat at one side of a black baize table in the entre of the room, arguing -with Famine, War and Pestilence. Twoflower was the only one to look up and -notice Rincewind. +Death sat at one side of a black baize table in the entre 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 -' +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 anflipped 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 @@ -116,7 +116,7 @@ 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 +they're outlawed pirates on forbidden seas who play late-night records with limbic lyrics. [Equal Rites, by Terry Pratchett] @@ -127,7 +127,9 @@ limbic lyrics. # %title Mort (1) %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 hand 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 @@ -144,8 +146,9 @@ RARE, said Death. %e passage %passage 2 They suffered from the terrible delusion that something could be done. -They seemed prepared to make the world the way they wanted it or die in the attempt, -and the trouble with dying in the attempt was that you died in the attempt. +They seemed prepared to make the world the way they wanted it or die in the +attempt, and the trouble with dying in the attempt was that you died in +the attempt. [Sourcery, by Terry Pratchett] %e passage @@ -153,10 +156,42 @@ and the trouble with dying in the attempt was that you died in the attempt. # # # -%title Wyrd Sisters (1) +%title Wyrd Sisters (2) %passage 1 -Destiny is important, see, but people go wrong when they think it controls them. It's the other way around. +Destiny is important, see, but people go wrong when they think it controls +them. It's the other way around. + + [Wyrd Sisters, by Terry Pratchett] +%e passage +%passage 2 +#submitted by Boudewijn +Verence tried to avoid walking through walls. A man had his dignity. +He became aware that he was being watched. +He turned his head. +There was a cat sitting in the doorway, subjecting him to a slow blink. +It was a mottled grey and extremely fat... +No. It was extremely /big/. It was covered with so much scar tissue +that it looked like a fist with fur on it. Its ears were a couple of +perforated stubs, its eyes two yellow slits of easy-going malevolence, +its tail a twitching series of question marks as it stared at him. +Greebo had heard that Lady Felmet had a small white female cat and had +strolled up to pay his respects. Verence had never seen an animal with +so much built-in villainy. He didn't resist as it waddled across the +floor and dried to rub itself against his legs, purring like a +waterfall. + +'Well, well,' said the king, vaguely. He reached down and made an +effort to scratch it behind the two ragged bits on top of its head. +It was a relief to find someone else besides another ghost who could +see him, and Greebo, he couldn't help feeling, was a distinctly unusual +cat. Most of the castle cats were either pampered pets or flat-eared +kitchen and stable habitués who generally resembled the very rodents +they lived on. This cat, on the other hand, was its own animal. All +cats give that impression, of course, but instead of the mindless +animal self-absorption that passes for secret wisdom in the creatures, +Greebo radiated genuime intelligence. He also radiated a smell that +would have knocked over a wall and caused sinus trouble in a dead fox. [Wyrd Sisters, by Terry Pratchett] %e passage @@ -166,12 +201,14 @@ Destiny is important, see, but people go wrong when they think it controls them. # %title Pyramids (2) %passage 1 -The trouble with life was that you didn't get a chance to practice before doing it for real. +The trouble with life was that you didn't get a chance to practice before +doing it for real. [Pyramids, by Terry Pratchett] %e passage %passage 2 -Mere animals couldn't possibly manage to act like this. You need to be a human being to be really stupid. +Mere animals couldn't possibly manage to act like this. You need to be a +human being to be really stupid. [Pyramids, by Terry Pratchett] %e passage @@ -181,15 +218,15 @@ Mere animals couldn't possibly manage to act like this. You need to be a human b # %title Guards! Guards! (2) %passage 1 -Guards! Guards!, by Terry Pratchett -Never build a dungeon you wouldn't be happy to spend the night in yourself. The world would be a happier place if more people remembered that. +Never build a dungeon you wouldn't be happy to spend the night in yourself. +The world would be a happier place if more people remembered that. [Guards! Guards!, by Terry Pratchett] %e passage %passage 2 -Guards! Guards!, by Terry Pratchett -These weren't encouraged in the city, since the heft and throw of a longbow's arrow could send it -through an innocent bystander a hundred yards away instead of the innocent bystander at whom it was aimed. +These weren't encouraged in the city, since the heft and throw of a +longbow's arrow could send it through an innocent bystander a hundred +yards away instead of the innocent bystander at whom it was aimed. [Guards! Guards!, by Terry Pratchett] %e passage @@ -199,18 +236,25 @@ through an innocent bystander a hundred yards away instead of the innocent bysta # %title Eric (2) %passage 1 - No enemies had ever taken Ankh-Morpork. Well, /technically/ they had, quite often; the city welcomed free-spending barbarian invaders, but somehow the puzzled raiders always found, after a few days, that they didn't own their own horses any more, and within a couple of months they were just another minority group with its own graffiti and food shops. +No enemies had ever taken Ankh-Morpork. Well, /technically/ they had, quite + often; the city welcomed free-spending barbarian invaders, but somehow the + puzzled raiders always found, after a few days, that they didn't own their + own horses any more, and within a couple of months they were just another +minority group with its own graffiti and food shops. - [Terry Pratchett, Eric] + [Terry Pratchett, Eric] %e passage %passage 2 - Rincewind looked down at the broad steps they were climbing. They were something of a novelty; each one was built out of large stone letters. The one he was just stepping on to, for example, read: I Meant It For The Best. - The next one was: I Thought You'd Like It. - Eric was standing on: For The Sake Of The Children. - 'Weird, isn't it?' he said. 'Why do it like this?' - 'I think they're meant to be good intentions,' said Rincewind. This was a road to hell, and demons were, after all, traditionalists. +Rincewind looked down at the broad steps they were climbing. They were + something of a novelty; each one was built out of large stone letters. The + one he was just stepping on to, for example, read: I Meant It For The Best. +The next one was: I Thought You'd Like It. +Eric was standing on: For The Sake Of The Children. +'Weird, isn't it?' he said. 'Why do it like this?' +'I think they're meant to be good intentions,' said Rincewind. This was a +road to hell, and demons were, after all, traditionalists. - [Terry Pratchett, Eric] + [Terry Pratchett, Eric] %e passage %e title # @@ -218,40 +262,70 @@ through an innocent bystander a hundred yards away instead of the innocent bysta # %title Moving Pictures (4) %passage 1 - This is space. It's sometimes called the final frontier. - (Except that of course you can't have a /final/ frontier, because there'd be nothing for it to be a frontier /to/, but as frontiers go, it's pretty penultimate...) +This is space. It's sometimes called the final frontier. +(Except that of course you can't have a /final/ frontier, because there'd + be nothing for it to be a frontier /to/, but as frontiers go, it's pretty +penultimate...) - [Terry Pratchett, Moving Pictures] + [Terry Pratchett, Moving Pictures] %e passage %passage 2 - By and large, the only skill the alchemists of Ankh-Morpork had discovered so far was the ability to turn gold into less gold. +By and large, the only skill the alchemists of Ankh-Morpork had discovered +so far was the ability to turn gold into less gold. - [Terry Pratchett, Moving Pictures] + [Terry Pratchett, Moving Pictures] %e passage %passage 3 - There was a dog sitting by his feet. - It was small, bow-legged and wiry, and basically grey but with patches of brown, white, and black in outlying areas... - It looked up slowly, and said 'Woof?' - Victor poked an exploratory finger in his ear. It must have been a trick of an echo, or something. It wasn't that the dog had gone 'woof!', although that was practically unique in itself; most dogs in the universe /never/ went 'woof!', they had complicated barks like 'whuuugh!' and 'hwhoouf!'. No, it was that it hadn't in fact /barked/ at all. It had /said/ 'woof'. - 'Could have bin worse, mister. I could have said "miaow".' +There was a dog sitting by his feet. +It was small, bow-legged and wiry, and basically grey but with patches of +brown, white, and black in outlying areas... It looked up slowly, and +said 'Woof?' Victor poked an exploratory finger in his ear. It must have + been a trick of an echo, or something. It wasn't that the dog had gone + 'woof!', although that was practically unique in itself; most dogs in the + universe /never/ went 'woof!', they had complicated barks like 'whuuugh!' + and 'hwhoouf!'. No, it was that it hadn't in fact /barked/ at all. It had +/said/ 'woof'. 'Could have bin worse, mister. I could have said "miaow".' - [Terry Pratchett, Moving Pictures] + [Terry Pratchett, Moving Pictures] %e passage %passage 4 - ''Twas beauty killed the beast,' said the Dean, who liked to say things like that. - 'No it wasn't,' said the Chair. 'It was it splatting into the ground like that.' +''Twas beauty killed the beast,' said the Dean, who liked to say things +like that. 'No it wasn't,' said the Chair. 'It was it splatting into the +ground like that.' - [Terry Pratchett, Moving Pictures] + [Terry Pratchett, Moving Pictures] %e passage %e title # # # -%title Reaper Man (1) +%title Reaper Man (4) %passage 1 -Reaper Man, by Terry Pratchett +No one is actually dead until the ripples they cause in the world die away.. +. + [Reaper Man, by Terry Pratchett] +%e passage +%passage 2 +Five exclamation marks, the sure sign of an insane mind. + [Reaper Man, by Terry Pratchett] +%e passage +%passage 3 +Light thinks it travels faster than anything but it is wrong. No matter how + fast light travels, it finds the darkness has always got there first, and +is waiting for it. + + [Reaper Man, by Terry Pratchett] +%e passage +%passage 4 +"That's not fair, you know. If we knew when we were going to die, people +would lead better lives." + +IF PEOPLE KNEW WHEN THEY WERE GOING TO DIE, I THINK THEY PROBABLY WOULDN'T +LIVE AT ALL. + + [Reaper Man, by Terry Pratchett] %e passage %e title # @@ -275,7 +349,8 @@ He says gods like to see an atheist around. Gives them something to aim at. [Small Gods, by Terry Pratchett] %e passage %passage 2 -Pets are always a great help in times of stress. And in times of starvation too, o'course. +Pets are always a great help in times of stress. And in times of starvation +too, o'course. [Small Gods, by Terry Pratchett] %e passage @@ -316,7 +391,8 @@ The maze was so small that people got lost looking for it. # %title Soul Music (2) %passage 1 -But this didn't feel like magic. It felt a lot older than that. It felt like music +But this didn't feel like magic. It felt a lot older than that. It felt +like music [Soul Music, by Terry Pratchett] %e passage @@ -357,77 +433,88 @@ understood things we'd never get anything done." # %title Maskerade (4) %passage 1 - 'Maybe you could... help us?' - 'What's wrong?' - 'It's my boy...' - Granny opened the door further and saw the womand standing behind Mr. Slot. One look at her face was enough. There was a bundle in her arms. - Granny stepped back. 'Bring him in and let me have a look at him.' - She took the baby from the woman, sat down on the room's one chair, and pulled back the blanket. - 'Hmm,' said Granny, after a while. - 'There's a curse on this house, that's what it is,' said Slot. 'My best cow's been taken mortally sick, too.' - 'Oh? You have a cowshed?' siad Granny. 'Very good place for a sick-room, a cowshed. It's the warmth. You better show me were it is.' - 'You want to take the boy down there?' - 'Right now.' +'Maybe you could... help us?' +'What's wrong?' +'It's my boy...' +Granny opened the door further and saw the womand standing behind Mr. Slot. +One look at her face was enough. There was a bundle in her arms. Granny +stepped back. 'Bring him in and let me have a look at him.' She took the + baby from the woman, sat down on the room's one chair, and pulled back the +blanket. 'Hmm,' said Granny, after a while. +'There's a curse on this house, that's what it is,' said Slot. 'My best +cow's been taken mortally sick, too.' 'Oh? You have a cowshed?' siad + Granny. 'Very good place for a sick-room, a cowshed. It's the warmth. You +better show me were it is.' 'You want to take the boy down there?' +'Right now.' [...] - 'How many have you come for?' - ONE. - 'The cow?' - Death shook his head. - 'It could be the cow.' - NO. THAT WOULD BE CHANGING HISTORY. - 'History is about things changing.' - NO. - Granny sat back. - 'Then I challenge you to a game. That's traditional. That's /allowed/.' - Death was silent for a moment. - THIS IS TRUE. - 'Good.' - HOWEVER... YOU UNDERSTAND THAT TO WIN ALL YOU MUST GAMBLE ALL? - 'Double or quits? Yes, I know.' - BUT NOT CHESS. - 'Can't abide chess.' - OR CRIPPLE MR ONION. I'VE NEVER BEEN ABLE TO UNDERSTAND THE RULES. - 'Very well. How about one hand of poker? Five cards each, no draws? Sudden death, as they say.' - Death thought about this, too. - YOU KNOW THIS FAMILY? - 'No.' - THEN WHY? - 'Are we talking or are we playing?' - OH, VERY WELL. - Granny looked at her cards, and threw them down. - FOUR QUEENS. HMM. THAT /IS/ VERY HIGH. - Death looked down at his cards, and then up into Granny's steady, blue-eyed gaze. - Neither moved for some time. - Then Death laid the hand on the table. - I LOSE. ALL I HAVE IS FOUR ONES. +'How many have you come for?' +ONE. +'The cow?' +Death shook his head. +'It could be the cow.' +NO. THAT WOULD BE CHANGING HISTORY. +'History is about things changing.' +NO. +Granny sat back. +'Then I challenge you to a game. That's traditional. That's /allowed/.' +Death was silent for a moment. +THIS IS TRUE. +'Good.' +HOWEVER... YOU UNDERSTAND THAT TO WIN ALL YOU MUST GAMBLE ALL? +'Double or quits? Yes, I know.' +BUT NOT CHESS. +'Can't abide chess.' +OR CRIPPLE MR ONION. I'VE NEVER BEEN ABLE TO UNDERSTAND THE RULES. +'Very well. How about one hand of poker? Five cards each, no draws? Sudden +death, as they say.' Death thought about this, too. +YOU KNOW THIS FAMILY? +'No.' +THEN WHY? +'Are we talking or are we playing?' +OH, VERY WELL. +Granny looked at her cards, and threw them down. +FOUR QUEENS. HMM. THAT /IS/ VERY HIGH. +Death looked down at his cards, and then up into Granny's steady, blue-eyed +gaze. Neither moved for some time. +Then Death laid the hand on the table. +I LOSE. ALL I HAVE IS FOUR ONES. - [Maskerade, by Terry Pratchett] + [Maskerade, by Terry Pratchett] %e passage %passage 2 - Ahahahahaha! - Ahahahaha! - Aahahaha! - BEWARE!!!!! - Yrs sincerely, - The Opera Ghost - 'What sort of person,' said Salzella, 'sits down and /writes/ a maniacal laugh? And all those exclamation marks, you notice? Five? A sure sign of someone who wears his underpants on his head. Opera can do that to a man.' +Ahahahahaha! +Ahahahaha! +Aahahaha! +BEWARE!!!!! +Yrs sincerely, +The Opera Ghost +'What sort of person,' said Salzella, 'sits down and /writes/ a maniacal +laugh? And all those exclamation marks, you notice? Five? A sure sign of +someone who wears his underpants on his head. Opera can do that to a man.' - [Maskerade, by Terry Pratchett] + [Maskerade, by Terry Pratchett] %e passage %passage 3 - Agnes had woken up one morning with the horrible realization that she'd been saddled with a lovely personality. It was the lack of choice that rankled. No one had asked her, before she was born, whether she wanted a lovely personality or whether she'd prefer, say, a miserable personality but a body that could take size 9 in dresses. Instead, people would take pains to tell her that beauty was only skin-deep, as if a man ever fell for an attractive pair of kidneys. +Agnes had woken up one morning with the horrible realization that she'd +been saddled with a lovely personality. It was the lack of choice that +rankled. No one had asked her, before she was born, whether she wanted a +lovely personality or whether she'd prefer, say, a miserable personality +but a body that could take size 9 in dresses. Instead, people would take +pains to tell her that beauty was only skin-deep, as if a man ever fell +for an attractive pair of kidneys. - [Maskerade, by Terry Pratchett] + [Maskerade, by Terry Pratchett] %e passage %passage 4 - 'And what can I get you, officers?' she said. - 'Officers? Us? What makes you think we're watchment?' - 'He's got a helmet on,' Nanny pointed out. - 'Milit'ry chic,' Nobby said. 'It's just a fashion accessory. Actually, we are gentlemen of means and have nothing to do with the City Watch whatsoever.' - 'Well, /gentlemen/, would you like some wine?' - 'Not while we on duty, t'anks', said the troll. +'And what can I get you, officers?' she said. +'Officers? Us? What makes you think we're watchment?' +'He's got a helmet on,' Nanny pointed out. +'Milit'ry chic,' Nobby said. 'It's just a fashion accessory. Actually, we +are gentlemen of means and have nothing to do with the City Watch +whatsoever.' 'Well, /gentlemen/, would you like some wine?' +'Not while we on duty, t'anks', said the troll. - [Maskerade, by Terry Pratchett] + [Maskerade, by Terry Pratchett] %e passage %e title # @@ -435,15 +522,18 @@ understood things we'd never get anything done." # %title Feet of Clay (2) %passage 1 -Rumour is information distilled so finely that it can filter through anything. -It does not need doors and windows -- sometimes it does not need people. -It can exist free and wild, running from ear to ear without ever touching lips. +Rumour is information distilled so finely that it can filter through +anything. It does not need doors and windows -- sometimes it does not need +people. It can exist free and wild, running from ear to ear without ever +touching lips. [Feet of Clay, by Terry Pratchett] %e passage %passage 2 -It was hard enough to kill a vampire. You could stake them down and turn them into dust and ten years later someone drops a drop of blood in the wrong place and guess who's back? -They returned more times than raw broccoli. +It was hard enough to kill a vampire. You could stake them down and turn + them into dust and ten years later someone drops a drop of blood in the +wrong place and guess who's back? They returned more times than raw +broccoli. [Feet of Clay, by Terry Pratchett] %e passage @@ -453,9 +543,21 @@ They returned more times than raw broccoli. # %title Hogfather (1) %passage 1 +#addition text contributed by Boudewijn Everything starts somewhere, though many physicists disagree. -But people have always been dimly aware of the problem with the start of things. -They wonder how the snowplough driver gets to work, or how the makers of dictionaries look up the spelling of words. +But people have always been dimly aware of the problem with the start of +things. They wonder how the snowplough driver gets to work, or how the +makers of dictionaries look up the spelling of words. Yet there is the +constant desire to find some point in the twisting, knotting, ravelling +nets of space-time on which a metaphorical finger can be put to indicate +that here, /here/, is the point where it all began . . . + +/Something/ began when the Guild of Assassins enrolled Mister Teatime, +who saw things differently from other people, and one of the ways that +he saw things differently from other people was in seeing other people +as things (later, Lord Downey of the Guild said, 'We took pity on him +because he'd lost both parents at an early age. I think that, on +reflection, we should have wondered a bit more about that.') [Hogfather, by Terry Pratchett] %e passage @@ -463,13 +565,67 @@ They wonder how the snowplough driver gets to work, or how the makers of diction # # # -%title Jingo (1) +%title Jingo (2) %passage 1 -It was so much easier to blame it on Them. It was bleakly depressing to think that They were Us. -If it was Them, then nothing was anyone's fault. If it was us, what did that make Me? -After all, I'm one of Us. I must be. I've certainly never thought of myself as one of Them. -No one ever thinks of themselves as one of Them. We're always one of Us. -It's Them that do the bad things. +It was so much easier to blame it on Them. It was bleakly depressing to +think that They were Us. If it was Them, then nothing was anyone's fault. +If it was us, what did that make Me? After all, I'm one of Us. I must be. +I've certainly never thought of myself as one of Them. No one ever thinks +of themselves as one of Them. We're always one of Us. It's Them that do +the bad things. + + [Jingo, by Terry Pratchett] +%e passage +%passage 2 +#contributed by Boudewijn +There was a general shifting of position and a group clearing of throats. +'What about mercenaries?' said Boggis. +'The problem with mercenaries', said the Patrician, 'is that they need +to be paid to start fighting. And, unless you are very lucky, you end +up paying them even more to stop--' +Selachii thumped the table. +'Very well, then, by jingo!' he snarled. 'Alone!' +'We could certainly do with one,' said Lord Vetinari. 'We need the +money. I was about to say that we cannot /afford/ mercenaries.' +'How can this be?' said Lord Downey. Don't we pay our taxes?' +'Ah, I thought we might come to that,' said Lord Vetinari. He raised +his hand and, on cue again, his clerk placed a piece of paper in it. +'Let me see now . . . ah yes. Guild of Assassins . . . Gross earnings +in the last year: AM$13,207,048. Taxes paid in the last year: +forty-seven dollars, twenty-two pence and what on examination turned +out to be a Hershebian half-/dong/, worth one eighth of a penny.' +'That's all perfectly legal! The Guild of Accountants--' +'Ah yes. Guild of Accountants: gross earnings AM$7,999,011. +Taxes paid: nil. But, ah yes, I see they applied for a rebate of +AM$200,000.' +'And what we received, I may say, included a Hershebian half-/dong/,' +said Mr Frostrip of the Guild of Accountants. +'What goes around comes around,' said Vetinari calmly. +He tossed the paper aside. 'Taxation, gentlemen, is very much like +dairy farming. The task is to extract the maximum amount of milk with +the minimum of moo. And I am afraid to say that these days all I get is +moo.' +'Are you telling us that Ankh-Morpork is /bankrupt/?' said Downey. +'Of course. While, at the same time, full of rich people. I trust they +have been spending their good fortume on swords.' +'And you have /allowed/ this wholesale tax avoidance?' said Lord +Selachii. 'Oh, the taxes haven't been avoided,' said Lord Vetinari. +'Or even evaded. They just haven't been paid.' +'That is a disgusting state of affairs!' +The Patrician raised his eyebrows. 'Commander Vines?' +'Yes, sir?' +'Would you be so good as to assemble a squad of your most experienced +men, liaise with the tax gatherers and obtain the accumulated back +taxes, please? My clerk here will give you a list of the prime +defaulters.' +'Right, sir. And if they resist, sir?' said Vimes, smiling nastily. +'Oh, how can they resist, commander? This is the will of our civic +leaders.' He took the paper his clerk proferred. 'Let me see, now. +Top of the list--' Lord Selachii coughed hurriedly. 'Far too late for +that sort of nonsense now,' he said. +'Water under the bridge,' said Lord Downey. +'Deat and buried,' said Mr Slant. +'I paid mine,' said Vimes. [Jingo, by Terry Pratchett] %e passage @@ -479,12 +635,14 @@ It's Them that do the bad things. # %title The Last Continent (2) %passage 1 -PEOPLE'S WHOLE LIVES DO PASS IN FRONT OF THEIR EYES BEFORE THEY DIE. THE PROCESS IS CALLED 'LIVING'. +PEOPLE'S WHOLE LIVES DO PASS IN FRONT OF THEIR EYES BEFORE THEY DIE. THE +PROCESS IS CALLED 'LIVING'. [The Last Continent, by Terry Pratchett] %e passage %passage 2 -"When You're Up to Your Ass in Alligators, Today Is the First Day of the Rest of Your Life." +"When You're Up to Your Ass in Alligators, Today Is the First Day of the +Rest of Your Life." [The Last Continent, by Terry Pratchett] %e passage @@ -513,11 +671,12 @@ A million dead people can't have been wrong, can they? [The Fifth Elephant, by Terry Pratchett] %e passage %passage 2 -He'd noticed that sex bore some resemblance to cookery: It facinated people, -they sometimes bought books full of complicated recipes and interesting -pictures, and sometimes when they were really hungry they created vast -banquets in their imagination - but at the end of the day they'd settle quite -happily for egg and chips, if it was well done and maybe had a slice of tomato. +He'd noticed that sex bore some resemblance to cookery: It facinated +people, they sometimes bought books full of complicated recipes and +interesting pictures, and sometimes when they were really hungry they +created vast banquets in their imagination - but at the end of the day +they'd settle quite happily for egg and chips, if it was well done and +maybe had a slice of tomato. [The Fifth Elephant, by Terry Pratchett] %e passage @@ -527,13 +686,15 @@ happily for egg and chips, if it was well done and maybe had a slice of tomato. # %title The Truth (2) %passage 1 -There are, it has been said, two types of people in the world. There are those -who, when presented with a glass that is exactly half full, say: this glass is -half full. And then there are those who say: this glass is half empty. +There are, it has been said, two types of people in the world. There are +those who, when presented with a glass that is exactly half full, say: this +glass is half full. And then there are those who say: this glass is half +empty. -The world belongs, however, to those who can look at the glass and say: What's -up with this glass? Excuse me? Excuse me? This is may glass? I don't think -so. My glass was full! And it was a bigger glass! Who's been pinching my beer? +The world belongs, however, to those who can look at the glass and say: +What's up with this glass? Excuse me? Excuse me? This is may glass? I +don't think so. My glass was full! And it was a bigger glass! Who's been +pinching my beer? [The Truth, by Terry Pratchett] %e passage 1 @@ -687,7 +848,8 @@ betray 'em, quick as a wink. 'Cos that's villaining.' # %title The Amazing Maurice and his Educated Rodents (1) %passage 1 -The important thing about adventures, thought Mr Bunnsy, was that they shouldn't be so long as to make you miss mealtimes. +The important thing about adventures, thought Mr Bunnsy, was that they +shouldn't be so long as to make you miss mealtimes. [The Amazing Maurice and his Educated Rodents, by Terry Pratchett] %e passage @@ -707,7 +869,8 @@ When Mister Safety Catch Is Not On, Mister Crossbow Is Not Your Friend. # %title The Wee Free Men (1) %passage 1 -"Nac Mac Feegle! The Wee Free Men! Nae king! Nae quin! Nae laird! We willna be fooled again!" +"Nac Mac Feegle! The Wee Free Men! Nae king! Nae quin! Nae laird! We willna +be fooled again!" [The Wee Free Men, by Terry Pratchett] %e passage @@ -723,7 +886,8 @@ you don't know how to use it?' 'Not me, sir. Other people. They see the sword and don't attack me,' said Maladict patiently. -'Yes, but if they did, lad, you wouldn't be any good with it,' said the sergeant. +'Yes, but if they did, lad, you wouldn't be any good with it,' said the +sergeant. 'No, sir. I'd probably settle for just ripping their heads off, sir. That's what I mean by protection, sir. Theirs, not mine. @@ -767,12 +931,72 @@ be in the right hands. # # # -%title Thud! (1) +%title Thud! (2) %passage 1 Why bother with a cunning plan when a simple one will do? [Thud!, by Terry Pratchett] %e passage +%passage 2 +#submitted by Boudewijn +He wanted to sleep. He'd never felt this tired before. +Vimes slumped to his knees, and then fell sideways on to the sand. +When he forced open his eyes he saw pale stars above him, and had once +again the sensation that there was someone else present. +He turned his head, wincing at the stab of pain, and saw a small but +brightly lit folding chair on the sand. A robed figure was reclining +in it, reading a book. A scythe was stuck in the sand beside it. +A white skeletal hand turned a page. +'You'll be Death, then?' said Vimes, after a while. + +AH. MISTER VIMES, ASTUTE AS EVER. GOT IT IN ONE, said Death, shutting +the book on his finger to keep the place. + +'I've seen you before.' + +I HAVE WALKED WITH YOU MANY TIMES, MISTER VIMES. + +'And this is /it/, is it?' + +HAS IT NEVER STRUCK YOU THAT THE CONCEPT OF A WRITTEN NARRATIVE IS +SOMEWHAT STRANGE? said Death. + +Vimes could tell when people were trying to avoid something they really +didn't want to say, and it was happening here. +'Is it?' he insisted. 'Is this it? This time I die?' + +COULD BE. + +'Could be? What sort of answer is that?' said Vimes. + +A VERY ACCURATE ONE. YOU SEE, YOU ARE HAVING A NEAR DEATH EXPERIENCE, +WHICH INESCAPABLY MEANS THAT I MUST UNDERGO A NEAR VIMES EXPERIENCE. +DON'T MIND ME. CARRY ON WHATEVER YOU WERE DOING. I HAVE A BOOK. + +Vimes rolled over on to his stomach, gritted his teeth and pushed +himself on to his hands and knees again. He managed a few yards before +slumping back down. He heard the sound of a chair being moved. +'Shouldn't you be somewhere else?' he said. + +I AM, said Death, sitting down again. + +'But you're here!' + +AS WELL. Death turned a page and, for a person without breath, managed +a pretty good sigh. IT APPEARS THAT THE BUTLER DID IT. + +'Did what?' + +IT IS A MADE-UP STORY. VERY STRANGE. ALL ONE NEEDS TO DO IS TURN TO THE +LAST PAGE AND THE ANSWER IS THERE. WHAT, THEREFORE, IS THE POINT OF +DELIBERATEDLY NOT KNOWING? + +It sounded like gibberish to Vimes, so he ignored it. Some of the aches +had gone, although his head still hammered. There was an empty feeling, +everywhere. He just wanted to sleep. + + [Thud!, by Terry Pratchett] +%e passage %e title # # @@ -787,7 +1011,8 @@ Is that an igneous rock, such as granite, or is it sandstone? [Wintersmith, by Terry Pratchett] %e passage %passage 2 -They say that there can never be two snowflakes that are exactly alike, but has anyone checked lately? +They say that there can never be two snowflakes that are exactly alike, but +has anyone checked lately? [Wintersmith, by Terry Pratchett] %e passage @@ -798,24 +1023,36 @@ They say that there can never be two snowflakes that are exactly alike, but has %title Making Money (3) %passage 1 Making Money, by Terry Pratchett - 'I'm an Igor, thur. We don't athk quethtionth.' - 'Really? Why not?' - 'I don't know, thur. I didn't athk.' +'I'm an Igor, thur. We don't athk quethtionth.' +'Really? Why not?' +'I don't know, thur. I didn't athk.' - [Making Money, by Terry Pratchett] + [Making Money, by Terry Pratchett] %e pasasge %passage 2 - The Watch armour fitted like a glove. He'd have preferred it to fit like a helmet and breastplate. It was common knowledge that the Watch's approach to uniforms was one-size-doesn't-exactly-fit-anybody, and that Commander Vimes disapproved of armour that didn't have that kicked-by-trolls look. He liked it to make it clear that it had been doing its job. + The Watch armour fitted like a glove. He'd have preferred it to fit like a + helmet and breastplate. It was common knowledge that the Watch's approach + to uniforms was one-size-doesn't-exactly-fit-anybody, and that Commander + Vimes disapproved of armour that didn't have that kicked-by-trolls look. - [Making Money, by Terry Pratchett] + He liked it to make it clear that it had been doing its job. + + [Making Money, by Terry Pratchett] %e passage %passage 3 - 'The world is full of things worth more than gold. But we dig the damn stuff up and then bury it in a different hole. Where's the sense in that? What are we, magpies? Good heavens, /potatoes/ are worth more than gold!' - 'Surely not!' - 'If you were shipwrecked on a desert island, what would you prefer, a bag of potatoes or a bag of gold?' - 'Yes, but a desert island isn't Ankh-Morpork!' - 'And that proves gold is only valuable because we agree it is, right? It's just a dream. But a potato is always worth a potato, anywhere. A knob of butter and a pinch of salt and you've got a meal, /anywhere/. Bury gold in the ground and you'll be worrying about thieves for ever. Bury a potato and in due season you could be looking at a dividend of a thousand per cent.' - [Making Money, by Terry Pratchett] + 'The world is full of things worth more than gold. But we dig the damn + stuff up and then bury it in a different hole. Where's the sense in that? + What are we, magpies? Good heavens, /potatoes/ are worth more than gold!' + 'Surely not!' 'If you were shipwrecked on a desert island, what would you + prefer, a bag of potatoes or a bag of gold?' 'Yes, but a desert island + isn't Ankh-Morpork!' 'And that proves gold is only valuable because we + agree it is, right? It's just a dream. But a potato is always worth a + potato, anywhere. A knob of butter and a pinch of salt and you've got a + meal, /anywhere/. Bury gold in the ground and you'll be worrying about + thieves for ever. Bury a potato and in due season you could be looking at + a dividend of a thousand per cent.' + + [Making Money, by Terry Pratchett] %e passage %e title # @@ -859,7 +1096,8 @@ to be a past worth having. # %title Snuff (2) %passage 1 -They were crude weapons, to be sure, but a flint axe hitting your head does not need a degree in physics. +They were crude weapons, to be sure, but a flint axe hitting your head does +not need a degree in physics. [Snuff, by Terry Pratchett] %e passage @@ -907,4 +1145,3 @@ I AM DEATH, NOT TAXES. *I* TURN UP ONLY ONCE. %e passage %e title %e section - diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 4ac9fdb70..70b90917e 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -3215,33 +3215,26 @@ look like this: \begin{verbatim} MSGTYPE=type "pattern" \end{verbatim} - \blist{} %.lp \item[\ib{type}] -how the message should be shown; -%.lp -\item[\ib{pattern}] -the pattern to match. -\elist - -%.lp "" -The pattern should be a regular expression. - -%.lp "" -Allowed types are: - +how the message should be shown: %.sd %.si +\\ {\tt show} --- show message normally.\\ {\tt hide} --- never show the message.\\ {\tt stop} --- wait for user with more-prompt.\\ {\tt norep} --- show the message once, but not again if no other message is shown in between. %.ei %.ed +%.lp +\item[\ib{pattern}] +the pattern to match. The pattern should be a regular expression. +\elist %.lp "" -Here's an example of menu colors using NetHack's internal +Here's an example of message types using NetHack's internal pattern matching facility: \begin{verbatim} @@ -3251,7 +3244,7 @@ pattern matching facility: specifies that whenever a message ``You feel hungry'' is shown, the user is prompted with more-prompt, and a message matching -``You displaced '' is not shown at all. +``You displaced \verb+<+something\verb+>+'' is not shown at all. %.lp The order of the defined MSGTYPE-lines is important; the last matching @@ -4214,3 +4207,5 @@ Izchak Miller & Mike Passaretti & Yitzhak Sapir %\end{flushleft} \end{document} + + diff --git a/src/files.c b/src/files.c index ed361c159..58310f81f 100644 --- a/src/files.c +++ b/src/files.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 files.c $NHDT-Date: 1433978592 2015/06/10 23:23:12 $ $NHDT-Branch: master $:$NHDT-Revision: 1.175 $ */ +/* NetHack 3.6 files.c $NHDT-Date: 1434249087 2015/06/14 02:31:27 $ $NHDT-Branch: master $:$NHDT-Revision: 1.179 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ diff --git a/src/makemon.c b/src/makemon.c index 5aea3392d..84407b9f2 100644 --- a/src/makemon.c +++ b/src/makemon.c @@ -1135,9 +1135,10 @@ register int mmflags; if ((mcham = pm_to_cham(mndx)) != NON_PM) { /* this is a shapechanger after all */ if (Protection_from_shape_changers - || mtmp->cham == PM_VLAD_THE_IMPALER) { + || mndx == PM_VLAD_THE_IMPALER) { ; /* stuck in its natural form (NON_PM) */ } else { + mtmp->cham = mcham; /* Note: shapechanger's initial form used to be chosen here with rndmonst(), yielding a monster which was approriate to the level's difficulty diff --git a/src/version.c b/src/version.c index 3e3eb1750..0d0cc7c6b 100644 --- a/src/version.c +++ b/src/version.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 version.c $NHDT-Date: 1434025553 2015/06/11 12:25:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.31 $ */ +/* NetHack 3.6 version.c $NHDT-Date: 1434151385 2015/06/12 23:23:05 $ $NHDT-Branch: master $:$NHDT-Revision: 1.32 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -17,6 +17,8 @@ #define BETA_INFO "Beta2" +STATIC_DCL void FDECL(insert_rtoptions, (winid,char *)); + /* fill buffer with short version (so caller can avoid including date.h) */ char * version_string(buf) @@ -55,8 +57,9 @@ int doextversion() { dlb *f; - char *cr, buf[BUFSZ]; + char *cr, *pd, buf[BUFSZ]; winid win = create_nhwindow(NHW_TEXT); + boolean rtadded = FALSE; /* instead of using ``display_file(OPTIONS_USED,TRUE)'' we handle the file manually so we can include dynamic version info */ @@ -108,7 +111,17 @@ doextversion() if (prolog || !*buf) continue; - putstr(win, 0, buf); + if (!rtadded) { + pd = eos(buf); + pd--; + if (*pd == '.' && strlen(buf) > 1) { + insert_rtoptions(win, buf); + rtadded = TRUE; /* only do it once */ + *buf = 0; + } + } + if (*buf) + putstr(win, 0, buf); } (void) dlb_fclose(f); display_nhwindow(win, FALSE); @@ -117,6 +130,58 @@ doextversion() return 0; } +extern char regex_id[]; + +static char *rt_opts[] = { + "pattern matching via", regex_id, +}; +static const char indent[] = " "; + +/* + * 3.6.0 + * Some optional stuff is no longer available to makedefs because + * it depends which of several object files got linked into the + * game image, so we insert those options here. + */ +STATIC_OVL void +insert_rtoptions(win, buf) +winid win; +char *buf; +{ + char rtbuf[BUFSZ]; + char *pd; + int l, i = 0, j = 0; + + if (strlen(buf) >= BUFSZ - 3) + return; + + strcpy(rtbuf, buf); + pd = eos(rtbuf); + pd--; + if (*pd == '.') + *pd = 0; + Strcat(rtbuf, ", "); + l = strlen(rtbuf); + + for (i = 0; i < SIZE(rt_opts); i++) { + if (l + strlen(rt_opts[i]) > COLNO - 5) { + putstr(win, 0, rtbuf); + if (strlen(rt_opts[i]) < BUFSZ - (1 + strlen(indent))) { + Strcpy(rtbuf, indent); + } + } + Strcat(rtbuf, rt_opts[i]); + l = strlen(rtbuf); + if (i % 2) + Strcat(rtbuf, (i < SIZE(rt_opts)- 1) ? "," : "."), l++; + else + Strcat(rtbuf, " "), l++; + } + + if (l) + putstr(win, 0, rtbuf); +} + #ifdef MICRO boolean comp_times(filetime) diff --git a/sys/share/cppregex.cpp b/sys/share/cppregex.cpp index 08f928513..b2f122735 100644 --- a/sys/share/cppregex.cpp +++ b/sys/share/cppregex.cpp @@ -10,6 +10,8 @@ extern "C" { #include + char regex_id[] = "cppregex"; + struct nhregex { std::unique_ptr re; std::unique_ptr err; diff --git a/sys/share/pmatchregex.c b/sys/share/pmatchregex.c index e7fd1a504..10ee64b23 100644 --- a/sys/share/pmatchregex.c +++ b/sys/share/pmatchregex.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 posixregex.c $NHDT-Date: 1432472490 2015/05/24 13:01:30 $ $NHDT-Branch: master $:$NHDT-Revision: 1.0 $ */ +/* NetHack 3.6 posixregex.c $NHDT-Date: 1434151360 2015/06/12 23:22:40 $ $NHDT-Branch: master $:$NHDT-Revision: 1.0 $ */ /* Copyright (c) Sean Hunt 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -16,6 +16,8 @@ * NOTE: This file is untested. */ +char regex_id[] = "pmatchregex"; + struct nhregex { const char *pat; }; diff --git a/sys/share/posixregex.c b/sys/share/posixregex.c index c4deab208..60293c76f 100644 --- a/sys/share/posixregex.c +++ b/sys/share/posixregex.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 posixregex.c $NHDT-Date: 1431192778 2015/05/09 17:32:58 $ $NHDT-Branch: master $:$NHDT-Revision: 1.2 $ */ +/* NetHack 3.6 posixregex.c $NHDT-Date: 1434151361 2015/06/12 23:22:41 $ $NHDT-Branch: master $:$NHDT-Revision: 1.4 $ */ /* Copyright (c) Sean Hunt 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -44,6 +44,8 @@ * Deallocate a regex object. */ +char regex_id[] = "posixregex"; + struct nhregex { regex_t re; int err; diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 55592b22d..9adeffbeb 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -1,4 +1,4 @@ -# NetHack 3.6 Makefile.msc $NHDT-Date: 1430958115 2015/05/07 00:21:55 $ $NHDT-Branch: master $:$NHDT-Revision: 1.81 $ */ +# NetHack 3.6 Makefile.msc $NHDT-Date: 1434138153 2015/06/12 19:42:33 $ $NHDT-Branch: master $:$NHDT-Revision: 1.93 $ */ # Copyright (c) NetHack PC Development Team 1993-2015 # #============================================================================== @@ -658,7 +658,7 @@ $(GAMEDIR)\NetHack.exe : $(O)gamedir.tag $(O)tile.o $(O)nttty.o $(O)guistub.o \ $(ALLOBJ) $(TTYOBJ) $(GUIOBJ) $(O)console.res $(KEYDLLS) @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) @echo Linking $@ ... - $(link) $(lflagsBuild) $(conlflags) /STACK:2048 /PDB:$(GAMEDIR)\$(@B).PDB /MAP:$(O)$(AB).MAP \ + $(link) $(lflagsBuild) $(conlflags) /STACK:2048 /PDB:$(GAMEDIR)\$(@B).PDB /MAP:$(O)$(@B).MAP \ $(LIBS) $(conlibs) -out:$@ @<<$(@B).lnk $(GAMEOBJ) $(TTYOBJ) @@ -683,7 +683,7 @@ $(GAMEDIR)\NetHackW.exe : $(O)gamedir.tag $(O)tile.o $(O)ttystub.o \ @if not exist $(GAMEDIR)\*.* mkdir $(GAMEDIR) @echo Linking $@ $(link) $(lflagsBuild) $(guilflags) /STACK:2048 /PDB:$(GAMEDIR)\$(@B).PDB \ - /MAP:$(O)$(AB).MAP $(LIBS) $(guilibs) $(COMCTRL) -out:$@ @<<$(@B).lnk + /MAP:$(O)$(@B).MAP $(LIBS) $(guilibs) $(COMCTRL) -out:$@ @<<$(@B).lnk $(GAMEOBJ) $(GUIOBJ) $(O)tile.o @@ -737,7 +737,7 @@ $(GAMEDIR)\nh340key.dll : $(O)$(@B).o $(O)gamedir.tag $(O)$(@B).def /IMPLIB:$(O)$(@B).lib -out:$@ $(O)$(@B).o $(O)nhraykey.def: - @echo LIBRARY $(AB) >$@ + @echo LIBRARY $(@B) >$@ ! IF "$(TARGET_CPU)"=="x64" || "$(PROCESSOR_ARCHITECTURE)"=="x64" ! ELSE @echo EXPORTS >>$@ diff --git a/util/makedefs.c b/util/makedefs.c index 5e62e58ee..354ecd2b5 100644 --- a/util/makedefs.c +++ b/util/makedefs.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 makedefs.c $NHDT-Date: 1432535188 2015/05/25 06:26:28 $ $NHDT-Branch: master $:$NHDT-Revision: 1.102 $ */ +/* NetHack 3.6 makedefs.c $NHDT-Date: 1434151372 2015/06/12 23:22:52 $ $NHDT-Branch: master $:$NHDT-Revision: 1.103 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) M. Stephenson, 1990, 1991. */ /* Copyright (c) Dean Luick, 1990. */ @@ -1352,11 +1352,6 @@ static const char *build_opts[] = { #ifdef NEWS "news file", #endif -#ifdef MENU_COLOR_REGEX - "menu colors via regular expressions", -#else - "menu colors via pmatch", -#endif #ifdef OVERLAY #ifdef MOVERLAY "MOVE overlays",