multishot by monsters, plus reformatting

Some reformatting of the recently added pet ranged attack code.

The redundant--but different--multishot volley code has been replaced
so that there are only two versions (hero and monster) instead of
three (hero and monster vs hero and pet vs other monster).  The monst
version was out of date relative to post-3.4.3 changes to the hero one.
The pet version was way out of date and had some bugs:  wielding an
elven bow gave a +1 multishot increment to volley count for fast weapon
even when throwing something rather than shooting arrows, wielding any
weapon which had at least +2 enchantment gave 1/3 enchantment bonus to
volley count when throwing instead of shooting shoot ammo, and a pet
which got killed in the midst of a multishot volley--perhaps by a gas
spore explosion or some other passive counterattack--would keep on
shooting/throwing until the volley count was exhausted.

Pet use of ranged weapons is not ready for prime-time.  Pets don't
hang on to missiles or launchers+ammo, they just drop them if there is
no target immediately available.

This commit is contained in:

PatR

2016-06-06 17:42:58 -07:00

parent e276540230

commit 8c0810f687

5 changed files with 333 additions and 367 deletions

									
										2

src/end.c
									
												View File
												
				@@ -781,6 +781,8 @@ int how;

				    u.ugrave_arise = NON_PM;

				    HUnchanging = 0L;

				    curs_on_u();

				    if (!context.mon_moving)

				        endmultishot(FALSE);

				}

				/*

multishot by monsters, plus reformatting

2 src/end.c Unescape Escape View File

2

src/end.c

View File