diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-04 11:35:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-04 11:35:24 +0000 |
| commit | 33cc9b2e7e19d9866827331d17d467b2b882e22f (patch) | |
| tree | 5230f7390f2fb87512b977f026922e3eac52117c | |
| parent | 95e55a6b22e03054efbdf9af7625832883298a2d (diff) | |
| download | crawl-ref-33cc9b2e7e19d9866827331d17d467b2b882e22f.tar.gz crawl-ref-33cc9b2e7e19d9866827331d17d467b2b882e22f.zip | |
* Move all quotes into quotes.txt and a database of their own.
* Adapt Matthew's code to use quotes if there's enough space left.
* Skip the general description of player ghosts that only repeats the
specific description but with less information.
* Don't refer to ghosts as "xyz's ghost the player ghost"
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6766 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/command.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/dat/database/quotes.txt | 692 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/branches.txt | 11 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/features.txt | 45 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/items.txt | 110 | ||||
| -rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 394 | ||||
| -rw-r--r-- | crawl-ref/source/database.cc | 31 | ||||
| -rw-r--r-- | crawl-ref/source/database.h | 5 | ||||
| -rw-r--r-- | crawl-ref/source/delay.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/describe.cc | 99 | ||||
| -rw-r--r-- | crawl-ref/source/describe.h | 3 | ||||
| -rw-r--r-- | crawl-ref/source/directn.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 8 |
14 files changed, 803 insertions, 613 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 796c7182aa..e01ee93724 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -1115,7 +1115,8 @@ static void _recap_feat_keys(std::vector<std::string> &keys) static bool _do_description(std::string key, std::string footer = "") { - std::string desc = getLongDescription(key); + std::string desc = getLongDescription(key); + std::string quote = getQuoteString(key); std::string prefix, suffix; @@ -1189,18 +1190,20 @@ static bool _do_description(std::string key, std::string footer = "") symbol_prefix += symbol; symbol_prefix += "_prefix"; prefix = getLongDescription(symbol_prefix); + quote += getQuoteString(symbol_prefix); std::string symbol_suffix = "__"; symbol_suffix += symbol; symbol_suffix += "_suffix"; suffix += getLongDescription(symbol_suffix); suffix += getLongDescription(symbol_suffix + "_lookup"); + quote += getQuoteString(symbol_suffix); } } key = uppercase_first(key); linebreak_string2(footer, width - 1); - print_description(desc, key, suffix, prefix, footer); + print_description(desc, key, suffix, prefix, footer, quote); return (true); } diff --git a/crawl-ref/source/dat/database/quotes.txt b/crawl-ref/source/dat/database/quotes.txt new file mode 100644 index 0000000000..32f481db64 --- /dev/null +++ b/crawl-ref/source/dat/database/quotes.txt @@ -0,0 +1,692 @@ +%%%% +#################################################### +# Branches +#################################################### +Tomb + +"In the depths of every heart, there is a tomb and a dungeon, though +the lights, the music, and revelry above may cause us to forget their +existence, and the buried ones, or prisoners whom they hide. But +sometimes, and oftenest at midnight, those dark receptacles are flung +wide open. In an hour like this, when the mind has a passive +sensibility, but no active strength; when the imagination is a mirror, +imparting vividness to all ideas, without the power of selecting or +controlling them; then pray that your grieves may slumber, and the +brotherhood of remorse not break their chain." + -Nathaniel Hawthorne +%%%% +#################################################### +# Features +#################################################### +A gateway to Hell + +"Lasciate ogne speranza, voi ch'intrate." + -Dante Alighieri, _Divina Commedia_, "L'Inferno", Canto III. Circa 1315. +%%%% +A granite statue + +"I met a traveller from an antique land + Who said: Two vast and trunkless legs of stone + Stand in the desert. Near them on the sand, + Half sunk, a shatter'd visage lies, whose frown + And wrinkled lip and sneer of cold command + Tell that its sculptor well those passions read + Which yet survive, stamp'd on these lifeless things, + The hand that mock'd them and the heart that fed. + And on the pedestal these words appear: + 'My name is Ozymandias, king of kings: + Look on my works, ye Mighty, and despair!' + Nothing beside remains: round the decay + Of that colossal wreck, boundless and bare, + The lone and level sands stretch far away." + -Percy Bysshe Shelley, "Ozymandias". 1818. +%%%% +A labyrinth entrance + +"Maze-treaders, whose vision ahead and behind is severely constricted and fragmented, suffer confusion, whereas maze-viewers who see the pattern whole, from above or in a diagram, are dazzled by its complex artistry. What you see depends on where you stand, and thus, at one and the same time, labyrinths are single (there is one physical structure) and double: they simultaneously incorporate order and disorder, clarity and confusion, unity and multiplicity, artistry and chaos." + -Mark Z. Danielewski, "House of Leaves". 2000. +%%%% +A one-way gate to the infinite horrors of the Abyss + +"And if you gaze for long into an abyss, + the abyss gazes also into you." + -Friedrich Nietzsche, "Beyond Good and Evil" +%%%% +A rock wall + +"I know not whether Laws be right, + Or whether Laws be wrong; + All that we know who lie in gaol + Is that the wall is strong; + And that each day is like a year, + A year whose days are long." + -Oscar Wilde, "Ballad of Reading Gaol" +%%%% +A staircase to the Tomb + +"In the depths of every heart, there is a tomb and a dungeon, though +the lights, the music, and revelry above may cause us to forget their +existence, and the buried ones, or prisoners whom they hide. But +sometimes, and oftenest at midnight, those dark receptacles are flung +wide open. In an hour like this, when the mind has a passive +sensibility, but no active strength; when the imagination is a mirror, +imparting vividness to all ideas, without the power of selecting or +controlling them; then pray that your grieves may slumber, and the +brotherhood of remorse not break their chain." + -Nathaniel Hawthorne +%%%% +#################################################### +# Items +#################################################### +cloak + +"O Bell my wife, why dost thou flyte? + Now is now, and then was then: + Seek now all the world throughout, + Thou kens not clowns from gentlemen: + They are clad in black, green, yellow and blue, + So far above their own degree. + Once in my life I'll take a view; + For I'll have a new cloak about me." + -Anonymous, "The Old Cloak". 16th Century. +%%%% +dagger + +"He drew his dagger, that was sae sharp, + That was sae sharp and meet, + And drave it into the nut-browne bride, + That fell deid at his feit. + + 'Now stay for me, dear Annet,' he sed, + 'Now stay, my dear,' he cry'd; + Then strake the dagger untill his heart, + And fell deid by her side." + -English traditional ballad, "Lord Thomas and Fair Annet", + circa 1650. +%%%% +gold piece + +"Here it was that the ambassadors of the Samnites, finding him +boiling turnips in the chimney corner, offered him a present of +gold; but he sent them away with this saying; that he, who was +content with such a supper, had no need of gold; and that he +thought it more honourable to conquer those who possessed the +gold, than to possess the gold itself." + -Plutarch, "Marcus Cato" +%%%% +long sword + +"Oh I won't get up, I won't get up, + I can't get up for my life + For you have two long beaten swords + And I have but a pocket knife. + + Well it's true I have two beaten swords, + They cost me deep in the purse + But you will have the better of them + And I will have the worst." + -English traditional ballad, "Mattie Groves". Circa 1600. +%%%% +lychee + +"The Litchi is the most celebrated native fruit of China. It is +nearly round, about an inch and a half in diameter, the shell is +tough, becoming brittle, of a chocolate brown colour covered all +over with wart-like protuberances. When fresh it is filled with a +white almost transparent, sweet, jelly-like pulp in which lies a +rather large, shining, brown seed; the pulp is of a delicious sub-acid +flavour when fresh. The Chinese dry it when it becomes black like +a prune and thus preserve it for use throughout the year; in this state +it is frequently to be seen in the London fruit shops." + -John Smith, _A Dictionary of Popular Names of the Plants + which Furnish the Natural and Acquired Wants of Man, in + All Matters of Domestic and General Economy: Their History, + Products, & Uses_. 1882. +%%%% +orange + +"Conserve of Orange Peel + +HAVING grated the rinds of some Seville oranges as thin as you can, +weigh them, and to every pound of orange rind add three pounds of loaf sugar. +Pound the orange rind well in a marble mortar, mix the sugar by degrees +with them and beat all well together. Put it into gallipots and tie +it down so as properly to prevent the air getting to it." + -Francis Collingwood, John Woollams, _The Universal + Cook: And City and Country Housekeeper._ 1792. +%%%% +rambutan + +"The rambutan (_nephelium lappaceum_) is a beautiful fruit to which +I have already alluded, as resembling the mammoth arbutus; and you suppose +them at first, when at a little distance from you, a delicious dish of +some tropical strawberry. But you find on inquiring into the 'particulars +within' the outer coat, that there is concealed beneath the red and hairy +covering a semi-transparent pulp of a pleasant acid taste, enveloping a +single oval and oblong seed. I know not but I am peculiar in my memory +of the beautiful fruits of the straits, but none lingers in my recollection +so sweetly in its clustered beauties of the fruit-dish as the bearded +and rosy rambutan." + -Fitch Waterman Taylor, _A Voyage Round the World And Visits + to Various Foreign Countries, in the United States Frigate + Columbia_. 1847. +%%%% +slice of pizza + +"When the moon hits your eye like a big pizza pie, that's amore." + -Jack Brooks, "That's Amore" +%%%% +strawberry + +"A Samurai was out walking when a large tiger began to chase him. The +samurai ran for his life, never seeing the cliff under his feet. As +he fell, he reached out and caught a vine that hung down. He looked +down and saw another tiger circling below; the first tiger waited +above. The vine began to give away. The samurai then saw a single +strawberry growing on the vine. He reached out and ate the strawberry. +How sweet it tasted!" + -Attributed to various Japanese buddhist monks. +%%%% +sultana + +"A Turkish garden was among the curiosities to which the Jew found access +for Bentham. It was a sort of orchard of vines and other trees, without +order or apparent arrangement. From that garden Bentham sent specimens +of the Sultana raisin to England which he believed to have been the first +of that species which had ever reached his country." + -John Bowring, _The Works of Jeremy Bentham_. 1839. +%%%% +#################################################### +# Monsters +#################################################### +__c_suffix + +"When Peleus, some distance away, saw him torn apart by the frightful +wound he shouted: 'Accept this tribute to the dead, at least, Crantor, +dearest of youths, ' and with his powerful arm, he hurled his ash spear, +at full strength, at Demoleon. It ruptured the ribcage, and stuck +quivering in the bone. The centaur pulled out the shaft minus its head +(he tried with difficulty to reach that also) but the head was caught +in his lung. The pain itself strengthened his will: wounded, he reared +up at his enemy and beat the hero down with his hooves. Peleus received +the resounding blows on helmet and shield, and defending his upper arms, +and controlling the weapon he held out, with one blow through the arm +he pierced the bi-formed breast.'" + -Ovid, _Metamorphoses_, XII 330 +%%%% +__r_suffix + +"How now? a rat? Dead, for a ducat, dead!" + -William Shakespeare, Hamlet, Act III, 4 +%%%% +__cap-D_suffix + +"On the other hand, Confucius is made to say to his disciples, 'I know how birds can fly, how fishes can swim, and how animals can run. But the runner may be snared, the swimmer may be hooked, and the flyer may be shot by the arrow. But there is the dragon. I cannot tell how he mounts on the wind through the clouds, and rises to heaven. Today I have seen Lao-tsze, and can only compare him to the dragon.'" + -Life of Confucius + +"This Dragon had Two furious Wings + Each one upon each Shoulder; + With a Sting in his Tail as long as a Flail, + Which made him bolder and bolder. + He had long Claws, and in his Jaws + Four and forty Teeth of Iron; + With a Hide as tough, as any Buff, + Which did him round environ." + + -"An Excellent Ballad of a most dreadful Combat, fought between + Moore of Moore-Hall, and the Dragon of Wantley", retold by + Ambrose Philips, _A Collection of Old Ballads. Corrected from the + Best and Most Ancient Copies Extant. With Introductions Historical, + Critical, Or Humorous_. 1723. +%%%% +__cap-K_suffix + +"The Parts Septentrionall are with these Sp'ryts Much haunted.. +About the places where they dig for Oare. The Greekes and Germans +call them Cobali." + -Heywood, Hierarch. ix. 568, circa 1635 +%%%% +__cap-N_suffix + +"The insensible son of Pandu sank down till he reached the Naga kingdom. +Nagas, furnished with fangs containing virulent venom, bit him by +thousands. The vegetable poison, mingled in the blood of the son of the +Wind god, was neutralised by the snake-poison. The serpents had bitten +all over his frame, except his chest, the skin of which was so tough that +their fangs could not penetrate it. +"On regaining consciousness, the son of Kunti burst his bands and began +to press the snakes down under the ground. A remnant fled for life, and +going to their king Vasuki, represented, 'O king of snakes, a man drowned +under the water, bound in chords of shrubs; probably he had drunk poison. +For when he fell amongst us, he was insensible. But when we began to bite +him, he regained his senses, and bursting his fetters, commenced laying +at us. May it please Your Majesty to enquire who is.'" + -_The Mahabharata, Sambhava Parva, Section CXXVIII +%%%% +__cap-O_suffix + +"The little princess, asleep in her cradle, floated on the water, and at +last she was cast up on the shore of a beautiful country, where, however, +very few people dwelt since the ogre Ravagio and his wife Tourmentine had +gone to live there-for they ate up everybody. Ogres are terrible people. +When once they have tasted raw human flesh they will hardly eat anything +else, and Tourmentine always knew how to make some body come their way, +for she was half a fairy." + -Marie-Catherine Le Jumel de Barneville, Baronne d'Aulnoy, + "'Orangier et l'Abeille". 1697 + +"NO. Layers. Onions have layers. Ogres have layers. Onions have layers. You get it? We both have layers." + -Shrek. 2001. +%%%% +__cap-S_suffix + +"The latter lived in the country, and before his house there was an oak, +in which there was a lair of snakes. His servants killed the snakes, but +Melampus gathered wood and burnt the reptiles, and reared the young ones. +And when the young were full grown, they stood beside him at each of his +shoulders as he slept, and they purged his ears with their tongues. He +started up in a great fright, but understood the voices of the birds flying +overhead, and from what he learned from them he foretold to men what should +come to pass." + -Apollodorus (apocryphal), Library and Epitome, 1.9.11. circa 150 BC. + Sir James George Frazer, translator + +"A snake, with mottles rare, +Surveyed my chamber floor, +In feature as the worm before, +But ringed with power." + -Emily Dickinson, "In Winter In My Room" +%%%% +__cap-T_suffix + +"Buckshank bold and Elfinstone, + And more than I can mention here, + They caused to be built so stout a ship, + And unto Iceland they would steer. + + They launched the ship upon the main, + Which bellowed like a wrathful bear; + Down to the bottom the vessel sank, + A laidly Trold has dragged it there." + -George Borrow, _Lavengro_ +%%%% +%%%% +Antaeus + +"That country was then ruled by Antaeus, son of Poseidon, who used to +kill strangers by forcing them to wrestle. Being forced to wrestle with +him, Hercules hugged him, lifted him aloft, broke and killed him; for +when he touched earth so it was that he waxed stronger, wherefore some +said that he was a son of Earth." + -Apollodorus (apocryphal), _Library and Epitome_, 2.5.11, circa 150 BC. + Sir James George Frazer, translator. +%%%% +Asmodeus + +"For myself, I have other occupations: I make absurd matches; I marry greybeards with minors, masters with servants, girls with small fortunes with tender lovers who have none. It is I who introduced into this world luxury, debauchery, games of chance, and chemistry. I am the author of the first cookery book, the inventor of festivals, of dancing, music, plays, and of the newest fashions; in a word, I am ASMODEUS, surnamed The Devil on Two Sticks." + -Alain René Le Sage, _Asmodeus: Or,The Devil on Two Sticks. 1707. +%%%% +Cacodemon + +"We'll call him Cacodemon, with his black Gib there, his Succuba, his +Devil's Seed, his Spawn of Phlegethon, that o' my Consience was bred +o' the Spume of Cocytus." + -John Fletcher, _The Knight of Malta_. 1647. +%%%% +Dispater + +"Hoc idem magis ostendit antiquius Iovis nomen: nam olim Diovis et Diespiter dictus, id est dies pater; a quo dei dicti qui inde, et dius et divum, unde sub divo, Dius Fidius. Itaque inde eius perforatum tectum, ut ea videatur divum, id est caelum. Quidam negant sub tecto per hunc deierare oportere. Aelius Dium Fidium dicebat Diovis filium, ut Graeci Dioskopon Castorem, et putabat hunc esse Sancum ab Sabina lingua et Herculem a Graeca. Idem hic Dis pater dicitur infimus, qui est coniunctus terrae, ubi omnia ut oriuntur ita aboriuntur; quorum quod finis ortuum, Orcus dictus." + -Marcus Terentius Varro, _De Lingua Latina_, Liber V, circa 40 BC. +%%%% +Edmund + +"When the forces stood in array Edmund proposed to decide their claims +by single combat; but Canute saying that he, a man of small stature, +would have little chance against the tall athletic Edmund, proposed, on +the contrary, for them to divide the realm as their fathers had done." + -Thomas Keightley, _The History of England_. 1839. +%%%% +Geryon + +"Khrysaor, married to Kallirhoe, daughter of glorious Okeanos, was father to +the triple-headed Geryon, but Geryon was killed by the great strength of +Herakles at sea-circled Erytheis beside his own shambling cattle on that day +when Herakles drove those broad-faced cattle toward holy Tiryns, when he +crossed the stream of Okeanos and had killed Orthos and the oxherd Eurytion +out in the gloomy meadow beyond fabulous Okeanos." + -Hesiod, _Theogony_, circa 700 BCE. +%%%% +Killer Klown + +"All the world loves a clown." + -Cole Porter, "Be a Clown". 1948. +%%%% +Murray + +"Look behind you! A three-headed monkey!" + -Guybrush Threepwood, _The Secret of Monkey Island_ +%%%% +Polyphemus + +"...as soon as he had got through with all his work, he clutched up two more of my men, and began eating them for his morning's meal. Presently, with the utmost ease, he rolled the stone away from the door and drove out his sheep, but he at once put it back again--as easily as though he were merely clapping the lid on to a quiver full of arrows." + -Homer, _The Odyssey_, Book IX +%%%% +Psyche + +"Let Psyche's corpse be clad in mourning weed + And set on rock of yonder hill aloft; + Her husband is no wight of human seed, + But serpent dire and fierce, as may be thought, + Who flies with wings above in starry skies, + And doth subdue each thing with fiery flight. + The Gods themselves and powers that seem so wise + With mighty love be subject to his might. + The rivers black and deadly floods of pain + And darkness eke as thrall to him remain." + -Apuleius, _Asinus aureus_, "Cupid and Psyche" + circa 160 AD. William Adlington, Translator, 1566. +%%%% +Sigmund + +"But Sigmund turned him about, and he said: 'What aileth thee, son? + Shall our life-days never be merry, and our labour never be done?' + + But Sinfiotli said: 'I have looked, and lo, there is death in the cup.' + + And the song, and the tinkling of harp-strings to the roof-tree winded up; + And Sigmund was dreamy with wine and the wearing of many a year; + And the noise and the glee of the people as the sound of the wild woods were + And the blossoming boughs of the Branstock were the wild trees waving about; + + So he said: 'Well seen, my fosterling; let the lip then strain it out.'" + -William Morris, _The Story of Sigurd the Volsung and the Fall of the Niblungs. 1891. +%%%% +Tiamat + +"He saith that Tiamat our mother hath conceived a hatred for us, + With all her force she rageth, full of wrath. + All the gods have turned to her, + With those, whom ye created, they go at her side. + They are banded together, and at the side of Tiamat they advance; + They are furious, they devise mischief without resting night and day. + They prepare for battle, fuming and raging; + They have joined their forces and are making war. + Tiamat who formed all things, + Made in addition weapons invincible; she spawned monster-serpents, + Sharp of tooth, and merciless of fang; + With poison, instead of blood, she filled their bodies. + Fierce monster-vipers she clothed with terror, + With splendor she decked them, she made them of lofty stature. + Whoever beheld them, terror overcame him, + Their bodies reared up and none could withstand their attack." + -Enuma Elish, Third Tablet. circa 668 BCE. +%%%% +big fish + +"And what are you, reader, but a Loose-Fish and a Fast-Fish, too?" + -Herman Melville, _Moby Dick_. 1851. +%%%% +boggart + +"He thinks every bush a boggart." + -John Ray, _A Compleat Collection of English Proverbs_. 1768. + +"A BOGGART intruded himself, upon what pretext or by what authority is +unknown, into the house of a quiet, inoffensive, and laborious farmer; and, +when once it had taken possession it disputed the right of domicile with the +legal mortal tenant, in a very unneighbourly and arbitrary manner. In +particular, it seemed to have a great aversion to children. As there is no +point on which a parent feels more acutely than that of the maltreatment of +his offspring, the feelings of the father and more particularly of his good +dame, were daily, ay, and nightly, harrowed up by the malice of this +malignant and invisible boggart." + -C.J.T., _Folk-lore and Legends: English_ 1890. +%%%% +bumblebee + +"How doth the little busy Bee + Improve each shining Hour, + And gather Honey all the day + From every opening Flower!" + -Isaac Watts. 1715. +%%%% +butterfly + +"Happiness is a butterfly, which when pursued, is always just beyond your +grasp, but which, if you will sit down quietly, may alight upon you." + -Nathaniel Hawthorne +%%%% +clay golem + +"Once upon a time a great Cabbalist lived in Prague called the Rabbi Löw. +He made a human figure of clay, and left a small aperture in the lesser +brain in which he laid a parchment with the unutterable name of God +written on it. The clod immediately arose and was a man; he performed +all the duties of a servant for his creator, he fetched water, and hewed +wood. All through the Jews quarter he was known as the Golem of the great +Rabbi Löw. Every Friday evening the Rabbi took the parchment out of his +head, and he was clay until Sunday morning. Once the Rabbi forgot this +duty, all were in the Synagogue, the Sabbath hymn was begun, when all the +women and children in the assembly started and screamed out, 'the Golem! +the Golem is destroying everything!' The Rabbi ordered the precentor to +pause at the end of the prayer: it was yet possible to save all, but later +nought would avail, the whole world would be destroyed. He hastened home, +and saw the Golem already seizing the joists of his house to tear down the +building: he sprang forward, took the parchment out, and dead clay again +lay at his feet." + -Berthold Auerbach, _Spinoza_. 1882. +%%%% +efreet + +"When the hoopoe returned to Solomon (he told him the news), and he responded (to Sheba's people): "Are you giving me money? What GOD has given me is far better than what He has given you. You are the ones to rejoice in such gifts." +(To the hoopoe, he said,) "Go back to them (and let them know that) we will come to them with forces they cannot imagine. We will evict them, humiliated and debased." +He said, "O you elders, which of you can bring me her mansion, before they arrive here as submitters?" +One afrit from the jinns said, "I can bring it to you before you stand up. I am powerful enough to do this." + -The Quran, Sura 27 Al-Naml +%%%% +ettin + +"But he had not been long in his hiding-hole, before the awful Ettin came in; and no sooner was he in, than he was heard crying: +'Snouk but and snouk ben, +I find the smell of an earthly man, +Be he living, or be he dead, +His heart this night shall kitchen my bread.'" + -Joseph Jacobs, _The Red Ettin_ +%%%% +flying skull + +"Alas, poor Yorick! I knew him, Horatio, a fellow of infinite +jest, of most excellent fancy. He hath bore me on his back a +thousand times, and now how abhorr'd in my imagination it is! +My gorge rises at it." + -William Shakespeare, _Hamlet_, V, 1. 1600. +%%%% +ghoul + +"In the desert + I saw a creature, naked, bestial, + Who, squatting upon the ground, + Held his heart in his hands, + And ate of it. + I said, 'Is it good, friend?' + 'It is bitter - bitter', he answered, + 'But I like it + Because it is bitter, + And because it is my heart.'" + -Stephen Crane, _The Black Riders and Other Lines_. 1895. +%%%% +giant frog + +"Hello, my baby + Hello, my honey + Hello, my ragtime gal + + Send me a kiss by wire + Baby, my hearts on fire + + If you refuse me + Honey, you'll lose me + Then you'll be left alone + + Oh baby, telephone + And tell me I'm your own." + -Ida Emerson and Joseph E. Howard, "Hello My Baby!" +%%%% +gnoll + +"Then he descended softly and beckoned to Nuth. But the gnoles had +watched him through knavish holes that they bore in trunks of the +trees, and the unearthly silence gave way, as it were with a grace, +to the rapid screams of Tonker as they picked him up from behind -- screams +that came faster and faster until they were incoherent. And where they took +him it is not good to ask, and what they did with him I shall not say." + -Lord Dunsanay, "How Nuth Would Have Practiced His Art Upon the Gnoles". + 1912. +%%%% +goblin + +"Swish, smack! Whip crack! + Batter and beat! Yammer and bleat! + Work, work! Nor dare to shirk, + While Goblins quaff, and Goblins laugh, + Round and round far underground + Below, my lad!" + -J.R.R. Tolkien, _The Hobbit_ +%%%% +griffon + +"As when a Gryphon through the wilderness, + With winged course, o'er hill and moory dale, + Pursues the Arimaspian who by stealth + Hath from his wakeful custody purloined + His guarded gold." + -Milton, _Paradise Lost_, Book II. 1667. +%%%% +hobgoblin + +"A foolish consistency is the hobgoblin of little minds." + -Ralph Waldo Emerson +%%%% +hog + +"Fern came slowly down the stairs. Her eyes were red from crying. As she approached her chair, the carton wobbled, and there was a scratching noise. Fern looked at her father. Then she lifted the lid of the carton. There, inside, looking up at her, was the newborn pig. It was a white one. The morning light shone through its ears, turning them pink. +"He's yours," said Mr. Arable. "Saved from an untimely death. And may the good Lord forgive me for this foolishness." + -E.B. White, _Charlotte's Web_ +%%%% +hound + +"A traveller, by the faithful hound, +Half-buried in the snow was found, +Still grasping in his hand of ice +That banner with the strange device, +Excelsior!" + -Henry Wadsworth Longfellow, "Excelsior" +%%%% +human + +"Do you know + Do I know + What's this thing called 'man'? + God only knows what a man is! + I only know his price." + -Bertolt Brecht, "The Measures Taken". 1930. +%%%% +imp + +"The Devil, too, sometimes steals human children; it is not infrequent +for him to carry away infants within the first six weeks after birth, +and to substitute in their place imps." + -Martin Luther +%%%% +jelly + +"Beware of the Blob! + It creeps + And leaps + and glides and slides + Across the floor + Right through the door + And all around the wall, + A splotch, a blotch..." + -Burt Bacharach, "Beware of the Blob" +%%%% +manticore + +"Ctesias writeth, that in Aethiopia likewise there is a beast which he calleth Mantichora, having three rankes of teeth, which when they meet togither are let in one within another like the teeth of combes: with the face and eares of a man, with red eyes; of colour sanguine, bodied like a lyon, and having a taile armed with a sting like a scorpion: his voice resembleth the noise of a flute and trumpet sounded together: very swift he is, and mans flesh of all others hee most desireth." + -Pliny the Elder, _Natural History_, Book 8, Chapter XXI +%%%% +mermaid + +"To the Sirens first shalt thou come, who beguile all men whosoever comes to them. Whoso in ignorance draws near to them and hears the Sirens' voice, he nevermore returns, that his wife and little children may stand at his side rejoicing, but the Sirens beguile him with their clear-toned song, as they sit in a meadow, and about them is a great heap of bones of mouldering men, and round the bones the skin is shrivelling." + -Homer, _The Odyssey_, Book XII +%%%% +mummy + +"I see Egypt and the Egyptians -- I see the pyramids and obelisks; + I look on chisel'd histories, songs, philosophies, cut in slabs + of sand-stone, or on granite-blocks; + I see at Memphis mummy-pits, containing mummies, embalm'd, swathed + in linen cloth, lying there many centuries; + I look on the fall'n Theban, the large-ball'd eyes, the side-drooping + neck, the hands folded across the breast." + -Walt Whitman, "Salut au Monde" +%%%% +phantom + +"Who wondrous things concerning our welfare, And straunge phantomes doth lett us ofte foresee." + -Spenser, _The Faerie Queene_ II. xii. 47 +%%%% +player ghost + +"Know thyself." + -Inscription in the pronaos of the Temple of Apollo at Delphi +%%%% +program bug + +"If builders built buildings the way programmers wrote programs, then the first woodpecker that came along would destroy civilization." + -Gerald Weinberg, Weinberg's Second Law +%%%% +rakshasa + +"He is brilliant, yet utterly corrupt. Like rotten mackerel by moonlight, +he both shines and stinks." + -John Randolph +%%%% +shadow + +"Between the idea + And the reality + Between the motion + And the act + Falls the Shadow + For thine is the Kingdom + + Between the conception + And the creation + Between the emotion + And the response + Falls the Shadow + Life is very long" + -T.S. Eliot, "The Hollow Men" +%%%% +small skeleton + +"When you hear sweet syncopation + And the music softly moans + T’ain’t no sin to take off your skin + And dance around in your bones. + + When it gets too hot for comfort + And you can’t get ice cream cones + T’ain’t no sin to take off your skin + And dance around your bones." + -William S. Burroughs and Tom Waits, "T'aint no sin" +%%%% +worm + +"While the angels, all pallid and wan, + Uprising, unveiling, affirm + That the play is the tragedy, "Man," + And its hero, the Conqueror Worm." + -Edgar Allan Poe +%%%% diff --git a/crawl-ref/source/dat/descript/branches.txt b/crawl-ref/source/dat/descript/branches.txt index be82e0f741..24363b73f3 100644 --- a/crawl-ref/source/dat/descript/branches.txt +++ b/crawl-ref/source/dat/descript/branches.txt @@ -76,17 +76,6 @@ Tomb The Tomb of the Ancients, a place of damnation, of horrors animated by the vilest necromancy. - -"In the depths of every heart, there is a tomb and a dungeon, though -the lights, the music, and revelry above may cause us to forget their -existence, and the buried ones, or prisoners whom they hide. But -sometimes, and oftenest at midnight, those dark receptacles are flung -wide open. In an hour like this, when the mind has a passive -sensibility, but no active strength; when the imagination is a mirror, -imparting vividness to all ideas, without the power of selecting or -controlling them; then pray that your grieves may slumber, and the -brotherhood of remorse not break their chain." - -Nathaniel Hawthorne %%%% Hell diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt index 0666d64088..af28b07108 100644 --- a/crawl-ref/source/dat/descript/features.txt +++ b/crawl-ref/source/dat/descript/features.txt @@ -85,9 +85,6 @@ You can feel the heat. Gehenna seems to be made out of nothing but flames, lava and hellfire. %%%% A gateway to Hell - -"Lasciate ogne speranza, voi ch'intrate." - -Dante Alighieri, _Divina Commedia_, "L'Inferno", Canto III. Circa 1315. %%%% A gateway to the Iron City of Dis @@ -106,31 +103,12 @@ A glowing golden altar of the Shining One A glowing white marble altar of Zin %%%% A granite statue - -"I met a traveller from an antique land - Who said: Two vast and trunkless legs of stone - Stand in the desert. Near them on the sand, - Half sunk, a shatter'd visage lies, whose frown - And wrinkled lip and sneer of cold command - Tell that its sculptor well those passions read - Which yet survive, stamp'd on these lifeless things, - The hand that mock'd them and the heart that fed. - And on the pedestal these words appear: - 'My name is Ozymandias, king of kings: - Look on my works, ye Mighty, and despair!' - Nothing beside remains: round the decay - Of that colossal wreck, boundless and bare, - The lone and level sands stretch far away." - -Percy Bysshe Shelley, "Ozymandias". 1818. %%%% A labyrinth entrance A gateway to an intricate maze designed by subtle and malicious minds, its exit guarded by a fearsome monster, where many a hapless adventurer has lost his way and starved to death. - -"Maze-treaders, whose vision ahead and behind is severely constricted and fragmented, suffer confusion, whereas maze-viewers who see the pattern whole, from above or in a diagram, are dazzled by its complex artistry. What you see depends on where you stand, and thus, at one and the same time, labyrinths are single (there is one physical structure) and double: they simultaneously incorporate order and disorder, clarity and confusion, unity and multiplicity, artistry and chaos." - -Mark Z. Danielewski, "House of Leaves". 2000. %%%% A magical trap %%%% @@ -148,20 +126,8 @@ A one-way gate to the infinite horrors of the Abyss A one-way gate to a demon-haunted realm, riven by chaos, its very substance impermanent and whimsical, filled with creatures out of nightmare. - -"And if you gaze for long into an abyss, - the abyss gazes also into you." - -Friedrich Nietzsche, "Beyond Good and Evil" %%%% A rock wall - -"I know not whether Laws be right, - Or whether Laws be wrong; - All that we know who lie in gaol - Is that the wall is strong; - And that each day is like a year, - A year whose days are long." - -Oscar Wilde, "Ballad of Reading Gaol" %%%% A roughly hewn altar of Beogh %%%% @@ -242,17 +208,6 @@ A staircase to the Tomb A way to the Tomb of the Ancients, a place of damnation, of horrors animated by the vilest necromancy. - -"In the depths of every heart, there is a tomb and a dungeon, though -the lights, the music, and revelry above may cause us to forget their -existence, and the buried ones, or prisoners whom they hide. But -sometimes, and oftenest at midnight, those dark receptacles are flung -wide open. In an hour like this, when the mind has a passive -sensibility, but no active strength; when the imagination is a mirror, -imparting vividness to all ideas, without the power of selecting or -controlling them; then pray that your grieves may slumber, and the -brotherhood of remorse not break their chain." - -Nathaniel Hawthorne %%%% A staircase to the Vaults %%%% diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt index 5dc72ead33..eccd268b55 100644 --- a/crawl-ref/source/dat/descript/items.txt +++ b/crawl-ref/source/dat/descript/items.txt @@ -451,23 +451,9 @@ chunk of flesh A piece of meat found in the dungeon. %%%% -cloak noquote - -A cloth cloak. -%%%% cloak A cloth cloak. - -"O Bell my wife, why dost thou flyte? - Now is now, and then was then: - Seek now all the world throughout, - Thou kens not clowns from gentlemen: - They are clad in black, green, yellow and blue, - So far above their own degree. - Once in my life I'll take a view; - For I'll have a new cloak about me." - -Anonymous, "The Old Cloak". 16th Century. %%%% club noquote @@ -514,25 +500,9 @@ crystal plate mail An incredibly heavy but extremely effective suit of crystalline armour. It is somewhat resistant to corrosion. %%%% -dagger noquote - -A long knife or a very short sword, which can be held or thrown. -%%%% dagger A long knife or a very short sword, which can be held or thrown. - -"He drew his dagger, that was sae sharp, - That was sae sharp and meet, - And drave it into the nut-browne bride, - That fell deid at his feit. - - 'Now stay for me, dear Annet,' he sed, - 'Now stay, my dear,' he cry'd; - Then strake the dagger untill his heart, - And fell deid by her side." - -English traditional ballad, "Lord Thomas and Fair Annet", - circa 1650. %%%% dart @@ -673,14 +643,6 @@ wanted to. gold piece A pile of glittering gold coins. - -"Here it was that the ambassadors of the Samnites, finding him -boiling turnips in the chimney corner, offered him a present of -gold; but he sent them away with this saying; that he, who was -content with such a supper, had no need of gold; and that he -thought it more honourable to conquer those who possessed the -gold, than to possess the gold itself." - -Plutarch, "Marcus Cato" %%%% grape @@ -806,24 +768,9 @@ lemon A yellow fruit. %%%% -long sword noquote - -A sword with a long, slashing blade. -%%%% long sword A sword with a long, slashing blade. - -"Oh I won't get up, I won't get up, - I can't get up for my life - For you have two long beaten swords - And I have but a pocket knife. - - Well it's true I have two beaten swords, - They cost me deep in the purse - But you will have the better of them - And I will have the worst." - -English traditional ballad, "Mattie Groves". Circa 1600. %%%% longbow @@ -833,20 +780,6 @@ a skilled archer can use it to great effect. lychee A tropical fruit. - -"The Litchi is the most celebrated native fruit of China. It is -nearly round, about an inch and a half in diameter, the shell is -tough, becoming brittle, of a chocolate brown colour covered all -over with wart-like protuberances. When fresh it is filled with a -white almost transparent, sweet, jelly-like pulp in which lies a -rather large, shining, brown seed; the pulp is of a delicious sub-acid -flavour when fresh. The Chinese dry it when it becomes black like -a prune and thus preserve it for use throughout the year; in this state -it is frequently to be seen in the London fruit shops." - -John Smith, _A Dictionary of Popular Names of the Plants - which Furnish the Natural and Acquired Wants of Man, in - All Matters of Domestic and General Economy: Their History, - Products, & Uses_. 1882. %%%% mace @@ -900,16 +833,6 @@ A needle. It can be fired with a blowgun. orange A delicious, juicy orange fruit. - -"Conserve of Orange Peel - -HAVING grated the rinds of some Seville oranges as thin as you can, -weigh them, and to every pound of orange rind add three pounds of loaf sugar. -Pound the orange rind well in a marble mortar, mix the sugar by degrees -with them and beat all well together. Put it into gallipots and tie -it down so as properly to prevent the air getting to it." - -Francis Collingwood, John Woollams, _The Universal - Cook: And City and Country Housekeeper._ 1792. %%%% orb of zot @@ -1068,20 +991,6 @@ rambutan A small but delicious tropical fruit. How it got into this dungeon is anyone's guess. - -"The rambutan (_nephelium lappaceum_) is a beautiful fruit to which -I have already alluded, as resembling the mammoth arbutus; and you suppose -them at first, when at a little distance from you, a delicious dish of -some tropical strawberry. But you find on inquiring into the 'particulars -within' the outer coat, that there is concealed beneath the red and hairy -covering a semi-transparent pulp of a pleasant acid taste, enveloping a -single oval and oblong seed. I know not but I am peculiar in my memory -of the beautiful fruits of the straits, but none lingers in my recollection -so sweetly in its clustered beauties of the fruit-dish as the bearded -and rosy rambutan." - -Fitch Waterman Taylor, _A Voyage Round the World And Visits - to Various Foreign Countries, in the United States Frigate - Columbia_. 1847. %%%% ring mail @@ -1415,9 +1324,6 @@ slice of pizza A slice of pizza; a flatbread with tomato sauce, mozarella di bufala, and basil. - -"When the moon hits your eye like a big pizza pie, that's amore." - -Jack Brooks, "That's Amore" %%%% sling @@ -1547,26 +1453,10 @@ suppose you could wear it if you really wanted to. strawberry A small but delicious red fruit. - -"A Samurai was out walking when a large tiger began to chase him. The -samurai ran for his life, never seeing the cliff under his feet. As -he fell, he reached out and caught a vine that hung down. He looked -down and saw another tiger circling below; the first tiger waited -above. The vine began to give away. The samurai then saw a single -strawberry growing on the vine. He reached out and ate the strawberry. -How sweet it tasted!" - -Attributed to various Japanese buddhist monks. %%%% sultana A humble raisin. - -"A Turkish garden was among the curiosities to which the Jew found access -for Bentham. It was a sort of orchard of vines and other trees, without -order or apparent arrangement. From that garden Bentham sent specimens -of the Sultana raisin to England which he believed to have been the first -of that species which had ever reached his country." - -John Bowring, _The Works of Jeremy Bentham_. 1839. %%%% swamp dragon armour diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index af678dd74d..94b7601703 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -1,116 +1,6 @@ %%%% -__c_suffix - -$"When Peleus, some distance away, saw him torn apart by the frightful -wound he shouted: 'Accept this tribute to the dead, at least, Crantor, -dearest of youths, ' and with his powerful arm, he hurled his ash spear, -at full strength, at Demoleon. It ruptured the ribcage, and stuck -quivering in the bone. The centaur pulled out the shaft minus its head -(he tried with difficulty to reach that also) but the head was caught -in his lung. The pain itself strengthened his will: wounded, he reared -up at his enemy and beat the hero down with his hooves. Peleus received -the resounding blows on helmet and shield, and defending his upper arms, -and controlling the weapon he held out, with one blow through the arm -he pierced the bi-formed breast.'" - -Ovid, _Metamorphoses_, XII 330 -%%%% -__r_suffix - -$"How now? a rat? Dead, for a ducat, dead!" - -William Shakespeare, Hamlet, Act III, 4 -%%%% -__cap-D_suffix - -$"On the other hand, Confucius is made to say to his disciples, 'I know how birds can fly, how fishes can swim, and how animals can run. But the runner may be snared, the swimmer may be hooked, and the flyer may be shot by the arrow. But there is the dragon. I cannot tell how he mounts on the wind through the clouds, and rises to heaven. Today I have seen Lao-tsze, and can only compare him to the dragon.'" - -Life of Confucius - -"This Dragon had Two furious Wings - Each one upon each Shoulder; - With a Sting in his Tail as long as a Flail, - Which made him bolder and bolder. - He had long Claws, and in his Jaws - Four and forty Teeth of Iron; - With a Hide as tough, as any Buff, - Which did him round environ." - - -"An Excellent Ballad of a most dreadful Combat, fought between - Moore of Moore-Hall, and the Dragon of Wantley", retold by - Ambrose Philips, _A Collection of Old Ballads. Corrected from the - Best and Most Ancient Copies Extant. With Introductions Historical, - Critical, Or Humorous_. 1723. -%%%% -__cap-K_suffix - -$"The Parts Septentrionall are with these Sp'ryts Much haunted.. -About the places where they dig for Oare. The Greekes and Germans -call them Cobali." - -Heywood, Hierarch. ix. 568, circa 1635 -%%%% -__cap-N_suffix - -$"The insensible son of Pandu sank down till he reached the Naga kingdom. -Nagas, furnished with fangs containing virulent venom, bit him by -thousands. The vegetable poison, mingled in the blood of the son of the -Wind god, was neutralised by the snake-poison. The serpents had bitten -all over his frame, except his chest, the skin of which was so tough that -their fangs could not penetrate it. -"On regaining consciousness, the son of Kunti burst his bands and began -to press the snakes down under the ground. A remnant fled for life, and -going to their king Vasuki, represented, 'O king of snakes, a man drowned -under the water, bound in chords of shrubs; probably he had drunk poison. -For when he fell amongst us, he was insensible. But when we began to bite -him, he regained his senses, and bursting his fetters, commenced laying -at us. May it please Your Majesty to enquire who is.'" - -_The Mahabharata, Sambhava Parva, Section CXXVIII -%%%% -__cap-O_suffix - -$"The little princess, asleep in her cradle, floated on the water, and at -last she was cast up on the shore of a beautiful country, where, however, -very few people dwelt since the ogre Ravagio and his wife Tourmentine had -gone to live there-for they ate up everybody. Ogres are terrible people. -When once they have tasted raw human flesh they will hardly eat anything -else, and Tourmentine always knew how to make some body come their way, -for she was half a fairy." - -Marie-Catherine Le Jumel de Barneville, Baronne d'Aulnoy, - "'Orangier et l'Abeille". 1697 - -"NO. Layers. Onions have layers. Ogres have layers. Onions have layers. You get it? We both have layers." - -Shrek. 2001. -%%%% -__cap-S_suffix - -$"The latter lived in the country, and before his house there was an oak, -in which there was a lair of snakes. His servants killed the snakes, but -Melampus gathered wood and burnt the reptiles, and reared the young ones. -And when the young were full grown, they stood beside him at each of his -shoulders as he slept, and they purged his ears with their tongues. He -started up in a great fright, but understood the voices of the birds flying -overhead, and from what he learned from them he foretold to men what should -come to pass." - -Apollodorus (apocryphal), Library and Epitome, 1.9.11. circa 150 BC. - Sir James George Frazer, translator - -"A snake, with mottles rare, -Surveyed my chamber floor, -In feature as the worm before, -But ringed with power." - -Emily Dickinson, "In Winter In My Room" -%%%% __cap-T_suffix -$ -"Buckshank bold and Elfinstone, - And more than I can mention here, - They caused to be built so stout a ship, - And unto Iceland they would steer. - - They launched the ship upon the main, - Which bellowed like a wrathful bear; - Down to the bottom the vessel sank, - A laidly Trold has dragged it there." - -George Borrow, _Lavengro_ - You feel a lump in the pit of your stomach. %%%% __(_suffix_examine @@ -125,21 +15,10 @@ A lanky warrior, she moves at a great pace and carries an exotic weapon. Antaeus A great titan who lives in the depths of Cocytus. - -"That country was then ruled by Antaeus, son of Poseidon, who used to -kill strangers by forcing them to wrestle. Being forced to wrestle with -him, Hercules hugged him, lifted him aloft, broke and killed him; for -when he touched earth so it was that he waxed stronger, wherefore some -said that he was a son of Earth." - -Apollodorus (apocryphal), _Library and Epitome_, 2.5.11, circa 150 BC. - Sir James George Frazer, translator. %%%% Asmodeus One of the arch-demons who dwell in the depths of Hell. - -"For myself, I have other occupations: I make absurd matches; I marry greybeards with minors, masters with servants, girls with small fortunes with tender lovers who have none. It is I who introduced into this world luxury, debauchery, games of chance, and chemistry. I am the author of the first cookery book, the inventor of festivals, of dancing, music, plays, and of the newest fashions; in a word, I am ASMODEUS, surnamed The Devil on Two Sticks." - -Alain René Le Sage, _Asmodeus: Or,The Devil on Two Sticks. 1707. %%%% Balrug @@ -162,11 +41,6 @@ An ancient lich. The air around his shrouded form crackles with evil energy. Cacodemon A hideously ugly demon of rage and legendary power. - -"We'll call him Cacodemon, with his black Gib there, his Succuba, his -Devil's Seed, his Spawn of Phlegethon, that o' my Consience was bred -o' the Spume of Cocytus." - -John Fletcher, _The Knight of Malta_. 1647. %%%% Cerebov @@ -179,9 +53,6 @@ A divine agent of the Shining One, it is a towering winged figure with an aura o Dispater The lord of the Iron City of Dis. - -"Hoc idem magis ostendit antiquius Iovis nomen: nam olim Diovis et Diespiter dictus, id est dies pater; a quo dei dicti qui inde, et dius et divum, unde sub divo, Dius Fidius. Itaque inde eius perforatum tectum, ut ea videatur divum, id est caelum. Quidam negant sub tecto per hunc deierare oportere. Aelius Dium Fidium dicebat Diovis filium, ut Graeci Dioskopon Castorem, et putabat hunc esse Sancum ab Sabina lingua et Herculem a Graeca. Idem hic Dis pater dicitur infimus, qui est coniunctus terrae, ubi omnia ut oriuntur ita aboriuntur; quorum quod finis ortuum, Orcus dictus." - -Marcus Terentius Varro, _De Lingua Latina_, Liber V, circa 40 BC. %%%% Donald @@ -194,12 +65,6 @@ An evil mercenary with unusually large ears. Edmund A lightly armoured warrior. - -"When the forces stood in array Edmund proposed to decide their claims -by single combat; but Canute saying that he, a man of small stature, -would have little chance against the tall athletic Edmund, proposed, on -the contrary, for them to divide the realm as their fathers had done." - -Thomas Keightley, _The History of England_. 1839. %%%% Ereshkigal @@ -232,14 +97,6 @@ A svelte fighter-mage, wearing a gold-rimmed monocle. Geryon A huge, three-headed, winged arch-demon, guardian of the gates of Hell. - -"Khrysaor, married to Kallirhoe, daughter of glorious Okeanos, was father to -the triple-headed Geryon, but Geryon was killed by the great strength of -Herakles at sea-circled Erytheis beside his own shambling cattle on that day -when Herakles drove those broad-faced cattle toward holy Tiryns, when he -crossed the stream of Okeanos and had killed Orthos and the oxherd Eurytion -out in the gloomy meadow beyond fabulous Okeanos." - -Hesiod, _Theogony_, circa 700 BCE. %%%% Gloorx Vloq @@ -288,9 +145,6 @@ A tall bounty hunter. Killer Klown A comical figure full of life and laughter. It looks very happy to see you... but is there a slightly malicious cast to its features? Is that red facepaint or something altogether less pleasant? - -"All the world loves a clown." - -Cole Porter, "Be a Clown". 1948. %%%% Lom Lobon @@ -323,9 +177,6 @@ A weirdly glowing figure, dancing through the twisted air of Pandemonium. Murray A demonic skull rolling along the dungeon floor. - -"Look behind you! A three-headed monkey!" - -Guybrush Threepwood, _The Secret of Monkey Island_ %%%% Norbert @@ -348,27 +199,11 @@ Pit Fiend A huge winged fiend with incredibly tough skin. %%%% Polyphemus - -...as soon as he had got through with all his work, he clutched up two more of my men, and began eating them for his morning's meal. Presently, with the utmost ease, he rolled the stone away from the door and drove out his sheep, but he at once put it back again--as easily as though he were merely clapping the lid on to a quiver full of arrows. - -Homer, _The Odyssey_, Book IX %%%% Psyche A fair-haired mage, wandering and seemingly half-mad with grief and guilt. - -"Let Psyche's corpse be clad in mourning weed - And set on rock of yonder hill aloft; - Her husband is no wight of human seed, - But serpent dire and fierce, as may be thought, - Who flies with wings above in starry skies, - And doth subdue each thing with fiery flight. - The Gods themselves and powers that seem so wise - With mighty love be subject to his might. - The rivers black and deadly floods of pain - And darkness eke as thrall to him remain." - -Apuleius, _Asinus aureus_, "Cupid and Psyche" - circa 160 AD. William Adlington, Translator, 1566. %%%% Rupert @@ -384,9 +219,6 @@ One of the most terrible denizens of the many Hells, this horrible being appears %%%% Sigmund -An evil and spry old man, whose eyes twinkle with sadness, and also with madness. Sigmund -wields a nasty-looking scythe. - "But Sigmund turned him about, and he said: 'What aileth thee, son? Shall our life-days never be merry, and our labour never be done?' @@ -411,24 +243,6 @@ An evil human fighter. Tiamat A powerful dragon with mighty wings. Her scales seem to shimmer and change colour as you watch. - -"He saith that Tiamat our mother hath conceived a hatred for us, - With all her force she rageth, full of wrath. - All the gods have turned to her, - With those, whom ye created, they go at her side. - They are banded together, and at the side of Tiamat they advance; - They are furious, they devise mischief without resting night and day. - They prepare for battle, fuming and raging; - They have joined their forces and are making war. - Tiamat who formed all things, - Made in addition weapons invincible; she spawned monster-serpents, - Sharp of tooth, and merciless of fang; - With poison, instead of blood, she filled their bodies. - Fierce monster-vipers she clothed with terror, - With splendor she decked them, she made them of lofty stature. - Whoever beheld them, terror overcame him, - Their bodies reared up and none could withstand their attack." - -Enuma Elish, Third Tablet. circa 668 BCE. %%%% Urug @@ -485,9 +299,6 @@ A weird and hideous cross between beast and human. big fish A fish of unusual size. - -"And what are you, reader, but a Loose-Fish and a Fast-Fish, too?" - -Herman Melville, _Moby Dick_. 1851. %%%% big kobold @@ -516,20 +327,6 @@ A strange and nasty blue thing. It looks cold. boggart A twisted little sprite-goblin. Beware of its magical tricks! - -"He thinks every bush a boggart." - -John Ray, _A Compleat Collection of English Proverbs_. 1768. - -"A BOGGART intruded himself, upon what pretext or by what authority is -unknown, into the house of a quiet, inoffensive, and laborious farmer; and, -when once it had taken possession it disputed the right of domicile with the -legal mortal tenant, in a very unneighbourly and arbitrary manner. In -particular, it seemed to have a great aversion to children. As there is no -point on which a parent feels more acutely than that of the maltreatment of -his offspring, the feelings of the father and more particularly of his good -dame, were daily, ay, and nightly, harrowed up by the malice of this -malignant and invisible boggart." - -C.J.T., _Folk-lore and Legends: English_ 1890. %%%% boring beetle @@ -554,21 +351,11 @@ A large brown snake. bumblebee A very large and fat hairy bee. - -"How doth the little busy Bee - Improve each shining Hour, - And gather Honey all the day - From every opening Flower!" - -Isaac Watts. 1715. %%%% butterfly A large multicoloured butterfly with beautifully patterned wings, fluttering incongruously through the darkness of the cave. - -"Happiness is a butterfly, which when pursued, is always just beyond your -grasp, but which, if you will sit down quietly, may alight upon you." - -Nathaniel Hawthorne %%%% centaur @@ -581,24 +368,6 @@ A hybrid with the torso of a human atop the body of a large horse. It looks str clay golem A huge animated clay statue. - -"Once upon a time a great Cabbalist lived in Prague called the Rabbi Löw. -He made a human figure of clay, and left a small aperture in the lesser -brain in which he laid a parchment with the unutterable name of God -written on it. The clod immediately arose and was a man; he performed -all the duties of a servant for his creator, he fetched water, and hewed -wood. All through the Jews quarter he was known as the Golem of the great -Rabbi Löw. Every Friday evening the Rabbi took the parchment out of his -head, and he was clay until Sunday morning. Once the Rabbi forgot this -duty, all were in the Synagogue, the Sabbath hymn was begun, when all the -women and children in the assembly started and screamed out, 'the Golem! -the Golem is destroying everything!' The Rabbi ordered the precentor to -pause at the end of the prayer: it was yet possible to save all, but later -nought would avail, the whole world would be destroyed. He hastened home, -and saw the Golem already seizing the joists of his house to tear down the -building: he sprang forward, took the parchment out, and dead clay again -lay at his feet." - -Berthold Auerbach, _Spinoza_. 1882. %%%% crystal golem @@ -755,12 +524,6 @@ A spirit drawn from the elemental plane of earth, which exists in this world by efreet A huge and muscular figure engulfed in a cloud of searing flame. - -"When the hoopoe returned to Solomon (he told him the news), and he responded (to Sheba's people): "Are you giving me money? What GOD has given me is far better than what He has given you. You are the ones to rejoice in such gifts." -(To the hoopoe, he said,) "Go back to them (and let them know that) we will come to them with forces they cannot imagine. We will evict them, humiliated and debased." -He said, "O you elders, which of you can bring me her mansion, before they arrive here as submitters?" -One afrit from the jinns said, "I can bring it to you before you stand up. I am powerful enough to do this." - -The Quran, Sura 27 Al-Naml %%%% electric golem @@ -780,8 +543,6 @@ One of the race of elves which inhabits this dreary cave. %%%% ettin -A large, two-headed humanoid. Most often seen wielding two weapons, so that the heads will have one less thing to bicker about. - "But he had not been long in his hiding-hole, before the awful Ettin came in; and no sooner was he in, than he was heard crying: 'Snouk but and snouk ben, I find the smell of an earthly man, @@ -824,12 +585,6 @@ A hideous undead creature, with torn skin hanging from an emaciated body. flying skull Unholy magic keeps this disembodied undead skull hovering above the floor. It has a nasty set of teeth. - -"Alas, poor Yorick! I knew him, Horatio, a fellow of infinite -jest, of most excellent fancy. He hath bore me on his back a -thousand times, and now how abhorr'd in my imagination it is! -My gorge rises at it." - -William Shakespeare, _Hamlet_, V, 1. 1600. %%%% freezing wraith @@ -850,18 +605,6 @@ A hideous stone statue come to life. ghoul An undead humanoid creature created from a decaying corpse by some unholy means of necromancy. It exists to spread disease and decay, and gains power from decaying corpses in the same way a necrophage does. - -"In the desert - I saw a creature, naked, bestial, - Who, squatting upon the ground, - Held his heart in his hands, - And ate of it. - I said, 'Is it good, friend?' - 'It is bitter - bitter', he answered, - 'But I like it - Because it is bitter, - And because it is my heart.'" - -Stephen Crane, _The Black Riders and Other Lines_. 1895. %%%% giant amoeba @@ -902,21 +645,6 @@ A giant eyeball, with a captivating stare. giant frog It probably didn't get this big by eating little insects. - -"Hello, my baby - Hello, my honey - Hello, my ragtime gal - - Send me a kiss by wire - Baby, my hearts on fire - - If you refuse me - Honey, you'll lose me - Then you'll be left alone - - Oh baby, telephone - And tell me I'm your own." - -Ida Emerson and Joseph E. Howard, "Hello My Baby!" %%%% giant gecko @@ -973,27 +701,10 @@ A shapeshifter which has lost control over its transformations, and is constantl gnoll A taller and better-equipped relative of goblins and orcs, somewhat doglike in appearance. - -"Then he descended softly and beckoned to Nuth. But the gnoles had -watched him through knavish holes that they bore in trunks of the -trees, and the unearthly silence gave way, as it were with a grace, -to the rapid screams of Tonker as they picked him up from behind -- screams -that came faster and faster until they were incoherent. And where they took -him it is not good to ask, and what they did with him I shall not say." - -Lord Dunsanay, "How Nuth Would Have Practiced His Art Upon the Gnoles". - 1912. %%%% goblin A short, ugly and unfriendly humanoid: squat, broad, flat-nosed, sallow-skinned, with a wide mouth and pistachio-shaped eyes. - -"Swish, smack! Whip crack! - Batter and beat! Yammer and bleat! - Work, work! Nor dare to shirk, - While Goblins quaff, and Goblins laugh, - Round and round far underground - Below, my lad!" - -J.R.R. Tolkien, _The Hobbit_ %%%% golden dragon @@ -1026,13 +737,6 @@ A very large grey python. griffon A large creature with the hindquarters of a lion and the wings, head, and talons of a great eagle. - -"As when a Gryphon through the wilderness, - With winged course, o'er hill and moory dale, - Pursues the Arimaspian who by stealth - Hath from his wakeful custody purloined - His guarded gold." - -Milton, _Paradise Lost_, Book II. 1667. %%%% grizzly bear @@ -1078,28 +782,14 @@ A large creature with the hindquarters of a horse and the wings, head, and talon hobgoblin A larger and stronger relative of the goblin. - -"A foolish consistency is the hobgoblin of little minds." - -Ralph Waldo Emerson %%%% hog A large, fat and very ugly pig. - -"Fern came slowly down the stairs. Her eyes were red from crying. As she approached her chair, the carton wobbled, and there was a scratching noise. Fern looked at her father. Then she lifted the lid of the carton. There, inside, looking up at her, was the newborn pig. It was a white one. The morning light shone through its ears, turning them pink. -"He's yours," said Mr. Arable. "Saved from an untimely death. And may the good Lord forgive me for this foolishness." - -E.B. White, _Charlotte's Web_ %%%% hound A fearsome hunting dog, lithe and alert. Its master must be long gone, for it looks dishevelled, and has a lean and hungry look. - -"A traveller, by the faithful hound, -Half-buried in the snow was found, -Still grasping in his hand of ice -That banner with the strange device, -Excelsior!" - -Henry Wadsworth Longfellow, "Excelsior" %%%% huge abomination @@ -1108,13 +798,6 @@ A huge and hideous form, created or summoned by some arcane process. human A remarkably nondescript person. How odd. - -"Do you know - Do I know - What's this thing called 'man'? - God only knows what a man is! - I only know his price." - -Bertolt Brecht, "The Measures Taken". 1930. %%%% hungry ghost @@ -1148,11 +831,6 @@ imp A small, ugly minor demon. Its fanged maw seems locked in a permanent malign grin, and its horns protrude obscenely from its scaly pate. - -"The Devil, too, sometimes steals human children; it is not infrequent -for him to carry away infants within the first six weeks after birth, -and to substitute in their place imps." - -Martin Luther %%%% insubstantial wisp @@ -1184,16 +862,6 @@ jelly A pulsating mass of acidic protoplasm. It can and will eat almost anything, and grows a little each time... - -"Beware of the Blob! - It creeps - And leaps - and glides and slides - Across the floor - Right through the door - And all around the wall, - A splotch, a blotch..." - -Burt Bacharach, "Beware of the Blob" %%%% jellyfish @@ -1267,9 +935,6 @@ An ugly, twisted little minor demon. manticore A hideous cross-breed, bearing the features of a human and a lion, with great bat-like wings. Its tail bristles with spikes that can be loosed at potential prey. - -"Ctesias writeth, that in Aethiopia likewise there is a beast which he calleth Mantichora, having three rankes of teeth, which when they meet togither are let in one within another like the teeth of combes: with the face and eares of a man, with red eyes; of colour sanguine, bodied like a lyon, and having a taile armed with a sting like a scorpion: his voice resembleth the noise of a flute and trumpet sounded together: very swift he is, and mans flesh of all others hee most desireth." - -Pliny the Elder, _Natural History_, Book 8, Chapter XXI %%%% merfolk @@ -1277,10 +942,7 @@ Half fish, half man, the merfolk are citizens of both water and land, and they'l %%%% mermaid -A young woman with a fish tail in place of legs. Mermaids love to sing and charm their audience. - -"To the Sirens first shalt thou come, who beguile all men whosoever comes to them. Whoso in ignorance draws near to them and hears the Sirens' voice, he nevermore returns, that his wife and little children may stand at his side rejoicing, but the Sirens beguile him with their clear-toned song, as they sit in a meadow, and about them is a great heap of bones of mouldering men, and round the bones the skin is shrivelling." - -Homer, _The Odyssey_, Book XII +A young woman with a fish tail in place of legs. Mermaids love to sing and charm their audience. %%%% metal gargoyle @@ -1317,15 +979,6 @@ A small dragon with strangely mottled scales. mummy An undead figure covered in bandages and embalming fluids, compelled to walk by an ancient curse. It radiates a malign aura to those who intrude on its domain. - -"I see Egypt and the Egyptians -- I see the pyramids and obelisks; - I look on chisel'd histories, songs, philosophies, cut in slabs - of sand-stone, or on granite-blocks; - I see at Memphis mummy-pits, containing mummies, embalm'd, swathed - in linen cloth, lying there many centuries; - I look on the fall'n Theban, the large-ball'd eyes, the side-drooping - neck, the hands folded across the breast." - -Walt Whitman, "Salut au Monde" %%%% mummy priest @@ -1433,9 +1086,6 @@ Before you stands a draconian. phantom A transparent man-like undead spirit. - -"Who wondrous things concerning our welfare, And straunge phantomes doth lett us ofte foresee." - -Spenser, _The Faerie Queene_ II. xii. 47 %%%% pile of gold coins @@ -1448,9 +1098,6 @@ Few plants can grow in the unpleasant dungeon environment, but some have managed player ghost The apparition of an unfortunate adventurer. - -"Know thyself." - -Inscription in the pronaos of the Temple of Apollo at Delphi %%%% polar bear @@ -1460,9 +1107,6 @@ program bug A ravenous and incredibly buggy monster. Please report its existence to the DevTeam. - -"If builders built buildings the way programmers wrote programs, then the first woodpecker that came along would destroy civilization." - -Gerald Weinberg, Weinberg's Second Law %%%% pulsating lump @@ -1495,10 +1139,6 @@ A small marsupial. Don't call it a rat. rakshasa A demon in the form of a tiger who comes to the material world in search of power and knowledge. Rakshasas are experts in the art of illusion, and are simultaneously intelligent and cruel. - -"He is brilliant, yet utterly corrupt. Like rotten mackerel by moonlight, -he both shines and stinks." - -John Randolph %%%% rat @@ -1555,21 +1195,6 @@ A giant black scorpion, its body covered in thick armour plating, and its tail t shadow A wisp of unliving shadow, drifting on the edge of vision. - -"Between the idea - And the reality - Between the motion - And the act - Falls the Shadow - For thine is the Kingdom - - Between the conception - And the creation - Between the emotion - And the response - Falls the Shadow - Life is very long" - -T.S. Eliot, "The Hollow Men" %%%% shadow demon @@ -1628,17 +1253,6 @@ An ice replica of a monster that is animated by the powers of necromancy. small skeleton A skeleton compelled to unlife by the exercise of necromancy. - -"When you hear sweet syncopation - And the music softly moans - T’ain’t no sin to take off your skin - And dance around in your bones. - - When it gets too hot for comfort - And you can’t get ice cream cones - T’ain’t no sin to take off your skin - And dance around your bones." - -William S. Burroughs and Tom Waits, "T'aint no sin" %%%% small zombie @@ -1824,12 +1438,6 @@ worm A giant worm, glistening with slime, with unusually large teeth. You find yourself surprised that a worm should have teeth at all. - -"While the angels, all pallid and wan, - Uprising, unveiling, affirm - That the play is the tragedy, "Man," - And its hero, the Conqueror Worm." - -Edgar Allan Poe %%%% wraith diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 2aaa4f8bd5..68637eb56e 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -94,6 +94,10 @@ static TextDB AllDBs[] = "database/miscname.txt", // names for miscellaneous things NULL), + TextDB( "db/quotes", + "database/quotes.txt", // quotes for items and monsters + NULL), + TextDB( "db/help", // database for outsourced help texts "database/help.txt", NULL), @@ -104,7 +108,8 @@ static TextDB& RandartDB = AllDBs[1]; static TextDB& SpeakDB = AllDBs[2]; static TextDB& ShoutDB = AllDBs[3]; static TextDB& MiscDB = AllDBs[4]; -static TextDB& HelpDB = AllDBs[5]; +static TextDB& QuotesDB = AllDBs[5]; +static TextDB& HelpDB = AllDBs[6]; // ---------------------------------------------------------------------- // TextDB @@ -600,23 +605,25 @@ static std::string _query_database(DBM *db, std::string key, } ///////////////////////////////////////////////////////////////////////////// +// Quote DB specific functions. + +std::string getQuoteString(const std::string &key) +{ + if (!QuotesDB) + return (""); + + return _query_database(QuotesDB.get(), key, true, true); +} + +///////////////////////////////////////////////////////////////////////////// // Description DB specific functions. -std::string getLongDescription(const std::string &key, bool noquote) +std::string getLongDescription(const std::string &key) { if (!DescriptionDB.get()) return (""); - std::string result = ""; - if (noquote) - { - result = _query_database(DescriptionDB.get(), key + " noquote", - true, true); - } - if (result.empty()) - result = _query_database(DescriptionDB.get(), key, true, true); - - return result; + return _query_database(DescriptionDB.get(), key, true, true); } std::vector<std::string> getLongDescKeysByRegex(const std::string ®ex, diff --git a/crawl-ref/source/database.h b/crawl-ref/source/database.h index 9a5c44e9ba..a29b2dd3a0 100644 --- a/crawl-ref/source/database.h +++ b/crawl-ref/source/database.h @@ -51,8 +51,9 @@ std::string getWeightedSpeechString(const std::string &key, const std::string &suffix, const int weight = -1); -std::string getLongDescription(const std::string &key, - bool noquote = false); +std::string getQuoteString(const std::string &key); +std::string getLongDescription(const std::string &key); + std::vector<std::string> getLongDescKeysByRegex(const std::string ®ex, db_find_filter filter = NULL); std::vector<std::string> getLongDescBodiesByRegex(const std::string ®ex, diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index 99f27f96fa..d5e2809544 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -604,14 +604,14 @@ int check_recital_audience() if (!_recite_mons_useless( &menv[mgrd(*ri)] ) ) return (1); } - + #ifdef DEBUG_DIAGNOSTICS if (!found_monsters) mprf(MSGCH_DIAGNOSTICS, "No audience found!"); else mprf(MSGCH_DIAGNOSTICS, "No sensible audience found!"); #endif - + // No use preaching to the choir, nor to common animals. if (found_monsters) return (-1); diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index b5f3280007..2b8f4c1e41 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -113,7 +113,7 @@ static int _count_desc_lines(const std::string _desc, const int width) //--------------------------------------------------------------- void print_description(const std::string &d, const std::string title, const std::string suffix, const std::string prefix, - const std::string footer) + const std::string footer, const std::string quote) { const unsigned int lineWidth = get_number_of_cols() - 1; const int height = get_number_of_lines(); @@ -134,21 +134,34 @@ void print_description(const std::string &d, const std::string title, const int prefix_lines = _count_desc_lines(prefix, lineWidth); const int footer_lines = _count_desc_lines(footer, lineWidth) + (footer.empty() ? 0 : 1); + const int quote_lines = _count_desc_lines(quote, lineWidth); - // Prefer the footer over the suffix + // Prefer the footer over the suffix. if (num_lines + suffix_lines + footer_lines <= height) { desc = desc + suffix; num_lines += suffix_lines; } - // Prefer the footer over the prefix + // Prefer the footer over the prefix. if (num_lines + prefix_lines + footer_lines <= height) { desc = prefix + desc; num_lines += prefix_lines; } + // Prefer the footer over the quote. + if (num_lines + footer_lines + quote_lines + 1 <= height) + { + if (!desc.empty()) + { + desc += "$"; + num_lines++; + } + desc = desc + quote; + num_lines += quote_lines; + } + if (!footer.empty() && num_lines + footer_lines <= height) { const int bottom_line = std::min(std::max(24, num_lines + 2), @@ -173,7 +186,7 @@ void print_description(const std::string &d, const std::string title, if (currentPos != 0) cgotoxy(1, wherey() + 1); - // see if $ sign is within one lineWidth + // See if $ sign is within one lineWidth. nextLine = desc.find('$', currentPos); if (nextLine >= currentPos && nextLine < currentPos + lineWidth) @@ -195,7 +208,7 @@ void print_description(const std::string &d, const std::string title, continue; } - // no newline -- see if rest of string will fit. + // No newline -- see if rest of string will fit. if (currentPos + lineWidth >= desc.length()) { cprintf((desc.substr(currentPos)).c_str()); @@ -203,7 +216,7 @@ void print_description(const std::string &d, const std::string title, } - // ok.. try to truncate at space. + // Ok, try to truncate at space. nextLine = desc.rfind(' ', currentPos + lineWidth); if (nextLine > 0) @@ -213,7 +226,7 @@ void print_description(const std::string &d, const std::string title, continue; } - // oops. just truncate. + // Oops. Just truncate. nextLine = currentPos + lineWidth; nextLine = std::min(d.length(), nextLine); @@ -1678,8 +1691,22 @@ std::string get_item_description( const item_def &item, bool verbose, else { std::string db_name = item.name(DESC_DBNAME, true, false, false); - std::string db_desc = - getLongDescription(db_name, is_artefact(item) || noquote); + std::string db_desc = getLongDescription(db_name); + if (!noquote && !is_artefact(item)) + { + const unsigned int lineWidth = get_number_of_cols(); + const int height = get_number_of_lines(); + + std::string quote = getQuoteString(db_name); + + if (_count_desc_lines(db_desc, lineWidth) + + _count_desc_lines(quote, lineWidth) <= height) + { + if (!db_desc.empty()) + db_desc += "$"; + db_desc += quote; + } + } if (db_desc.empty()) { @@ -2347,7 +2374,7 @@ void describe_monsters(const monsters& mons) } std::ostringstream body; - std::string title, prefix, suffix; + std::string title, prefix, suffix, quote; std::string capname = mons.name(DESC_CAP_A); title = capname; @@ -2357,13 +2384,14 @@ void describe_monsters(const monsters& mons) title += mons.base_name(DESC_NOCAP_THE, false); } + std::string db_name = mons.base_name(DESC_DBNAME, false); if (mons_is_mimic(mons.type) && mons.type != MONS_GOLD_MIMIC) - body << getLongDescription("mimic"); - else - { - body << getLongDescription(mons.base_name(DESC_DBNAME, false), - mons.type == MONS_DANCING_WEAPON); - } + db_name = "mimic"; + + // Don't get description for player ghosts. + if (mons.type != MONS_PLAYER_GHOST) + body << getLongDescription(db_name); + quote = getQuoteString(db_name); std::string symbol = ""; symbol += get_monster_data(mons.type)->showchar; @@ -2375,21 +2403,30 @@ void describe_monsters(const monsters& mons) symbol_prefix += "_prefix"; prefix = getLongDescription(symbol_prefix); + std::string quote2 = getQuoteString(symbol_prefix); + if (!quote.empty() && !quote2.empty()) + quote += "$"; + quote += quote2; + + // Except for draconians and player ghosts, I have to admit I find the + // following special descriptions rather pointless. I certainly can't + // say I like them, though "It has come for your soul!" and + // "It wants to drink your blood!" have something going for them. (jpeg) switch (mons.type) { case MONS_ROTTING_DEVIL: if (player_can_smell()) { if (player_mutation_level(MUT_SAPROVOROUS) == 3) - body << "It smells great!"; + body << "It smells great!$"; else - body << "It stinks."; + body << "It stinks.$"; } break; case MONS_SWAMP_DRAKE: if (player_can_smell()) - body << "It smells horrible."; + body << "It smells horrible.$"; break; case MONS_NAGA: @@ -2398,26 +2435,26 @@ void describe_monsters(const monsters& mons) case MONS_GUARDIAN_NAGA: case MONS_GREATER_NAGA: if (you.species == SP_NAGA) - body << "It is particularly attractive."; + body << "It is particularly attractive.$"; else - body << "It is strange and repulsive."; + body << "It is strange and repulsive.$"; break; case MONS_VAMPIRE: case MONS_VAMPIRE_KNIGHT: case MONS_VAMPIRE_MAGE: if (you.is_undead == US_ALIVE) - body << "It wants to drink your blood! "; + body << "It wants to drink your blood!$"; break; case MONS_REAPER: if (you.is_undead == US_ALIVE) - body << "It has come for your soul!"; + body << "It has come for your soul!$"; break; case MONS_ELF: // These are only possible from polymorphing or shapeshifting. - body << "This one is remarkably plain looking."; + body << "This one is remarkably plain looking.$"; break; case MONS_DRACONIAN: @@ -2441,8 +2478,7 @@ void describe_monsters(const monsters& mons) break; } case MONS_PLAYER_GHOST: - body << "$The apparition of " << get_ghost_description(mons) - << ".$"; + body << "The apparition of " << get_ghost_description(mons) << ".$"; break; case MONS_PANDEMONIUM_DEMON: @@ -2451,14 +2487,14 @@ void describe_monsters(const monsters& mons) case MONS_URUG: if (player_can_smell()) - body << "He smells terrible."; + body << "He smells terrible.$"; break; case MONS_PROGRAM_BUG: body << "If this monster is a \"program bug\", then it's " "recommended that you save your game and reload. Please report " "monsters who masquerade as program bugs or run around the " - "dungeon without a proper description to the authorities."; + "dungeon without a proper description to the authorities.$"; break; default: break; @@ -2470,6 +2506,11 @@ void describe_monsters(const monsters& mons) suffix += getLongDescription(symbol_suffix); suffix += getLongDescription(symbol_suffix + "_examine"); + quote2 = getQuoteString(symbol_suffix); + if (!quote.empty() && !quote2.empty()) + quote += "$"; + quote += quote2; + #if DEBUG_DIAGNOSTICS if (mons_class_flag( mons.type, M_SPELLCASTER )) { @@ -2510,7 +2551,7 @@ void describe_monsters(const monsters& mons) } #endif - print_description(body.str(), title, suffix, prefix); + print_description(body.str(), title, suffix, prefix, "", quote); mouse_control mc(MOUSE_MODE_MORE); diff --git a/crawl-ref/source/describe.h b/crawl-ref/source/describe.h index 2e00c44c99..b1be3e68fc 100644 --- a/crawl-ref/source/describe.h +++ b/crawl-ref/source/describe.h @@ -88,7 +88,8 @@ void describe_skill(int skill); void print_description(const std::string &d, const std::string title = "", const std::string suffix = "", const std::string prefix = "", - const std::string footer = ""); + const std::string footer = "", + const std::string quote = ""); const char *trap_name(trap_type trap); int str_to_trap(const std::string &s); diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 7c658bb4c5..74b1143a49 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2784,8 +2784,11 @@ std::string get_monster_desc(const monsters *mon, bool full_desc, // Note that the only difference between DESC_BASENAME and DESC_PLAIN // is that basename will ignore mname, so the monster _must_ be named // for this to make any sense. - if (!(mon->mname).empty() && desc != mon->name(DESC_BASENAME)) + if (!(mon->mname).empty() && desc != mon->name(DESC_BASENAME) + && mon->type != MONS_PLAYER_GHOST) + { desc += " the " + mon->name(DESC_BASENAME); + } if (print_attitude) { diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 387078dce4..d9015d07f7 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -589,6 +589,7 @@ enum command_type CMD_TARGET_DIR_UP, CMD_TARGET_DIR_UP_RIGHT, + CMD_TARGET_DESCRIBE, CMD_TARGET_ALL_DESCRIBE, CMD_TARGET_CYCLE_TARGET_MODE, CMD_TARGET_PREV_TARGET, @@ -614,7 +615,6 @@ enum command_type CMD_TARGET_FIND_UPSTAIR, CMD_TARGET_FIND_DOWNSTAIR, CMD_TARGET_FIND_YOU, - CMD_TARGET_DESCRIBE, CMD_TARGET_WIZARD_MAKE_FRIENDLY, CMD_TARGET_WIZARD_BLESS_MONSTER, CMD_TARGET_WIZARD_MAKE_SHOUT, diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index cf73bba4ca..744a87b326 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1277,14 +1277,14 @@ void monster_pane_info::to_string( int count, std::string& desc, if (count == 1) { - if (!mons_is_mimic(m_mon->type)) + if (mons_is_mimic(m_mon->type)) + out << mons_type_name(m_mon->type, DESC_PLAIN); + else { out << m_mon->name(DESC_PLAIN); - if (!(m_mon->mname).empty()) + if (!(m_mon->mname).empty() && m_mon->type != MONS_PLAYER_GHOST) out << " the " << mons_type_name(m_mon->type, DESC_PLAIN); } - else - out << mons_type_name(m_mon->type, DESC_PLAIN); } else { |