diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-11 06:30:18 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-11 06:30:18 +0000 |
| commit | 155111d4667f790c57341e0ae7a1ed0e15613bb5 (patch) | |
| tree | d35106732b527832c8fe7a3ca2713eb82c15975f | |
| parent | a1340c99e7b25231ce0405a038ad3b5ee3a45329 (diff) | |
| download | crawl-ref-155111d4667f790c57341e0ae7a1ed0e15613bb5.tar.gz crawl-ref-155111d4667f790c57341e0ae7a1ed0e15613bb5.zip | |
Trunk->0.3 merge: show weight of full stack in inventory. Disabled potions of blood for 0.3.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2422 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/invent.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/spells4.cc | 3 |
3 files changed, 8 insertions, 12 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index f1d9d7ab21..2e0fd1164b 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -193,7 +193,7 @@ std::string InvEntry::get_text() const if ( Options.show_inventory_weights ) { - const int mass = item_mass(*item); + const int mass = item_mass(*item) * item->quantity; tstr << std::setw(get_number_of_cols() - tstr.str().length() - 1) << std::right << make_stringf("(%d.%d aum)", mass / 10, mass % 10); diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index c44e406385..930ee0e44b 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -2411,27 +2411,24 @@ int items( int allow_uniques, // not just true-false, case 4: // enhancements if (coinflip()) - mitm[p].sub_type = POT_SPEED; // 6.122% + mitm[p].sub_type = POT_SPEED; else - mitm[p].sub_type = POT_MIGHT; // 6.122% + mitm[p].sub_type = POT_MIGHT; if (one_chance_in(10)) - mitm[p].sub_type = POT_BERSERK_RAGE; // 1.360% + mitm[p].sub_type = POT_BERSERK_RAGE; if (one_chance_in(5)) - mitm[p].sub_type = POT_INVISIBILITY; // 3.401% + mitm[p].sub_type = POT_INVISIBILITY; if (one_chance_in(6)) - mitm[p].sub_type = POT_LEVITATION; // 3.401% + mitm[p].sub_type = POT_LEVITATION; if (one_chance_in(8)) mitm[p].sub_type = POT_RESISTANCE; if (one_chance_in(30)) - mitm[p].sub_type = POT_PORRIDGE; // 0.704% - - if (one_chance_in(20)) - mitm[p].sub_type = POT_BLOOD; // 1.111% + mitm[p].sub_type = POT_PORRIDGE; break; case 5: diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 8a7b7511d7..a90a687893 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -2104,8 +2104,7 @@ void cast_fulsome_distillation( int powc ) switch (mons_corpse_effect( mitm[corpse].plus )) { case CE_CLEAN: - pot_type = (power_up ? POT_CONFUSION : - one_chance_in(30)? POT_BLOOD : POT_WATER); + pot_type = (power_up ? POT_CONFUSION : POT_WATER); break; case CE_CONTAMINATED: |