From b141fc02667821e0673eb96219214cdbc080d854 Mon Sep 17 00:00:00 2001 From: haranp Date: Mon, 25 Dec 2006 13:45:00 +0000 Subject: Implemented 1617200: Changed armour skill training. Once the original EV penalty is gone (i.e., at an armour skill of 3 * EV penalty), passive training will train stealth instead of armour (as if the player were wearing light armour); also, getting hit in this situation can train both dodging and armour. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@705 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 28de9957b6..e890104bed 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3033,7 +3033,7 @@ static int affect_player( struct bolt &beam ) if (beam.is_beam) { // beams can be dodged - if (player_light_armour() + if (player_light_armour(true) && !beam.aimed_at_feet && coinflip()) { exercise(SK_DODGING, 1); @@ -3086,7 +3086,7 @@ static int affect_player( struct bolt &beam ) exercise( SK_SHIELDS, exer ); } - if (player_light_armour() && !beam.aimed_at_feet + if (player_light_armour(true) && !beam.aimed_at_feet && coinflip()) exercise(SK_DODGING, 1); @@ -3281,7 +3281,7 @@ static int affect_player( struct bolt &beam ) if (you.equip[EQ_BODY_ARMOUR] != -1) { - if (!player_light_armour() && one_chance_in(4) + if (!player_light_armour(false) && one_chance_in(4) && random2(1000) <= item_mass( you.inv[you.equip[EQ_BODY_ARMOUR]] )) { exercise( SK_ARMOUR, 1 ); -- cgit v1.2.3-54-g00ecf