diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 16:17:48 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 16:17:48 +0000 |
| commit | 7b7a36d0531a016ba81520bec2a4a4177e2ca8ed (patch) | |
| tree | 2054ca1b5243de711a38a2751edc06f39d92b001 /crawl-ref/source/effects.cc | |
| parent | 5443a68f96b0ba24b0de77573ad36a5633b39cd7 (diff) | |
| download | crawl-ref-7b7a36d0531a016ba81520bec2a4a4177e2ca8ed.tar.gz crawl-ref-7b7a36d0531a016ba81520bec2a4a4177e2ca8ed.zip | |
Yikes, so many files! And all I did was add more item evaluation
functions for menu colouring and pickup...
Added: emergency_item, good_item, dangerous_item, bad_item, and
useless_item, all taking into account player species and
mutations, so e.g. =see invisible is useless for Naga,
and !poison is always bad but only useless if you don't
know Evaporate.
Never autopickup useless, dangerous (e.g. ?immolation) or inedible items,
and simplify the item colour/pickup options accordingly. I'll have to
see if pickup.lua is still even needed after this.
Removed the menu_colour_prefix_id option as I can't see any reason to
turn it off.
Oh, and fixed a bug where Kenku were unable to stop levitating if they
gained level 15 while levitating.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5658 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index d394a173bd..f391c4520c 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1693,28 +1693,24 @@ bool acquirement(object_class_type class_wanted, int agent, case WPN_GREAT_SWORD: case WPN_TRIPLE_SWORD: - thing.sub_type = - (coinflip() ? WPN_FALCHION : WPN_LONG_SWORD); + thing.sub_type = (coinflip() ? WPN_FALCHION : WPN_LONG_SWORD); break; case WPN_GREAT_MACE: case WPN_DIRE_FLAIL: - thing.sub_type = - (coinflip() ? WPN_MACE : WPN_FLAIL); + thing.sub_type = (coinflip() ? WPN_MACE : WPN_FLAIL); break; case WPN_BATTLEAXE: case WPN_EXECUTIONERS_AXE: - thing.sub_type = - (coinflip() ? WPN_HAND_AXE : WPN_WAR_AXE); + thing.sub_type = (coinflip() ? WPN_HAND_AXE : WPN_WAR_AXE); break; case WPN_HALBERD: case WPN_GLAIVE: case WPN_SCYTHE: case WPN_BARDICHE: - thing.sub_type = - (coinflip() ? WPN_SPEAR : WPN_TRIDENT); + thing.sub_type = (coinflip() ? WPN_SPEAR : WPN_TRIDENT); break; } break; @@ -2537,13 +2533,13 @@ void handle_time( long time_delta ) mpr("Your body shudders with the violent release " "of wild energies!", MSGCH_WARN); - // for particularly violent releases, make a little boom + // For particularly violent releases, make a little boom. if (you.magic_contamination >= 10 && coinflip()) { struct bolt boom; - boom.type = dchar_glyph(DCHAR_FIRED_BURST); - boom.colour = BLACK; - boom.flavour = BEAM_RANDOM; + boom.type = dchar_glyph(DCHAR_FIRED_BURST); + boom.colour = BLACK; + boom.flavour = BEAM_RANDOM; boom.target_x = you.x_pos; boom.target_y = you.y_pos; // Undead enjoy extra contamination explosion damage because @@ -2554,11 +2550,11 @@ void handle_time( long time_delta ) you.magic_contamination * (you.is_undead? 4 : 2) / 4 ); - boom.thrower = KILL_MISC; - boom.aux_source = "a magical explosion"; - boom.beam_source = NON_MONSTER; - boom.is_beam = false; - boom.is_tracer = false; + boom.thrower = KILL_MISC; + boom.aux_source = "a magical explosion"; + boom.beam_source = NON_MONSTER; + boom.is_beam = false; + boom.is_tracer = false; boom.is_explosion = true; boom.name = "magical storm"; |