diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-26 21:45:01 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-26 21:45:01 +0000 |
| commit | c1fdfddaf2ad50929798e80ad398e25d8dae4ec0 (patch) | |
| tree | 6cfbef4646923ef3cb84071a975e6a8d816bf91c /crawl-ref | |
| parent | 729fc414f8443b1649e7339515decb415eb5890d (diff) | |
| download | crawl-ref-c1fdfddaf2ad50929798e80ad398e25d8dae4ec0.tar.gz crawl-ref-c1fdfddaf2ad50929798e80ad398e25d8dae4ec0.zip | |
Fix wording for translucent rock walls (1798932).
Change freshness calculation for chunk sorting: all chunks
now sorted oldest to freshest, listing rotten last for
non-Saprovores.
Small comment fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2221 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/dat/descript/features.txt | 3 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 18 | ||||
| -rw-r--r-- | crawl-ref/source/mutation.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/skills2.cc | 2 |
4 files changed, 14 insertions, 11 deletions
diff --git a/crawl-ref/source/dat/descript/features.txt b/crawl-ref/source/dat/descript/features.txt index 7b8d2207a3..f912be00c0 100644 --- a/crawl-ref/source/dat/descript/features.txt +++ b/crawl-ref/source/dat/descript/features.txt @@ -221,12 +221,11 @@ A harder obstacle than rock walls. Only the mightiest magic can shatter stone w %%%% A translucent rock wall +An unnaturally hard translucent rock wall %%%% A translucent stone wall A harder obstacle than rock walls. Only the mightiest magic can shatter stone walls. It has been imbued with arcane magics which render it translucent. -%%%% -An translucent unnaturally hard rock wall %%%% A trap diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index 696dbf5bff..5298b969d3 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -148,23 +148,27 @@ const bool InvEntry::is_item_equipped() const return (false); } +// returns values < 0 for edible chunks (non-rotten except for Saprovores), +// 0 for non-chunks, and values > 0 for rotten chunks for non-Saprovores const int InvEntry::item_freshness() const { if (item->base_type != OBJ_FOOD || item->sub_type != FOOD_CHUNK) return 0; - int freshness = item->special - 100; + int freshness = item->special; + + if (freshness >= 100 || you.species == SP_TROLL || you.species == SP_KOBOLD + || you.species == SP_GHOUL || you.species == SP_OGRE + || you.species == SP_HILL_ORC) + { + freshness -= 300; + } // Ensure that chunk freshness is never zero, since zero means // that the item isn't a chunk. - if (freshness >= 0) + if (freshness >= 0) // possibly rotten chunks freshness++; - // Invert if not a ghoul, so that the freshest chunks will go - // at the top. - if (you.species != SP_GHOUL) - freshness *= -1; - return freshness; } diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 1cc7b19b33..f59a2b99d2 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -875,7 +875,7 @@ const char mutation_rarity[] = { 2, //jmf: claws 1, //jmf: hooves // 60 - 1, + 1, // fangs 0, 0, 0, diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 67bd7cce8b..b21d075fcc 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -1245,7 +1245,7 @@ const int spec_skills[ NUM_SPECIES ][40] = (100 * 75) / 100, // SK_EVOCATIONS }, - { // SP_UNK2_DRACONIAN (29) + { // SP_BASE_DRACONIAN (29) 90, // SK_FIGHTING 100, // SK_SHORT_BLADES 100, // SK_LONG_SWORDS |