diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 14:36:42 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-08 14:36:42 +0000 |
| commit | d90d42364935634477497d3397f8a46ad7a5ccf3 (patch) | |
| tree | 05e068057f95893a9966d6a33ccea131cdc3fa53 /crawl-ref/source/delay.cc | |
| parent | 596223a14698390d7eb422e80939f460a5f32a2f (diff) | |
| download | crawl-ref-d90d42364935634477497d3397f8a46ad7a5ccf3.tar.gz crawl-ref-d90d42364935634477497d3397f8a46ad7a5ccf3.zip | |
* Add sharks. They go into a battle frenzy if they smell blood.
* Make harpies actually appear in packs. (Oops...)
* Properly pluralise hippogriffs as such.
* Regard butcher swap prompt as safe and default to 'n'.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7784 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
| -rw-r--r-- | crawl-ref/source/delay.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index b12f293868..c05b65fc49 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -126,9 +126,9 @@ static int _recite_to_monsters(coord_def where, int pow, int unused) { simple_monster_message(mons, " speeds up in annoyance!"); } - else if (!one_chance_in(3) && - mons->add_ench(mon_enchant(ENCH_BATTLE_FRENZY, 1, KC_YOU, - (16 + random2avg(13, 2)) * 10))) + else if (!one_chance_in(3) + && mons->add_ench(mon_enchant(ENCH_BATTLE_FRENZY, 1, KC_YOU, + (16 + random2avg(13, 2)) * 10))) { simple_monster_message(mons, " goes into a battle-frenzy!"); } @@ -576,7 +576,7 @@ void handle_interrupted_swap(bool swap_if_safe, bool force_unsafe) else if (you.turn_is_over && delay == DELAY_NOT_DELAYED) { // Turn is over, set up a delay to do swapping next turn. - if (prompt && yesno(prompt_str, false) || safe && swap_if_safe) + if (prompt && yesno(prompt_str, true, 'n') || safe && swap_if_safe) { start_delay(DELAY_WEAPON_SWAP, 1, weap); you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0; |