diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-13 23:33:29 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-13 23:33:29 +0000 |
commit | d0fa191c0aefba806831fd1bc30f85f904b90b42 (patch) | |
tree | e6774337e2bda216c9b172a06b30023be551fb12 /crawl-ref/source | |
parent | 03a3fe1c4f04df3be7570c465cabb43109370293 (diff) | |
download | crawl-ref-d0fa191c0aefba806831fd1bc30f85f904b90b42.tar.gz crawl-ref-d0fa191c0aefba806831fd1bc30f85f904b90b42.zip |
Update pdf files.
Apply Will's patch for sorting by identifed status.
Fix a few oddly broken monster descriptions.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6539 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/dat/descript/monsters.txt | 29 | ||||
-rw-r--r-- | crawl-ref/source/invent.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/util/docs/key_changes.tex | 2 |
4 files changed, 22 insertions, 17 deletions
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index ac12ca9c9a..af678dd74d 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -233,12 +233,12 @@ 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." +"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 @@ -520,14 +520,15 @@ 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." +"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 diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 93458657bc..c2e766f470 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -492,6 +492,11 @@ bool sort_item_equipped(const InvEntry *a) return !a->is_item_equipped(); } +bool sort_item_identified(const InvEntry *a) +{ + return !item_type_known(*(a->item)); +} + static bool _compare_invmenu_items(const InvEntry *a, const InvEntry *b, const item_sort_comparators *cmps) { @@ -540,6 +545,7 @@ void init_item_sort_comparators(item_sort_comparators &list, { "ego", compare_item<bool, sort_item_ego> }, { "art", compare_item<bool, sort_item_art> }, { "equipped", compare_item<bool, sort_item_equipped> }, + { "identified",compare_item<bool, sort_item_identified> }, { "qty", compare_item<int, sort_item_qty> }, { "slot", compare_item<int, sort_item_slot> }, { "freshness", compare_item<int, sort_item_freshness> } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index e47f2925e4..cf2efd52d2 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1412,9 +1412,7 @@ command_type fire_target_behaviour::get_command(int key) // Do this stuff unconditionally to make the prompt redraw. message_ammo_prompt(); need_prompt = true; -// key = CMD_NO_CMD; return (CMD_NO_CMD); - break; } case 'i': { diff --git a/crawl-ref/source/util/docs/key_changes.tex b/crawl-ref/source/util/docs/key_changes.tex index 3d411a1508..2e426cb5a1 100644 --- a/crawl-ref/source/util/docs/key_changes.tex +++ b/crawl-ref/source/util/docs/key_changes.tex @@ -88,7 +88,7 @@ new key & command & old key \\ \hline \key{c} & chop up & was \key{D}, dissect \\ \key{E} & show experience & was \key{C} \\ \key{v} & evoke & was \key{E} \\ -\key{F} & manually throw & was \key{t} \\ +\key{F} & manually throw & was \key{t} \\ \key{t} & tell/yell & was \key{!} \\ \key{Ctrl-V} & Tiles settings & was \key{Ctrl-Q} \\ \key{Ctrl-Q} & quit & was \key{Q} |