From: PatR Date: Wed, 17 Mar 2021 08:44:16 +0000 (-0700) Subject: pull request #472 - data.base enhancements X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1c9f004f6dc565450c2778550a21e26b09cf05f;p=nethack pull request #472 - data.base enhancements Improves the consistency of quote citations. Mostly by adding missing commas but there are a handful or more substantial corrections. Pull request changed one "G.K. Chesterton" to "G. K. Chesterton" but I went the other way. There are roughly 60 citations with two or three initials, and about 50 omit the space, only 10-ish included it. I changed those to match the rest. It's slightly less visual clutter when reading an entry. Also adds some new keys that previously had no entry to now match some existing entries. I added various comments and also inserted a few blank lines to separate paragraphs but made no attempt to be thorough about that. Fixes #472 --- diff --git a/dat/data.base b/dat/data.base index a23ba5449..a8e0fff94 100644 --- a/dat/data.base +++ b/dat/data.base @@ -6,7 +6,10 @@ # # This is the source file for the "data" file generated by `makedefs -d'. # A line starting with a # is a comment and is ignored by makedefs. -# Any other line not starting with whitespace is a creature or an item. +# Any other line not starting with whitespace is a lookup key, usually +# a creature or an item. Key wildcard matching only supports '?' for +# single character, '*' for zero or more characters, and leading '~' as +# described below. # # Each entry should be comprised of: # the thing/person being described on a line by itself, in lowercase; @@ -17,6 +20,12 @@ # following keys for that entry. For instance, `~orc ??m*' preceding `orc*' # prevents "orc mummy" and "orc zombie" from matching. # +# A citation of "[]" indicates arbitrary text written by developers or +# contributers. Falling off the end of an entry without any citation +# implies "[]". +# +# Some entries include blank lines to separate paragraphs but many don't. +# abbot For it had been long apparent to Count Landulf that nothing could be done with his seventh son Thomas, except to make him @@ -28,12 +37,18 @@ abbot except to say suddenly to his schoolmaster in an explosive manner, "What is God?" The answer is not recorded but it is probable that the asker went on worrying out answers for himself. - [ The Runaway Abbot, by G. K. Chesterton ] + [ The Runaway Abbot, by G.K. Chesterton ] # takes "suit or piece of armor" when specifying '[' +# FIXME: "dragon scales, dragon scale mail" needs its own entry +# FIXME too: "ac, armor class" also merits its own distinct entry ac armor* armour* +*leather armor suit or piece of armor +~*dragon*scale* +~scroll of mail +*mail "The last spot on the school jousting team came down to another boy and me. He was poor, and his only armor was a blanket his mother had made him from her hair. I, on the other hand, had @@ -52,7 +67,7 @@ suit or piece of armor Lying there on the mud mortally wounded, I learned what true armor class was that day." - [ When Help Collides, by J. D. Berry ] + [ When Help Collides, by J.D. Berry ] aclys aklys thonged club @@ -124,7 +139,7 @@ maud If ever I should forget, May God make me more wretched Than ever I have been yet! - [ Maud, And Other Poems by Alfred, Lord Tennyson ] + [ Maud, And Other Poems, by Alfred, Lord Tennyson ] ~amulet of yendor ~amulet of restful sleep *amulet @@ -217,7 +232,7 @@ apelike creature the apes have the forelimbs much better developed than the hind limbs. Tail entirely absent. Growth is slow and sexual maturity reached at quite an advanced age. - [ A Field Guide to the Larger Mammals of Africa by Dorst ] + [ A Field Guide to the Larger Mammals of Africa, by Dorst ] Aldo the gorilla had a plan. It was a good plan. It was right. He knew it. He smacked his lips in anticipation as @@ -362,7 +377,7 @@ b*lzebub gave us this pungent and suggestive name of the Devil, a devil whose name suggests that he is devoted to decay, destruction, demoralization, hysteria and panic... - [ Notes on _Lord of the Flies_, by E. L. Epstein ] + [ Notes on _Lord of the Flies_, by E.L. Epstein ] balrog ... It came to the edge of the fire and the light faded as if a cloud had bent over it. Then with a rush it leaped @@ -437,7 +452,7 @@ bat or bird gifted of God's creatures. Show me a bat, says the old proverb, and I will show you something that ought to be in some kind of a home. - [ A Pelican at Blandings, by P. G. Wodehouse ] + [ A Pelican at Blandings, by P.G. Wodehouse ] bear*trap Probably most commonly associated with trapping, the leghold trap is a rather simple mechanical trap. It is made up of two @@ -531,6 +546,7 @@ ooze kind had swept so evilly free of all litter. [ At the Mountains of Madness, by H.P. Lovecraft ] blue jelly +ochre jelly spotted jelly I'd planned how to prevent the lock from sealing behind me; it required a temporary sacrifice, not cleverness. I used the door @@ -656,7 +672,7 @@ brigit And clear understanding. Bring me my cross of gold, As a talisman. - [ "Broadsword" (refrain) by Ian Anderson ] + [ "Broadsword" (refrain), by Ian Anderson ] bugbear Bugbears are relatives of goblins, although they tend to be larger and more hairy. They are aggressive carnivores and @@ -972,8 +988,8 @@ c*ckatrice But even a dead basilisk is dangerous, for it is said that merely touching its lifeless body can cause a person to sicken and die. - [ Mythical Beasts by Deirdre Headon (The Leprechaun Library) - and other sources ] + [ Mythical Beasts, by Deirdre Headon (The Leprechaun Library) + and other sources ] *coin ~creeping coins *coins @@ -1084,7 +1100,7 @@ crom aura of evil magic in the air. Without thought, he readies his weapon, and mutters under his breath: "By Crom, there will be blood spilt today." - [ Conan the Avenger by Robert E. Howard, Bjorn Nyberg, + [ Conan the Avenger, by Robert E. Howard, Bjorn Nyberg, and L. Sprague de Camp ] crossbow* "God save thee, ancient Mariner! @@ -1360,7 +1376,7 @@ doppelganger not only with clouds of sulphurous fumes pouring from its fire breathing nostrils, but also with the thrashings of its tail, the most deadly part of its serpent-like body. - [ Mythical Beasts by Deirdre Headon (The Leprechaun Library) ] + [ Mythical Beasts, by Deirdre Headon (The Leprechaun Library) ] "One whom the dragons will speak with," he said, "that is a dragonlord, or at least that is the center of the matter. It's @@ -1982,7 +1998,7 @@ gnomish wizard a potato. Ron held it at arm's length as it kicked out at him with its horny little feet; he grasped it around the ankles and turned it upside down. - [ Harry Potter and the Chamber of Secrets, by J. K. Rowling ] + [ Harry Potter and the Chamber of Secrets, by J.K. Rowling ] goblin Now goblins are cruel, wicked, and bad-hearted. They make no beautiful things, but they make many clever ones. They @@ -2191,7 +2207,7 @@ heart of ahriman "Bring that thing back?" muttered the small dark man who stood on the right, with a short, sardonic laugh. "It is ready to crumble at a touch. We are fools ---" - [ Conan The Conqueror, by Robert E. Howard ] + [ Conan the Conqueror, by Robert E. Howard ] hell hound* But suddenly they started forward in a rigid, fixed stare, and his lips parted in amazement. At the same instant Lestrade @@ -2207,7 +2223,7 @@ hell hound* savage, more appalling, more hellish be conceived than that dark form and savage face which broke upon us out of the wall of fog. - [ The Hound of the Baskervilles, by Sir Arthur Conan Doyle. ] + [ The Hound of the Baskervilles, by Sir Arthur Conan Doyle ] hermes Messenger and herald of the Olympians. Being required to do a great deal of travelling and speaking in public, he became @@ -2400,6 +2416,8 @@ huan*ti opposed to the _dark_ heavens. He is an inventor, said to have given mankind among other things, the wheel, armour, and the compass. He is the god of fortune telling and war. +# citation used to be [ after the Encyclopedia of Gods... ] -- not sure what +# that was intended to mean hu*h*eto*l minion of huhetotl Huehuetotl, or Huhetotl, which means Old God, was the Aztec @@ -2407,7 +2425,7 @@ minion of huhetotl associated with paternalism and one of the group classed as the Xiuhtecuhtli complex. He is known to send his minions to wreak havoc upon ordinary humans. - [ after the Encyclopedia of Gods, by Michael Jordan ] + [ Encyclopedia of Gods, by Michael Jordan ] humanoid Humanoids are all approximately the size of a human, and may be mistaken for one at a distance. They are usually of a @@ -2650,7 +2668,13 @@ jubilex he is a slime-like creature who swallows other creatures alive, spits acidic secretions, and causes disease in his victims which can be almost instantly fatal. +# historically (according to wikipedia...), C-ration was heavier but +# provided more nutrition, and required some form of tin opener; +# in nethack they weigh the same and K-ration provides more nutrition? k?ration +c?ration + The C ration was a predecessor of the K ration. + [] The K ration was the [ Quartermaster Subsistence Research and Development Laboratory's ] answer to the demand for an individual, easy-to-carry ration that could be used in @@ -2766,6 +2790,7 @@ knight Elven race, and will go out of their way to cause trouble for Elves at any time. *kop* +rubber hose The Kops are a brilliant concept. To take a gaggle of inept policemen and display them over and over again in a series of riotously funny physical punishments plays equally well to the @@ -2885,6 +2910,7 @@ land mine battery powered. A discreet little switch is marked "on/off" in elaborate lettering. [ Adventure 770, by Mike Arnautov ] +# citation is a descriptive passage from the original text adventure game lava * lava You are on the edge of a breath-taking view. Far below you @@ -2909,7 +2935,7 @@ lava of its own, which lends an additional infernal splendor to the already hellish scene. A dark, forboding passage exits to the south. - [ Adventure, by Will Crowther and Don Woods. ] + [ Adventure, by Will Crowther and Don Woods ] leash They had splendid heads, fine shoulders, strong legs, and straight tails. The spots on their bodies were jet-black and @@ -3067,7 +3093,7 @@ lord carnarvon to Egypt in search of a mild climate and while there visited the excavation sites of several archaeological expeditions. ... In 1906 he began his own excavations. - [ Gods, Graves, and Scholars, by C. W. Ceram ] + [ Gods, Graves, and Scholars, by C.W. Ceram ] lord sato Lord Sato was the family head of the Taro Clan, and a mighty daimyo. He is a loyal servant of the Emperor, and will do @@ -3294,8 +3320,11 @@ huge chunk of meat But we hae meat, and we can eat, Sae let the Lord be thankit. [ Grace Before Meat, by Robert Burns ] +# nethack's Medusa doesn't match the myth very closely, particularly in +# how reflection is involved, but that's par for the course medusa perseus +shield of reflection Medusa, one of the three Gorgons or Graeae, is the only one of her sisters to have assumed mortal form and inhabited the dungeon world. @@ -3510,6 +3539,7 @@ morning star the horseman's weapon typically had a shorter haft than the footman's, which might be up to six feet long. It came into use in the beginning of the 14th century. + The name "morning star" is often erroneously applied to the military flail (also known as the therscol), a similar weapon, but with the head attached by a short chain. @@ -3633,7 +3663,7 @@ ninja-to good condition by placing fresh earth around it daily. In her fury, Skuld often spoiled the work of her sisters by tearing the web to shreds. - [ The Encyclopedia of Myths and Legends of All Nations + [ The Encyclopaedia of Myths and Legends of All Nations, by Herbert Spencer Robinson and Knox Wilson ] nunchaku A nunchaku is two sections of wood (or metal in modern @@ -3921,7 +3951,7 @@ pelias "The scaled people see what escapes the mortal eye," answered Pelias cryptically. "You see my fleshy guise, he saw my naked soul." - [ Conan the Usurper, by Robert E. Howard and L. Sprague de Camp ] + [ Conan the Usurper, by Robert E. Howard and L. Sprague de Camp ] pick*ax* broad pick The mine is full of holes; @@ -4054,17 +4084,19 @@ poseido*n waves he received by lot at the Council Meeting of the Gods, at which Zeus took the upper world for himself and gave dominion over the lower world to Hades. + Poseidon is associated in many ways with horses and thus is the god of horses. He taught men how to ride and manage the animal he invented and is looked upon as the originator and guardian deity of horse races. + His symbol is the familiar trident or three-pronged spear with which he can split rocks, cause or quell storms, and shake the earth, a power which makes him the god of earthquakes as well. Physically, he is shown as a strong and powerful ruler, every inch a king. - [ The Encyclopedia of Myths and Legends of All Nations, - by Herbert Robinson and Knox Wilson ] + [ The Encyclopaedia of Myths and Legends of All Nations, + by Herbert Spencer Robinson and Knox Wilson ] ~*sleeping ~*booze *potion* @@ -4092,7 +4124,7 @@ poseido*n one else can see, do things no one else can do. [ Big Trouble in Little China, directed by John Carpenter, written by Gary Goldman & - David Z. Weinstein, adaptation by W. D. Richter ] + David Z. Weinstein, adaptation by W.D. Richter ] pray* Whatever a man prays for, he prays for a miracle. Every prayer reduces itself to this: Great God, grant that twice @@ -4238,7 +4270,7 @@ quetzalcoatl cotton to grow on cotton plants. But for some reason or other he had to leave his empire. ... But all the legends of Quetzalcoatl unanimously agree that he promised to come again. - [ Gods, Graves, and Scholars, by C. W. Ceram ] + [ Gods, Graves, and Scholars, by C.W. Ceram ] quit* Maltar: [...] I remembered a little saying I learned my first day at the academy. @@ -4938,7 +4970,7 @@ statue* lion. And as soon as he had thought of that he noticed that the lion's back and the top of its head were covered with snow. Of course it must be only a statue! - [ The Lion, the Witch and the Wardrobe by C.S. Lewis ] + [ The Lion, the Witch and the Wardrobe, by C.S. Lewis ] sting There was the usual dim grey light of the forest-day about him when he came to his senses. The spider lay dead beside @@ -4949,6 +4981,7 @@ sting a different person, and much fiercer and bolder in spite of an empty stomach, as he wiped his sword on the grass and put it back into its sheath. + "I will give you a name," he said to it, "and I shall call you Sting." [ The Hobbit, by J.R.R. Tolkien ] @@ -4959,6 +4992,7 @@ stormbringer yet the ship followed them, as if drawn by them; they grew louder - pain and despair were there, but terror was predominant. + Elric had heard such sounds echoing from his cousin Yyrkoon's sardonically named 'Pleasure Chambers' in the days before he had fled the responsibilities of ruling all that remained of @@ -5361,7 +5395,7 @@ valkyrie which they died and in which they had won their deathless fame. [ The Encyclopaedia of Myths and Legends of All Nations, - by Herbert Robinson and Knox Wilson ] + by Herbert Spencer Robinson and Knox Wilson ] vampire ~vampire bat vampire lord @@ -5526,14 +5560,24 @@ water troll As Rincewind stared a small shoal of silver fish flashed across its chest. [ The Colour of Magic, by Terry Pratchett ] +# axe and morning star and the umpteen polearms have their own entries; +# exclusion keys for broadsword and sunsword aren't really necessarily +# because their entries precede this one weapon +battle axe +club +flail +~*broadsword +~sunsword +*sword A weapon is a device for making your enemy change his mind. [ The Vor Game, by Lois McMaster Bujold ] web Oh what a tangled web we weave, When first we practise to deceive! [ Marmion, by Sir Walter Scott ] -whistle +# magic whistle deserves its own entry +*whistle There were legends both on the front and on the back of the whistle. The one read thus: @@ -5744,7 +5788,7 @@ yumi taken from the grave and endowed by sorcery with a mechanical semblance of life, -- it is a dead body which is made to walk and act and move as if it were alive. - [ W. B. Seabrook ] + [ W.B. Seabrook ] zruty The zruty are wild and gigantic beings, living in the wildernesses of the Tatra mountains.