summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-08-03 12:20:07 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-08-03 14:16:57 -0400
commit61f7dd9ad7ecc6d1bdbc1e931cd407e68612084d (patch)
tree17b7b7cc53ac48c283a8890d8513ffb3b6e030d8
parent7f77ec55743fce0d895242aab00b26976c8e9d3c (diff)
downloadcrawl-ref-61f7dd9ad7ecc6d1bdbc1e931cd407e68612084d.tar.gz
crawl-ref-61f7dd9ad7ecc6d1bdbc1e931cd407e68612084d.zip
List all food types on \.
Now that there are only 7 (including chunks), there's no reason to not have as many as possible of a single type (because of weight being gone), you often might want to just have one slot of non-chunk food. The categories before weren't quite obvious (preserved meat didn't include beef jerkies apparently). Now you can just set whichever food type you found the most of to be picked up and everything else off. The downside is that this clutters the menu. If it's too much, possibly the categories could become chunks, meat, bread, fruit, and other, splitting bread and fruit for a Ko of Fedhas, for example. That only saves two lines on this, though.
-rw-r--r--crawl-ref/source/itemname.cc22
1 files changed, 18 insertions, 4 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 770389b4b4..0a38c1858d 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2214,12 +2214,26 @@ public:
name = "chunks";
break;
case FOOD_MEAT_RATION:
- name = "preserved meat";
+ name = "meat rations";
break;
+ case FOOD_BEEF_JERKY:
+ name = "beef jerky";
+ break;
+ case FOOD_BREAD_RATION:
+ name = "bread rations";
+ break;
+#if TAG_MAJOR_VERSION == 34
+ default:
+#endif
case FOOD_FRUIT:
name = "fruit";
break;
- default:
+ case FOOD_PIZZA:
+ name = "pizza";
+ break;
+ case FOOD_ROYAL_JELLY:
+ name = "royal jellies";
+ break;
name = "other food";
break;
}
@@ -2474,13 +2488,13 @@ void check_item_knowledge(bool unknown_items)
// Misc.
static const object_class_type misc_list[] =
{
- OBJ_FOOD, OBJ_FOOD, OBJ_FOOD, OBJ_FOOD,
+ OBJ_FOOD, OBJ_FOOD, OBJ_FOOD, OBJ_FOOD, OBJ_FOOD, OBJ_FOOD, OBJ_FOOD,
OBJ_BOOKS, OBJ_RODS, OBJ_GOLD,
OBJ_MISCELLANY, OBJ_MISCELLANY
};
static const int misc_ST_list[] =
{
- FOOD_CHUNK, FOOD_MEAT_RATION, FOOD_FRUIT, FOOD_ROYAL_JELLY,
+ FOOD_CHUNK, FOOD_MEAT_RATION, FOOD_BEEF_JERKY, FOOD_BREAD_RATION, FOOD_FRUIT, FOOD_PIZZA, FOOD_ROYAL_JELLY,
BOOK_MANUAL, NUM_RODS, 1, MISC_RUNE_OF_ZOT,
NUM_MISCELLANY
};