Menu
▾
▴
[crawl-ref-commits] master branch updated: 0.12-a0-1423-g72bdf47
|
From: <gi...@cr...> - 2012-12-23 21:28:21
|
via 72bdf47f1a616ee387e13279cd2d2c15cfaa77c5 (commit)
via 68daa12bbcb26abc189ce60e52c911ef13d82387 (commit)
via d95b296bec0246e872051729cbb4fa63d8147ee8 (commit)
from c4df032e32798bd5bed26407f7de79c5174af6cf (commit)
-----------------------------------------------------------------------
commit 72bdf47f1a616ee387e13279cd2d2c15cfaa77c5
Author: elliptic <hyp...@gm...>
Date: Sun Dec 23 16:21:09 2012 -0500
Clean up rod descriptions a bit.
* Now they get a spell list even if they only contain one spell, which
allows players to see the level, hunger, range, noise of the spell.
* The Thunderbolt spell (used by lightning rod) now has a description.
* The lightning rod description is less ridiculously long.
* The generic rod quote was removed because sometimes it would push actual
information off the screen. The current quote code doesn't handle objects
with spell lists properly, which is why books do not have quotes
either... and there is very little room for a quote anyway.
commit 68daa12bbcb26abc189ce60e52c911ef13d82387
Author: elliptic <hyp...@gm...>
Date: Sun Dec 23 16:17:34 2012 -0500
Remove prefix lists from item descriptions, update documentation.
There's no need to clutter up item descriptions with these prefixes when
they are already documented more usefully elsewhere (the stash search
prefixes in the stash search help screen and the menu colour prefixes in
options_guide.txt). There were just a few things missing in the stash search
help, which is now updated.
commit d95b296bec0246e872051729cbb4fa63d8147ee8
Author: elliptic <hyp...@gm...>
Date: Sun Dec 23 15:17:02 2012 -0500
Remove redundant "forbidden" prefix.
The prefix "evil_eating" is superior.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/dat/database/help.txt | 14 +++++++++-----
crawl-ref/source/dat/descript/items.txt | 15 ++++++---------
crawl-ref/source/dat/descript/quotes.txt | 8 --------
crawl-ref/source/dat/descript/spells.txt | 4 ++++
crawl-ref/source/describe.cc | 9 ---------
crawl-ref/source/itemname.cc | 2 +-
crawl-ref/source/items.cc | 2 +-
7 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/crawl-ref/source/dat/database/help.txt b/crawl-ref/source/dat/database/help.txt
index 06bdcf2..3243232 100644
--- a/crawl-ref/source/dat/database/help.txt
+++ b/crawl-ref/source/dat/database/help.txt
@@ -108,11 +108,15 @@ or rods that contain the spell.
You can search for artefact item properties (such as <w>prevents.*teleport</w>)
to find artefacts that have the property.
-You can also search by some additional item properties: <w>artefact</w> will
-find identified artefacts, <w>ego</w> will find non-artefacts with a brand and
-unidentified items which may be branded, and <w>throwable</w> will find things
-you can throw. Skill names (such as <w>Polearms</w> or <w>Long Blades</w>) will
-find all weapons that train that skill.
+You can also search by some additional item properties: <w>artefact</w> or
+<w>artifact</w> will find identified artefacts, <w>ego</w> or <w>branded</w> will
+find non-artefacts with a brand and unidentified items which may be
+branded, <w>throwable</w> will find things you can throw, <w>stick</w> will
+find items that can be used with Sticks to Snakes, and <w>dropped</w> will
+find items you have dropped.
+
+Skill names (such as <w>Polearms</w> or <w>Long Blades</w>) will find all
+weapons that train that skill.
You can also search by item types such as <w>book</w> or <w>jewellery</w>. For
armour slots, you can use <w>helmet</w> (all head gear), <w>gloves</w>,
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 458b34a..edb8392 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -835,15 +835,12 @@ A yellow fruit.
%%%%
lightning rod
-Once, a wizard ignorant of the workings of mundane items misunderstood the
-purpose of lightning rods. Instead of making one that merely drew lightning, he
-made one that created it instead.
-
-This rod shoots continuous lightning: the discharge is sustained, and can be
-redirected to new targets by evoking the rod in subsequent turns (failing to do
-so will release the trigger). The rod takes a moment to warm up, making short
-bursts rather ineffective. Once the zap is active, one can wave the rod,
-creating impressive and damaging arcs of electricity.
+This rod allows its wielder to fire continuous lightning: the discharge is
+sustained, and can be redirected to new targets by evoking the rod in
+subsequent turns (failing to do so will release the trigger). The rod takes a
+moment to warm up, making short bursts rather ineffective. Once the zap is
+active, one can wave the rod, creating impressive and damaging arcs of
+electricity.
%%%%
long sword
diff --git a/crawl-ref/source/dat/descript/quotes.txt b/crawl-ref/source/dat/descript/quotes.txt
index 66e3b56..b5a1f2a 100644
--- a/crawl-ref/source/dat/descript/quotes.txt
+++ b/crawl-ref/source/dat/descript/quotes.txt
@@ -3048,14 +3048,6 @@ ring
To hang upon a tree.â
-Oscar Wilde, âChansonâ. 1881.
%%%%
-rod
-
-âFear not the wickedâs malice, nor their rod.â
- -John Bunyan, _The Pilgrim's Progress From This World, to That Which is to
- Come: Delivered Under the Similitude of a Dream Wherein is Discovered, the
- Manner of His Setting Out, His Dangerous Journey; and Safe Arrival at the
- Desired Countrey_, para. 500. 1678.
-%%%%
wand
"[The principle of selection] is the magicianâs wand, by means of which he may
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index 47cda9e..fb6da41 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -755,6 +755,10 @@ Throw Frost spell
This spell throws a small bolt of frost.
%%%%
+Thunderbolt spell
+
+This spell creates an arc of electricity.
+%%%%
Tornado spell
This spell turns the air around the caster in a mighty vortex, doing tremendous
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 539b83e..15b2916 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2133,15 +2133,6 @@ string get_item_description(const item_def &item, bool verbose,
if (verbose && origin_describable(item))
description << "\n" << origin_desc(item) << ".";
- if (verbose)
- {
- description << "\n\n" << "Stash search prefixes: "
- << userdef_annotate_item(STASH_LUA_SEARCH_ANNOTATE, &item);
- string menu_prefix = filtering_item_prefix(item, false);
- if (!menu_prefix.empty())
- description << "\nMenu/colouring prefixes: " << menu_prefix;
- }
-
return description.str();
}
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index d6deb1d..fbf1a59 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -3393,7 +3393,7 @@ static const string _item_prefix(const item_def &item, bool temp, bool filter)
if (item.sub_type == NUM_FOODS)
break;
if (is_forbidden_food(item))
- prefixes.push_back("evil_eating"), prefixes.push_back("forbidden");
+ prefixes.push_back("evil_eating");
if (is_inedible(item))
prefixes.push_back("inedible");
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index cdce1c4..bfb93f0 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -3063,7 +3063,7 @@ bool item_is_active_manual(const item_def &item)
bool item_def::has_spells() const
{
return (item_is_spellbook(*this) && item_type_known(*this)
- || count_rod_spells(*this, true) > 1);
+ || count_rod_spells(*this, true) > 0);
}
int item_def::book_number() const
--
Dungeon Crawl Stone Soup
|