diff options
| author | Samuel Bronson <naesten@gmail.com> | 2011-11-04 15:29:18 -0400 |
|---|---|---|
| committer | Samuel Bronson <naesten@gmail.com> | 2011-11-04 15:29:18 -0400 |
| commit | 12762188ceb8a3e409b7271395ed20ba9cdbe519 (patch) | |
| tree | 7f5fc8838dd793fa7c40141e74d477845fac0c71 /crawl-ref/source/spl-wpnench.cc | |
| parent | b546ac8b9edf654f3d0ff78cc5db7e1d6ffd2f97 (diff) | |
| parent | fdc3c9bb603f95abfa592bcbbc65ba6e5dd1f99e (diff) | |
| download | crawl-ref-12762188ceb8a3e409b7271395ed20ba9cdbe519.tar.gz crawl-ref-12762188ceb8a3e409b7271395ed20ba9cdbe519.zip | |
Merge branch 'master' into unified_combat_control with help of -X patience
As usual, lots of the changes to master's fight.cc were to things that are
in our melee_attack.cc, so were applied there instead.
Conflicts:
crawl-ref/source/fight.cc
crawl-ref/source/melee_attack.h
Diffstat (limited to 'crawl-ref/source/spl-wpnench.cc')
| -rw-r--r-- | crawl-ref/source/spl-wpnench.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-wpnench.cc b/crawl-ref/source/spl-wpnench.cc index f105a4d48e..aa7f3ca287 100644 --- a/crawl-ref/source/spl-wpnench.cc +++ b/crawl-ref/source/spl-wpnench.cc @@ -177,7 +177,7 @@ spret_type brand_weapon(brand_type which_brand, int power, bool fail) case SPWPN_DISTORTION: msg += " seems to "; - msg += random_choose_string("twist", "bend", "vibrate", + msg += random_choose("twist", "bend", "vibrate", "flex", "wobble", "twang", NULL); msg += (coinflip() ? " oddly." : " strangely."); duration_affected = 5; |