Apply commit 6539 to 0.4.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6540 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 27 insertions, 15 deletions

diff --git a/crawl-ref/README.pdf b/crawl-ref/README.pdf
index 06411e178f..e33ba5f4cc 100644
--- a/crawl-ref/README.pdf
+++ b/crawl-ref/README.pdf
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index dce05d6871..1604b5100a 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -1,4 +1,4 @@
-Stone Soup 0.4.0 (200807??)
+Stone Soup 0.4.0 (20080714)
 ---------------------------
 
 Disclaimer: These are merely the highlights, not an exhaustive list of changes.
diff --git a/crawl-ref/docs/key_changes.pdf b/crawl-ref/docs/key_changes.pdf
index b0f14e2aa7..c795ed3e17 100644
--- a/crawl-ref/docs/key_changes.pdf
+++ b/crawl-ref/docs/key_changes.pdf
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 041ec3f567..d0cff5bb8d 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -1073,6 +1073,11 @@ sort_menus = [menu:](true | false | auto:X)[:sort_order]
         * glowing:
           Unidentified glowing/shiny/runed/etc items show up first.
 
+        * identified:
+          Identified items show up before unidentified ones of the 
+          same type. An item is regarded as identified once you know 
+          its subtype or ego.
+
         * qty:
           The quantity for stackable items (such as scrolls, potions,
           etc.)
diff --git a/crawl-ref/docs/quickstart.pdf b/crawl-ref/docs/quickstart.pdf
index 43ffcff327..3629966626 100644
--- a/crawl-ref/docs/quickstart.pdf
+++ b/crawl-ref/docs/quickstart.pdf
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> }