summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/docs/changes.stone_soup13
-rw-r--r--crawl-ref/source/food.cc5
-rw-r--r--crawl-ref/source/quiver.cc4
3 files changed, 13 insertions, 9 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 67fd4a323d..134358ac36 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -20,14 +20,14 @@ Interface
---------
* Overhauled key settings of a number of commands.
(See /settings/034_commands.txt or press ?v while playing.)
-* Added monster list for monsters in LOS (ASCII only).
+* Added monster list for monsters in line of sight (ASCII only).
+* Improved religion, skills, ability interface. (Commands are ^!, m?, and a!.)
* Overhauled (f)iring interface: abolish (t)hrowing, output quiver in status.
-* Allow selection of equipment slots from '%' overview screen.
* Improved butchering interface.
-* Improved religion and skills interface. (Press ^! and m?, respectively.)
+* Allow selection of equipment slots from '%' overview screen.
* Added coloured HP/Magic bars.
* Many new tutorial information triggers.
-* Allow searching item/monster/spell descriptions ('?/' command).
+* Allow searching item/monster/spell/... descriptions ('?/' command).
* Allow swapping (' command) to non-weapons that need to be wielded for spells.
* Fixed weapon swap ignoring {!w}.
* Added Ctrl-D as a synonym for '~' (defining macros).
@@ -53,6 +53,7 @@ Gods
* Vehumet isn't evil anymore, and all boosts apply without prayer.
* Increase cost for Lugonu's self-banishment.
* Removed autoprayer and option to stop prayer.
+* Removed item sacrifices for all gods except Nemelex, TSO, Zin.
* Upon failed sacrifice hint on accepted item types.
* Divine summons will leave on penance, or turn hostile on abandonment.
@@ -60,6 +61,7 @@ Characters
----------
* Added Vampire species.
* Enable all sensible species/class combinations.
+* Overhaul starting skills and equipment.
* Removed Glamour.
* Red/White Draconians gain heat/cold resistance at xl 14 (rather than 18).
* Mutations: Removed forgetfulness; introduced fur, shouting, +mp/-mp.
@@ -67,7 +69,6 @@ Characters
* Fixed undead being unable to smite.
* Necromutation now gives torment resistance again.
* When transforming only remove armour you can't wear while transformed.
-* Improve Priests' starting weapons.
Items
-----
@@ -112,7 +113,7 @@ Monsters
* Daevas now resist negative energy.
* Fixed Oklob plants being confuseable.
* Lee's Rapid Deconstruction now works against skeletal dragons.
-* Changed evil/holiness/intelligence flags for a number of monsters.
+* Changed evil/holiness/intelligence/... flags for a number of monsters.
* Improved trap handling for intelligent monsters.
* Improved control over friendly monsters.
* Smarter pickup handling.
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 776ae2dbb2..02555cb734 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -1945,8 +1945,11 @@ bool is_preferred_food(const item_def &food)
if (you.species == SP_VAMPIRE)
return (is_blood_potion(food));
- if (food.base_type == OBJ_POTIONS && food.sub_type == POT_PORRIDGE)
+ if (food.base_type == OBJ_POTIONS && food.sub_type == POT_PORRIDGE
+ && item_type_known(food))
+ {
return (!player_mutation_level(MUT_CARNIVOROUS));
+ }
if (food.base_type != OBJ_FOOD)
return (false);
diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc
index d6e52d5f36..da0ee0305b 100644
--- a/crawl-ref/source/quiver.cc
+++ b/crawl-ref/source/quiver.cc
@@ -144,8 +144,8 @@ void choose_item_for_quiver()
{
int slot = prompt_invent_item( "Quiver which item? (- for none, * to show all)",
MT_INVLIST,
- OSEL_THROWABLE, true, true, true, '-', -1,
- NULL, OPER_QUIVER );
+ OSEL_THROWABLE, true, true, true, '-',
+ you.equip[EQ_WEAPON], NULL, OPER_QUIVER );
if (slot == PROMPT_ABORT)
{