ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/monster.C

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.18 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.56 by root, Sat Dec 27 08:41:44 2008 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	#include <global.h>	24	#include <global.h>
25	#include <sproto.h>	25	#include <sproto.h>
26	#include <spells.h>	26	#include <spells.h>
27	#include <skills.h>	27	#include <skills.h>
…		…
35	* set to sane values.	35	* set to sane values.
36	*/	36	*/
37	object *	37	object *
38	check_enemy (object *npc, rv_vector * rv)	38	check_enemy (object *npc, rv_vector * rv)
39	{	39	{
40
41	/* if this is pet, let him attack the same enemy as his owner	40	/* if this is pet, let him attack the same enemy as his owner
42	* TODO: when there is no ower enemy, try to find a target,	41	* TODO: when there is no ower enemy, try to find a target,
43	* which CAN attack the owner. */	42	* which CAN attack the owner. */
44	if ((npc->attack_movement & HI4) == PETMOVE)	43	if ((npc->attack_movement & HI4) == PETMOVE)
45	{	44	{
…		…
84	* target enemy - this code below makes sure the enemy is something	83	* target enemy - this code below makes sure the enemy is something
85	* that should be attacked. My guess is that the arrow hits	84	* that should be attacked. My guess is that the arrow hits
86	* the creature/owner, and so the creature then takes that	85	* the creature/owner, and so the creature then takes that
87	* as the enemy to attack.	86	* as the enemy to attack.
88	*/	87	*/
89	else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER) &&	88	else if (!QUERY_FLAG (npc->enemy, FLAG_MONSTER)
90	!QUERY_FLAG (npc->enemy, FLAG_GENERATOR) && npc->enemy->type != PLAYER && npc->enemy->type != GOLEM)	89	&& !QUERY_FLAG (npc->enemy, FLAG_GENERATOR)
		90	&& npc->enemy->type != PLAYER
		91	&& npc->enemy->type != GOLEM)
91	npc->enemy = NULL;	92	npc->enemy = NULL;
92		93
93	}	94	}
		95
94	return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL;	96	return can_detect_enemy (npc, npc->enemy, rv) ? npc->enemy : NULL;
95	}	97	}
96		98
97	/* Returns the nearest living creature (monster or generator).	99	/* Returns the nearest living creature (monster or generator).
98	* Modified to deal with tiled maps properly.	100	* Modified to deal with tiled maps properly.
…		…
112	find_nearest_living_creature (object *npc)	114	find_nearest_living_creature (object *npc)
113	{	115	{
114	int i, mflags;	116	int i, mflags;
115	sint16 nx, ny;	117	sint16 nx, ny;
116	maptile *m;	118	maptile *m;
117	object *tmp;
118	int search_arr[SIZEOFFREE];	119	int search_arr[SIZEOFFREE];
119		120
120	get_search_arr (search_arr);	121	get_search_arr (search_arr);
		122
121	for (i = 0; i < SIZEOFFREE; i++)	123	for (i = 0; i < SIZEOFFREE; i++)
122	{	124	{
123	/* modified to implement smart searching using search_arr	125	/* modified to implement smart searching using search_arr
124	* guidance array to determine direction of search order	126	* guidance array to determine direction of search order
125	*/	127	*/
126	nx = npc->x + freearr_x[search_arr[i]];	128	nx = npc->x + freearr_x[search_arr[i]];
127	ny = npc->y + freearr_y[search_arr[i]];	129	ny = npc->y + freearr_y[search_arr[i]];
128	m = npc->map;	130	m = npc->map;
129		131
130	mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);	132	mflags = get_map_flags (m, &m, nx, ny, &nx, &ny);
		133
131	if (mflags & P_OUT_OF_MAP)	134	if (mflags & P_OUT_OF_MAP)
132	continue;	135	continue;
133		136
134	if (mflags & P_IS_ALIVE)	137	if (mflags & P_IS_ALIVE)
135	{	138	{
136	tmp = GET_MAP_OB (m, nx, ny);	139	for (object *tmp = m->at (nx, ny).top; tmp; tmp = tmp->below)
137	while (tmp != NULL && !QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_GENERATOR) && tmp->type != PLAYER)	140	if (tmp->flag [FLAG_MONSTER] || tmp->flag [FLAG_GENERATOR] || tmp->type == PLAYER)
138	tmp = tmp->above;
139
140	if (!tmp)
141	{
142	LOG (llevDebug, "find_nearest_living_creature: map %s (%d,%d) has is_alive set but did not find a monster?\n",
143	m->path, nx, ny);
144	}
145	else
146	{
147	if (can_see_monsterP (m, nx, ny, i))	141	if (can_see_monsterP (m, nx, ny, i))
148	return tmp;	142	return tmp;
149	}	143	}
150	} /* is something living on this space */
151	}	144	}
152	return NULL; /* nothing found */
153	}
154		145
		146	return 0;
		147	}
155		148
156	/* Tries to find an enmy for npc. We pass the range vector since	149	/* Tries to find an enemy for npc. We pass the range vector since
157	* our caller will find the information useful.	150	* our caller will find the information useful.
158	* Currently, only move_monster calls this function.	151	* Currently, only move_monster calls this function.
159	* Fix function so that we always make calls to get_rangevector	152	* Fix function so that we always make calls to get_rangevector
160	* if we have a valid target - function as not doing so in	153	* if we have a valid target - function as not doing so in
161	* many cases.	154	* many cases.
162	*/	155	*/
163
164	object *	156	object *
165	find_enemy (object *npc, rv_vector * rv)	157	find_enemy (object *npc, rv_vector * rv)
166	{	158	{
167	object *attacker, *tmp = NULL;	159	object *attacker, *tmp = NULL;
168		160
…		…
174	{	166	{
175	tmp = find_nearest_living_creature (npc);	167	tmp = find_nearest_living_creature (npc);
176		168
177	if (tmp)	169	if (tmp)
178	get_rangevector (npc, tmp, rv, 0);	170	get_rangevector (npc, tmp, rv, 0);
		171
179	return tmp;	172	return tmp;
180	}	173	}
181		174
182	/* Here is the main enemy selection.	175	/* Here is the main enemy selection.
183	* We want this: if there is an enemy, attack him until its not possible or	176	* We want this: if there is an enemy, attack him until its not possible or
…		…
203	/* we check our old enemy. */	196	/* we check our old enemy. */
204	if (!(tmp = check_enemy (npc, rv)))	197	if (!(tmp = check_enemy (npc, rv)))
205	{	198	{
206	if (attacker) /* if we have an attacker, check him */	199	if (attacker) /* if we have an attacker, check him */
207	{	200	{
208	/* TODO: thats not finished */	201	/* TODO: that's not finished */
209	/* we don't want a fight evil vs evil or good against non evil */	202	/* we don't want a fight evil vs evil or good against non evil */
210		203
211	if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */	204	if (QUERY_FLAG (npc, FLAG_NEUTRAL) || QUERY_FLAG (attacker, FLAG_NEUTRAL) || /* neutral */
212	(QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) ||	205	(QUERY_FLAG (npc, FLAG_FRIENDLY) && QUERY_FLAG (attacker, FLAG_FRIENDLY)) ||
213	(!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER)))	206	(!QUERY_FLAG (npc, FLAG_FRIENDLY) && (!QUERY_FLAG (attacker, FLAG_FRIENDLY) && attacker->type != PLAYER)))
214	CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */	207	CLEAR_FLAG (npc, FLAG_SLEEP); /* skip it, but lets wakeup */
215	else if (on_same_map (npc, attacker)) /* thats the only thing we must know... */	208	else if (on_same_map (npc, attacker)) /* that's the only thing we must know... */
216	{	209	{
217	CLEAR_FLAG (npc, FLAG_SLEEP); /* well, NOW we really should wake up! */	210	CLEAR_FLAG (npc, FLAG_SLEEP); /* well, NOW we really should wake up! */
218	npc->enemy = attacker;	211	npc->enemy = attacker;
219	return attacker; /* yes, we face our attacker! */	212	return attacker; /* yes, we face our attacker! */
220	}	213	}
…		…
236	/* Sees if this monster should wake up.	229	/* Sees if this monster should wake up.
237	* Currently, this is only called from move_monster, and	230	* Currently, this is only called from move_monster, and
238	* if enemy is set, then so should be rv.	231	* if enemy is set, then so should be rv.
239	* returns 1 if the monster should wake up, 0 otherwise.	232	* returns 1 if the monster should wake up, 0 otherwise.
240	*/	233	*/
241
242	int	234	int
243	check_wakeup (object *op, object *enemy, rv_vector * rv)	235	check_wakeup (object *op, object *enemy, rv_vector *rv)
244	{	236	{
245	int radius = op->stats.Wis > MIN_MON_RADIUS ? op->stats.Wis : MIN_MON_RADIUS;
246
247	/* Trim work - if no enemy, no need to do anything below */	237	/* Trim work - if no enemy, no need to do anything below */
248	if (!enemy)	238	if (!enemy)
249	return 0;	239	return 0;
250		240
		241	int radius = max (op->stats.Wis, MIN_MON_RADIUS);
		242
		243	if (op->flag [FLAG_BLIND])
251	/* blinded monsters can only find nearby objects to attack */	244	/* blinded monsters can only find nearby objects to attack */
252	if (QUERY_FLAG (op, FLAG_BLIND))
253	radius = MIN_MON_RADIUS;	245	radius = MIN_MON_RADIUS;
254		246	else if (op->map
		247	&& !enemy->invisible
		248	&& !stand_in_light (enemy)
		249	&& (!op->flag[FLAG_SEE_IN_DARK] || !op->flag [FLAG_SEE_INVISIBLE]))
255	/* This covers the situation where the monster is in the dark	250	/* This covers the situation where the monster is in the dark
256	* and has an enemy. If the enemy has no carried light (or isnt	251	* and has an enemy. If the enemy has no carried light (or isnt
257	* glowing!) then the monster has trouble finding the enemy.	252	* glowing!) then the monster has trouble finding the enemy.
258	* Remember we already checked to see if the monster can see in	253	* Remember we already checked to see if the monster can see in
259	* the dark. */	254	* the dark. */
260		255	radius = min (radius, MIN_MON_RADIUS + MAX_DARKNESS - op->map->darklevel ());
261	else if (op->map && op->map->darkness > 0 && enemy && !enemy->invisible &&	256	else if (!op->flag [FLAG_SLEEP])
262	!stand_in_light (enemy) && (!QUERY_FLAG (op, FLAG_SEE_IN_DARK) || !QUERY_FLAG (op, FLAG_SEE_INVISIBLE)))
263	{
264	int dark = radius / (op->map->darkness);
265
266	radius = (dark > MIN_MON_RADIUS) ? (dark + 1) : MIN_MON_RADIUS;
267	}
268	else if (!QUERY_FLAG (op, FLAG_SLEEP))
269	return 1;	257	return 1;
		258
		259	if (enemy->flag [FLAG_STEALTH])
		260	radius = radius / 2 + 1;
270		261
271	/* enemy should already be on this map, so don't really need to check	262	/* enemy should already be on this map, so don't really need to check
272	* for that.	263	* for that.
273	*/	264	*/
274	if (rv->distance < (unsigned int) (QUERY_FLAG (enemy, FLAG_STEALTH) ? (radius / 2) + 1 : radius))	265	if (rv->distance <= radius)
275	{	266	{
276	CLEAR_FLAG (op, FLAG_SLEEP);	267	CLEAR_FLAG (op, FLAG_SLEEP);
277	return 1;	268	return 1;
278	}	269	}
		270
279	return 0;	271	return 0;
280	}	272	}
281		273
282	int	274	int
283	move_randomly (object *op)	275	move_randomly (object *op)
284	{	276	{
285	int i;
286
287	/* Give up to 15 chances for a monster to move randomly */	277	/* Give up to 15 chances for a monster to move randomly */
288	for (i = 0; i < 15; i++)	278	for (int i = 0; i < 15; i++)
289	{
290	if (move_object (op, RANDOM () % 8 + 1))	279	if (move_object (op, rndm (8) + 1))
291	return 1;	280	return 1;
292	}	281
293	return 0;	282	return 0;
294	}	283	}
295		284
296	/*	285	/*
297	* Move-monster returns 1 if the object has been freed, otherwise 0.	286	* Move-monster returns 1 if the object has been freed, otherwise 0.
298	*/	287	*/
299
300	int	288	int
301	move_monster (object *op)	289	move_monster (object *op)
302	{	290	{
303	int dir, diff, pre_att_dir; /* elmex: pre_att_dir remembers the direction before attack movement */	291	int dir, diff, pre_att_dir; /* elmex: pre_att_dir remembers the direction before attack movement */
304	object *owner, *enemy, *part, *oph = op;	292	object *owner, *enemy, *part, *oph = op;
…		…
321	enemy->attacked_by = op; /* our ptr */	309	enemy->attacked_by = op; /* our ptr */
322		310
323	/* generate hp, if applicable */	311	/* generate hp, if applicable */
324	if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp)	312	if (op->stats.Con > 0 && op->stats.hp < op->stats.maxhp)
325	{	313	{
326
327	/* last heal is in funny units. Dividing by speed puts	314	/* last heal is in funny units. Dividing by speed puts
328	* the regeneration rate on a basis of time instead of	315	* the regeneration rate on a basis of time instead of
329	* #moves the monster makes. The scaling by 8 is	316	* #moves the monster makes. The scaling by 8 is
330	* to capture 8th's of a hp fraction regens	317	* to capture 8th's of a hp fraction regens
331	*	318	*
…		…
336	op->last_heal += (int) ((float) (8 * op->stats.Con) / FABS (op->speed));	323	op->last_heal += (int) ((float) (8 * op->stats.Con) / FABS (op->speed));
337	op->stats.hp = MIN ((sint32) op->stats.hp + op->last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */	324	op->stats.hp = MIN ((sint32) op->stats.hp + op->last_heal / 32, op->stats.maxhp); /* causes Con/4 hp/tick */
338	op->last_heal %= 32;	325	op->last_heal %= 32;
339		326
340	/* So if the monster has gained enough HP that they are no longer afraid */	327	/* So if the monster has gained enough HP that they are no longer afraid */
341	if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short) (((float) op->run_away / (float) 100) * (float) op->stats.maxhp))	328	if (QUERY_FLAG (op, FLAG_RUN_AWAY) && op->stats.hp >= (signed short)(((float)op->run_away / 100.f) * (float)op->stats.maxhp))
342	CLEAR_FLAG (op, FLAG_RUN_AWAY);	329	CLEAR_FLAG (op, FLAG_RUN_AWAY);
343		330
344	if (op->stats.hp > op->stats.maxhp)	331	if (op->stats.hp > op->stats.maxhp)
345	op->stats.hp = op->stats.maxhp;	332	op->stats.hp = op->stats.maxhp;
346	}	333	}
347		334
348	/* generate sp, if applicable */	335	/* generate sp, if applicable */
349	if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)	336	if (op->stats.Pow > 0 && op->stats.sp < op->stats.maxsp)
350	{	337	{
351
352	/* last_sp is in funny units. Dividing by speed puts	338	/* last_sp is in funny units. Dividing by speed puts
353	* the regeneration rate on a basis of time instead of	339	* the regeneration rate on a basis of time instead of
354	* #moves the monster makes. The scaling by 8 is	340	* #moves the monster makes. The scaling by 8 is
355	* to capture 8th's of a sp fraction regens	341	* to capture 8th's of a sp fraction regens
356	*	342	*
357	* Cast to sint32 before comparing to maxhp since otherwise an (sint16)	343	* Cast to sint32 before comparing to maxhp since otherwise an (sint16)
358	* overflow might produce monsters with negative sp.	344	* overflow might produce monsters with negative sp.
359	*/	345	*/
360		346
361	op->last_sp += (int) ((float) (8 * op->stats.Pow) / FABS (op->speed));	347	op->last_sp += (int) ((float) (8 * op->stats.Pow) / fabsf (op->speed));
362	op->stats.sp = MIN (op->stats.sp + op->last_sp / 128, op->stats.maxsp); /* causes Pow/16 sp/tick */	348	op->stats.sp = min (op->stats.sp + op->last_sp / 128, op->stats.maxsp); /* causes Pow/16 sp/tick */
363	op->last_sp %= 128;	349	op->last_sp %= 128;
364	}	350	}
365		351
366	/* this should probably get modified by many more values.	352	/* this should probably get modified by many more values.
367	* (eg, creatures resistance to fear, level, etc. )	353	* (eg, creatures resistance to fear, level, etc. )
368	*/	354	*/
369	if (QUERY_FLAG (op, FLAG_SCARED) && !(RANDOM () % 20))	355	if (QUERY_FLAG (op, FLAG_SCARED) && !(rndm (20)))
370	{
371	CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */	356	CLEAR_FLAG (op, FLAG_SCARED); /* Time to regain some "guts"... */
372	}
373		357
374	if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))	358	if (INVOKE_OBJECT (MONSTER_MOVE, op, ARG_OBJECT (op->enemy)))
375	return QUERY_FLAG (op, FLAG_FREED);	359	return QUERY_FLAG (op, FLAG_FREED);
376		360
377	if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) ||	361	if (QUERY_FLAG (op, FLAG_SLEEP) || QUERY_FLAG (op, FLAG_BLIND) ||
378	((op->map->darkness > 0) && !QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !QUERY_FLAG (op, FLAG_SEE_INVISIBLE)))	362	((op->map->darklevel () > 0) && !QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !QUERY_FLAG (op, FLAG_SEE_INVISIBLE)))
379	{
380	if (!check_wakeup (op, enemy, &rv))	363	if (!check_wakeup (op, enemy, &rv))
381	return 0;	364	return 0;
382	}
383		365
384	/* check if monster pops out of hidden spot */	366	/* check if monster pops out of hidden spot */
385	if (op->hide)	367	if (op->flag [FLAG_HIDDEN])
386	do_hidden_move (op);	368	do_hidden_move (op);
387		369
388	if (op->pick_up)	370	if (op->pick_up)
389	monster_check_pickup (op);	371	monster_check_pickup (op);
390		372
…		…
394	/* If we don't have an enemy, do special movement or the like */	376	/* If we don't have an enemy, do special movement or the like */
395	if (!enemy)	377	if (!enemy)
396	{	378	{
397	if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))	379	if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
398	{	380	{
399	op->destroy ();	381	op->drop_and_destroy ();
400	return 1;	382	return 1;
401	}	383	}
402		384
403	/* Probably really a bug for a creature to have both	385	/* Probably really a bug for a creature to have both
404	* stand still and a movement type set.	386	* stand still and a movement type set.
…		…
407	{	389	{
408	if (op->attack_movement & HI4)	390	if (op->attack_movement & HI4)
409	{	391	{
410	switch (op->attack_movement & HI4)	392	switch (op->attack_movement & HI4)
411	{	393	{
412	case (PETMOVE):	394	case (PETMOVE):
413	pet_move (op);	395	pet_move (op);
414	break;	396	break;
415		397
416	case (CIRCLE1):	398	case (CIRCLE1):
417	circ1_move (op);	399	circ1_move (op);
418	break;	400	break;
419		401
420	case (CIRCLE2):	402	case (CIRCLE2):
421	circ2_move (op);	403	circ2_move (op);
422	break;	404	break;
423		405
424	case (PACEV):	406	case (PACEV):
425	pace_movev (op);	407	pace_movev (op);
426	break;	408	break;
427		409
428	case (PACEH):	410	case (PACEH):
429	pace_moveh (op);	411	pace_moveh (op);
430	break;	412	break;
431		413
432	case (PACEV2):	414	case (PACEV2):
433	pace2_movev (op);	415	pace2_movev (op);
434	break;	416	break;
435		417
436	case (PACEH2):	418	case (PACEH2):
437	pace2_moveh (op);	419	pace2_moveh (op);
438	break;	420	break;
439		421
440	case (RANDO):	422	case (RANDO):
441	rand_move (op);	423	rand_move (op);
442	break;	424	break;
443		425
444	case (RANDO2):	426	case (RANDO2):
445	move_randomly (op);	427	move_randomly (op);
446	break;	428	break;
447	}	429	}
		430
448	return 0;	431	return 0;
449	}	432	}
450	else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE))	433	else if (QUERY_FLAG (op, FLAG_RANDOM_MOVE))
451	(void) move_randomly (op);	434	move_randomly (op);
452
453	} /* stand still */	435	} /* stand still */
		436
454	return 0;	437	return 0;
455	} /* no enemy */	438	} /* no enemy */
456		439
457	/* We have an enemy. Block immediately below is for pets */	440	/* We have an enemy. Block immediately below is for pets */
458	if ((op->attack_movement & HI4) == PETMOVE && (owner = op->owner) != NULL && !on_same_map (op, owner))	441	if ((op->attack_movement & HI4) == PETMOVE
		442	&& (owner = op->owner) != NULL
		443	&& !on_same_map (op, owner)
		444	&& !owner->flag [FLAG_REMOVED])
459	return follow_owner (op, owner);	445	return follow_owner (op, owner);
460		446
461	/* doppleganger code to change monster facing to that of the nearest	447	/* doppleganger code to change monster facing to that of the nearest
462	* player. Hmm. The code is here, but no monster in the current	448	* player. Hmm. The code is here, but no monster in the current
463	* arch set uses it.	449	* arch set uses it.
464	*/	450	*/
465	if ((op->race != NULL) && strcmp (op->race, "doppleganger") == 0)	451	if (op->race && strcmp (op->race, "doppleganger") == 0)
466	{	452	{
467	op->face = enemy->face;	453	op->face = enemy->face;
468	op->name = enemy->name;	454	op->name = enemy->name;
469	}	455	}
470		456
…		…
482	if (!QUERY_FLAG (op, FLAG_SCARED))	468	if (!QUERY_FLAG (op, FLAG_SCARED))
483	{	469	{
484	rv_vector rv1;	470	rv_vector rv1;
485		471
486	/* now we test every part of an object .... this is a real ugly piece of code */	472	/* now we test every part of an object .... this is a real ugly piece of code */
487	for (part = op; part != NULL; part = part->more)	473	for (part = op; part; part = part->more)
488	{	474	{
489	get_rangevector (part, enemy, &rv1, 0x1);	475	get_rangevector (part, enemy, &rv1, 0x1);
490	dir = rv1.direction;	476	dir = rv1.direction;
491		477
492	/* hm, not sure about this part - in original was a scared flag here too	478	/* hm, not sure about this part - in original was a scared flag here too
493	* but that we test above... so can be old code here	479	* but that we test above... so can be old code here
494	*/	480	*/
495	if (QUERY_FLAG (op, FLAG_RUN_AWAY))	481	if (QUERY_FLAG (op, FLAG_RUN_AWAY))
496	dir = absdir (dir + 4);	482	dir = absdir (dir + 4);
		483
497	if (QUERY_FLAG (op, FLAG_CONFUSED))	484	if (QUERY_FLAG (op, FLAG_CONFUSED))
498	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	485	dir = absdir (dir + rndm (3) + rndm (3) - 2);
499		486
500	if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(RANDOM () % 3))	487	if (QUERY_FLAG (op, FLAG_CAST_SPELL) && !(rndm (3)))
501	{
502	if (monster_cast_spell (op, part, enemy, dir, &rv1))	488	if (monster_cast_spell (op, part, enemy, dir, &rv1))
503	return 0;	489	return 0;
504	}
505		490
506	if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(RANDOM () % 3))	491	if (QUERY_FLAG (op, FLAG_READY_SCROLL) && !(rndm (3)))
507	{
508	if (monster_use_scroll (op, part, enemy, dir, &rv1))	492	if (monster_use_scroll (op, part, enemy, dir, &rv1))
509	return 0;	493	return 0;
510	}
511		494
512	if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(RANDOM () % 3))	495	if (QUERY_FLAG (op, FLAG_READY_RANGE) && !(rndm (3)))
513	{
514	if (monster_use_range (op, part, enemy, dir))	496	if (monster_use_range (op, part, enemy, dir))
515	return 0;	497	return 0;
516	}	498
517	if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(RANDOM () % 3))	499	if (QUERY_FLAG (op, FLAG_READY_SKILL) && !(rndm (3)))
518	{
519	if (monster_use_skill (op, rv.part, enemy, rv.direction))	500	if (monster_use_skill (op, rv.part, enemy, rv.direction))
520	return 0;	501	return 0;
521	}	502
522	if (QUERY_FLAG (op, FLAG_READY_BOW) && !(RANDOM () % 2))	503	if (QUERY_FLAG (op, FLAG_READY_BOW) && !(rndm (2)))
523	{
524	if (monster_use_bow (op, part, enemy, dir))	504	if (monster_use_bow (op, part, enemy, dir))
525	return 0;	505	return 0;
526	}
527	} /* for processing of all parts */	506	} /* for processing of all parts */
528	} /* If not scared */	507	} /* If not scared */
529		508
530
531	part = rv.part;	509	part = rv.part;
532	dir = rv.direction;	510	dir = rv.direction;
533		511
		512	#if DEVEL
		513	// if the enemy is a player, we have los. if los says we
		514	// can directly reach the player, we do not deviate.
		515	// for non-players, we never deviate
		516	if (enemy->contr && enemy->contr->darkness_at (op->map, op->x, op->y) == LOS_BLOCKED)
		517	{
		518	int sdir = 0;
		519
		520	for (int dir = 1; dir <= 8; ++dir)
		521	{
		522	mapxy pos (op); pos.move (dir);
		523	if (pos.normalise ())
		524	{
		525	mapspace &ms = pos.ms ();
		526
		527	if (ms.smell > op->ms ().smell)
		528	{
		529	printf ("%s: found smell, following it, apparently (%d, %d)\n",& op->name,op->ms().smell,ms.smell);//D
		530	op->ms ().smell = ms.smell - 1;
		531	sdir = dir;
		532
		533	// perturbing the path might let the monster lose track,
		534	// but it will also wide the actual path, spreading information
		535	if (!rndm (20))
		536	sdir += absdir (1 - rndm (2) * 2);
		537	}
		538	}
		539	}
		540
		541	if (sdir)
		542	dir = sdir;
		543	else
		544	// no better smell found, so assume the player jumped, and erase this smell
		545	{if (op->ms ().smell) printf ("erasing smell %d\n", op->ms ().smell);//D
		546	ordered_mapwalk_begin (op, -1, -1, 1, 1)
		547	if (m)
		548	m->at (nx, ny).smell = 0;
		549	ordered_mapwalk_end
		550	}//D
		551	}
		552
		553	#endif
		554
534	if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY))	555	if (QUERY_FLAG (op, FLAG_SCARED) || QUERY_FLAG (op, FLAG_RUN_AWAY))
535	dir = absdir (dir + 4);	556	dir = absdir (dir + 4);
536		557
537	if (QUERY_FLAG (op, FLAG_CONFUSED))	558	if (QUERY_FLAG (op, FLAG_CONFUSED))
538	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	559	dir = absdir (dir + rndm (3) + rndm (3) - 2);
539		560
540	pre_att_dir = dir; /* remember the original direction */	561	pre_att_dir = dir; /* remember the original direction */
541		562
542	if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))	563	if ((op->attack_movement & LO4) && !QUERY_FLAG (op, FLAG_SCARED))
543	{	564	{
544	switch (op->attack_movement & LO4)	565	switch (op->attack_movement & LO4)
545	{	566	{
546	case DISTATT:	567	case DISTATT:
547	dir = dist_att (dir, op, enemy, part, &rv);	568	dir = dist_att (dir, op, enemy, part, &rv);
548	break;	569	break;
549		570
550	case RUNATT:	571	case RUNATT:
551	dir = run_att (dir, op, enemy, part, &rv);	572	dir = run_att (dir, op, enemy, part, &rv);
552	break;	573	break;
553		574
554	case HITRUN:	575	case HITRUN:
555	dir = hitrun_att (dir, op, enemy);	576	dir = hitrun_att (dir, op, enemy);
556	break;	577	break;
557		578
558	case WAITATT:	579	case WAITATT:
559	dir = wait_att (dir, op, enemy, part, &rv);	580	dir = wait_att (dir, op, enemy, part, &rv);
560	break;	581	break;
561		582
562	case RUSH: /* default - monster normally moves towards player */	583	case RUSH: /* default - monster normally moves towards player */
563	case ALLRUN:	584	case ALLRUN:
564	break;	585	break;
565		586
566	case DISTHIT:	587	case DISTHIT:
567	dir = disthit_att (dir, op, enemy, part, &rv);	588	dir = disthit_att (dir, op, enemy, part, &rv);
568	break;	589	break;
569		590
570	case WAIT2:	591	case WAIT2:
571	dir = wait_att2 (dir, op, enemy, part, &rv);	592	dir = wait_att2 (dir, op, enemy, part, &rv);
572	break;	593	break;
573		594
574	default:	595	default:
575	LOG (llevDebug, "Illegal low mon-move: %d\n", op->attack_movement & LO4);	596	LOG (llevDebug, "Illegal low mon-move: %d\n", op->attack_movement & LO4);
576	}	597	}
577	}	598	}
578		599
579	if (!dir)	600	if (!dir)
580	return 0;	601	return 0;
…		…
590	return 0;	611	return 0;
591	}	612	}
592		613
593	if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY))	614	if (QUERY_FLAG (op, FLAG_SCARED) || !can_hit (part, enemy, &rv) || QUERY_FLAG (op, FLAG_RUN_AWAY))
594	{	615	{
595
596	/* Try move around corners if !close */	616	/* Try move around corners if !close */
597	int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || RANDOM () & 1) ? 1 : 2;	617	int maxdiff = (QUERY_FLAG (op, FLAG_ONLY_ATTACK) || rndm (2)) ? 1 : 2;
598		618
599	for (diff = 1; diff <= maxdiff; diff++)	619	for (diff = 1; diff <= maxdiff; diff++)
600	{	620	{
601	/* try different detours */	621	/* try different detours */
602	int m = 1 - (RANDOM () & 2); /* Try left or right first? */	622	int m = 1 - rndm (2) * 2; /* Try left or right first? */
603		623
604	if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m)))	624	if (move_object (op, absdir (dir + diff * m)) || move_object (op, absdir (dir - diff * m)))
605	return 0;	625	return 0;
606	}	626	}
607	}	627	}
…		…
634	{	654	{
635	object *nearest_player = get_nearest_player (op);	655	object *nearest_player = get_nearest_player (op);
636		656
637	if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))	657	if (nearest_player && nearest_player != enemy && !can_hit (part, enemy, &rv))
638	{	658	{
639	op->enemy = NULL;	659	op->enemy = 0;
640	enemy = nearest_player;	660	enemy = nearest_player;
641	}	661	}
642	}	662	}
643		663
644	if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv))	664	if (!QUERY_FLAG (op, FLAG_SCARED) && can_hit (part, enemy, &rv))
…		…
650	* still be pretty nasty.	670	* still be pretty nasty.
651	*/	671	*/
652	if (QUERY_FLAG (op, FLAG_RUN_AWAY))	672	if (QUERY_FLAG (op, FLAG_RUN_AWAY))
653	{	673	{
654	part->stats.wc += 10;	674	part->stats.wc += 10;
655	(void) skill_attack (enemy, part, 0, NULL, NULL);	675	skill_attack (enemy, part, 0, NULL, NULL);
656	part->stats.wc -= 10;	676	part->stats.wc -= 10;
657	}	677	}
658	else	678	else
659	(void) skill_attack (enemy, part, 0, NULL, NULL);	679	skill_attack (enemy, part, 0, NULL, NULL);
660	} /* if monster is in attack range */	680	} /* if monster is in attack range */
661		681
662	if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */	682	if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */
663	return 1;	683	return 1;
664		684
665	if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))	685	if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
666	{	686	{
667	op->remove ();
668	op->destroy ();	687	op->drop_and_destroy ();
669	return 1;	688	return 1;
670	}	689	}
		690
671	return 0;	691	return 0;
672	}	692	}
673		693
674	int	694	int
675	can_hit (object *ob1, object *ob2, rv_vector * rv)	695	can_hit (object *ob1, object *ob2, rv_vector * rv)
676	{	696	{
677	object *more;	697	object *more;
678	rv_vector rv1;	698	rv_vector rv1;
679		699
680	if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(RANDOM () % 3))	700	if (QUERY_FLAG (ob1, FLAG_CONFUSED) && !(rndm (3)))
681	return 0;	701	return 0;
682		702
683	if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)	703	if (abs (rv->distance_x) < 2 && abs (rv->distance_y) < 2)
684	return 1;	704	return 1;
685		705
…		…
690	{	710	{
691	get_rangevector (ob1, more, &rv1, 0);	711	get_rangevector (ob1, more, &rv1, 0);
692	if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2)	712	if (abs (rv1.distance_x) < 2 && abs (rv1.distance_y) < 2)
693	return 1;	713	return 1;
694	}	714	}
		715
695	return 0;	716	return 0;
696
697	}	717	}
698		718
699	/* Returns 1 is monster should cast spell sp at an enemy	719	/* Returns 1 is monster should cast spell sp at an enemy
700	* Returns 0 if the monster should not cast this spell.	720	* Returns 0 if the monster should not cast this spell.
701	*	721	*
…		…
719	spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE ||	739	spell_ob->subtype == SP_EXPLOSION || spell_ob->subtype == SP_CONE ||
720	spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE ||	740	spell_ob->subtype == SP_BOMB || spell_ob->subtype == SP_SMITE ||
721	spell_ob->subtype == SP_MAGIC_MISSILE || spell_ob->subtype == SP_SUMMON_GOLEM ||	741	spell_ob->subtype == SP_MAGIC_MISSILE || spell_ob->subtype == SP_SUMMON_GOLEM ||
722	spell_ob->subtype == SP_MAGIC_WALL || spell_ob->subtype == SP_SUMMON_MONSTER ||	742	spell_ob->subtype == SP_MAGIC_WALL || spell_ob->subtype == SP_SUMMON_MONSTER ||
723	spell_ob->subtype == SP_MOVING_BALL || spell_ob->subtype == SP_SWARM || spell_ob->subtype == SP_INVISIBLE)	743	spell_ob->subtype == SP_MOVING_BALL || spell_ob->subtype == SP_SWARM || spell_ob->subtype == SP_INVISIBLE)
724
725	return 1;	744	return 1;
726		745
727	return 0;	746	return 0;
728	}	747	}
729
730		748
731	#define MAX_KNOWN_SPELLS 20	749	#define MAX_KNOWN_SPELLS 20
732		750
733	/* Returns a randomly selected spell. This logic is still	751	/* Returns a randomly selected spell. This logic is still
734	* less than ideal. This code also only seems to deal with	752	* less than ideal. This code also only seems to deal with
…		…
737	*/	755	*/
738	object *	756	object *
739	monster_choose_random_spell (object *monster)	757	monster_choose_random_spell (object *monster)
740	{	758	{
741	object *altern[MAX_KNOWN_SPELLS];	759	object *altern[MAX_KNOWN_SPELLS];
742	object *tmp;
743	int i = 0;	760	int i = 0;
744		761
745	for (tmp = monster->inv; tmp != NULL; tmp = tmp->below)	762	for (object *tmp = monster->inv; tmp; tmp = tmp->below)
746	if (tmp->type == SPELLBOOK || tmp->type == SPELL)	763	if (tmp->type == SPELLBOOK || tmp->type == SPELL)
747	{	764	{
748	/* Check and see if it's actually a useful spell.	765	/* Check and see if it's actually a useful spell.
749	* If its a spellbook, the spell is actually the inventory item.	766	* If its a spellbook, the spell is actually the inventory item.
750	* if it is a spell, then it is just the object itself.	767	* if it is a spell, then it is just the object itself.
751	*/	768	*/
752	if (monster_should_cast_spell (monster, (tmp->type == SPELLBOOK) ? tmp->inv : tmp))	769	if (monster_should_cast_spell (monster, (tmp->type == SPELLBOOK) ? tmp->inv : tmp))
753	{	770	{
754	altern[i++] = tmp;	771	altern [i++] = tmp;
		772
755	if (i == MAX_KNOWN_SPELLS)	773	if (i == MAX_KNOWN_SPELLS)
756	break;	774	break;
757	}	775	}
758	}	776	}
759	if (!i)	777
760	return NULL;	778	return i ? altern [rndm (i)] : 0;
761	return altern[RANDOM () % i];
762	}	779	}
763		780
764	/* This checks to see if the monster should cast a spell/ability.	781	/* This checks to see if the monster should cast a spell/ability.
765	* it returns true if the monster casts a spell, 0 if he doesn't.	782	* it returns true if the monster casts a spell, 0 if he doesn't.
766	* head is the head of the monster.	783	* head is the head of the monster.
767	* part is the part of the monster we are checking against.	784	* part is the part of the monster we are checking against.
768	* pl is the target.	785	* pl is the target.
769	* dir is the direction to case.	786	* dir is the direction to case.
770	* rv is the vector which describes where the enemy is.	787	* rv is the vector which describes where the enemy is.
771	*/	788	*/
772
773	int	789	int
774	monster_cast_spell (object *head, object *part, object *pl, int dir, rv_vector * rv)	790	monster_cast_spell (object *head, object *part, object *pl, int dir, rv_vector * rv)
775	{	791	{
776	object *spell_item;	792	object *spell_item;
777	object *owner;	793	object *owner;
…		…
788		804
789	if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)	805	if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
790	{	806	{
791	get_rangevector (head, owner, &rv1, 0x1);	807	get_rangevector (head, owner, &rv1, 0x1);
792	if (dirdiff (dir, rv1.direction) < 2)	808	if (dirdiff (dir, rv1.direction) < 2)
793	{
794	return 0; /* Might hit owner with spell */	809	return 0; /* Might hit owner with spell */
795	}
796	}	810	}
797		811
798	if (QUERY_FLAG (head, FLAG_CONFUSED))	812	if (QUERY_FLAG (head, FLAG_CONFUSED))
799	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	813	dir = absdir (dir + rndm (3) + rndm (3) - 2);
800		814
801	/* If the monster hasn't already chosen a spell, choose one	815	/* If the monster hasn't already chosen a spell, choose one
802	* I'm not sure if it really make sense to pre-select spells (events	816	* I'm not sure if it really make sense to pre-select spells (events
803	* could be different by the time the monster goes again).	817	* could be different by the time the monster goes again).
804	*/	818	*/
…		…
808	{	822	{
809	LOG (llevMonster, "Turned off spells in %s\n", &head->name);	823	LOG (llevMonster, "Turned off spells in %s\n", &head->name);
810	CLEAR_FLAG (head, FLAG_CAST_SPELL); /* Will be turned on when picking up book */	824	CLEAR_FLAG (head, FLAG_CAST_SPELL); /* Will be turned on when picking up book */
811	return 0;	825	return 0;
812	}	826	}
		827
813	if (spell_item->type == SPELLBOOK)	828	if (spell_item->type == SPELLBOOK)
814	{	829	{
815	if (!spell_item->inv)	830	if (!spell_item->inv)
816	{	831	{
817	LOG (llevError, "spellbook %s does not contain a spell?\n", &spell_item->name);	832	LOG (llevError, "spellbook %s does not contain a spell?\n", &spell_item->name);
818	return 0;	833	return 0;
819	}	834	}
		835
820	spell_item = spell_item->inv;	836	spell_item = spell_item->inv;
821	}	837	}
822	}	838	}
823	else	839	else
824	spell_item = head->spellitem;	840	spell_item = head->spellitem;
…		…
843	/* set this to null, so next time monster will choose something different */	859	/* set this to null, so next time monster will choose something different */
844	head->spellitem = NULL;	860	head->spellitem = NULL;
845		861
846	return cast_spell (part, part, dir, spell_item, NULL);	862	return cast_spell (part, part, dir, spell_item, NULL);
847	}	863	}
848
849		864
850	int	865	int
851	monster_use_scroll (object *head, object *part, object *pl, int dir, rv_vector * rv)	866	monster_use_scroll (object *head, object *part, object *pl, int dir, rv_vector * rv)
852	{	867	{
853	object *scroll;	868	object *scroll;
…		…
871	return 0; /* Might hit owner with spell */	886	return 0; /* Might hit owner with spell */
872	}	887	}
873	}	888	}
874		889
875	if (QUERY_FLAG (head, FLAG_CONFUSED))	890	if (QUERY_FLAG (head, FLAG_CONFUSED))
876	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	891	dir = absdir (dir + rndm (3) + rndm (3) - 2);
877		892
878	for (scroll = head->inv; scroll; scroll = scroll->below)	893	for (scroll = head->inv; scroll; scroll = scroll->below)
879	if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))	894	if (scroll->type == SCROLL && monster_should_cast_spell (head, scroll->inv))
880	break;	895	break;
881		896
…		…
903	* The skills we are treating here are all but those. -b.t.	918	* The skills we are treating here are all but those. -b.t.
904	*	919	*
905	* At the moment this is only useful for throwing, perhaps for	920	* At the moment this is only useful for throwing, perhaps for
906	* stealing. TODO: This should be more integrated in the game. -MT, 25.11.01	921	* stealing. TODO: This should be more integrated in the game. -MT, 25.11.01
907	*/	922	*/
908
909	int	923	int
910	monster_use_skill (object *head, object *part, object *pl, int dir)	924	monster_use_skill (object *head, object *part, object *pl, int dir)
911	{	925	{
912	object *skill, *owner;	926	object *skill, *owner;
913		927
…		…
919	int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);	933	int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
920		934
921	if (dirdiff (dir, dir2) < 1)	935	if (dirdiff (dir, dir2) < 1)
922	return 0; /* Might hit owner with skill -thrown rocks for example ? */	936	return 0; /* Might hit owner with skill -thrown rocks for example ? */
923	}	937	}
		938
924	if (QUERY_FLAG (head, FLAG_CONFUSED))	939	if (QUERY_FLAG (head, FLAG_CONFUSED))
925	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	940	dir = absdir (dir + rndm (3) + rndm (3) - 2);
926		941
927	/* skill selection - monster will use the next unused skill.	942	/* skill selection - monster will use the next unused skill.
928	* well...the following scenario will allow the monster to	943	* well...the following scenario will allow the monster to
929	* toggle between 2 skills. One day it would be nice to make	944	* toggle between 2 skills. One day it would be nice to make
930	* more skills available to monsters.	945	* more skills available to monsters.
931	*/	946	*/
932
933	for (skill = head->inv; skill != NULL; skill = skill->below)	947	for (skill = head->inv; skill; skill = skill->below)
934	if (skill->type == SKILL && skill != head->chosen_skill)	948	if (skill->type == SKILL && skill != head->chosen_skill)
935	{	949	{
936	head->chosen_skill = skill;	950	head->chosen_skill = skill;
937	break;	951	break;
938	}	952	}
…		…
941	{	955	{
942	LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count);	956	LOG (llevDebug, "Error: Monster %s (%d) has FLAG_READY_SKILL without skill.\n", &head->name, head->count);
943	CLEAR_FLAG (head, FLAG_READY_SKILL);	957	CLEAR_FLAG (head, FLAG_READY_SKILL);
944	return 0;	958	return 0;
945	}	959	}
		960
946	/* use skill */	961	/* use skill */
947	return do_skill (head, part, head->chosen_skill, dir, NULL);	962	return do_skill (head, part, head->chosen_skill, dir, NULL);
948	}	963	}
949		964
950	/* Monster will use a ranged spell attack. */	965	/* Monster will use a ranged spell attack. */
951
952	int	966	int
953	monster_use_range (object *head, object *part, object *pl, int dir)	967	monster_use_range (object *head, object *part, object *pl, int dir)
954	{	968	{
955	object *wand, *owner;	969	object *wand, *owner;
956	int at_least_one = 0;	970	int at_least_one = 0;
…		…
963	int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);	977	int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
964		978
965	if (dirdiff (dir, dir2) < 2)	979	if (dirdiff (dir, dir2) < 2)
966	return 0; /* Might hit owner with spell */	980	return 0; /* Might hit owner with spell */
967	}	981	}
		982
968	if (QUERY_FLAG (head, FLAG_CONFUSED))	983	if (QUERY_FLAG (head, FLAG_CONFUSED))
969	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	984	dir = absdir (dir + rndm (3) + rndm (3) - 2);
970		985
971	for (wand = head->inv; wand != NULL; wand = wand->below)	986	for (wand = head->inv; wand; wand = wand->below)
972	{	987	{
973	if (wand->type == WAND)	988	if (wand->type == WAND)
974	{	989	{
975	/* Found a wand, let's see if it has charges left */	990	/* Found a wand, let's see if it has charges left */
976	at_least_one = 1;	991	at_least_one = 1;
…		…
982	if (!(--wand->stats.food))	997	if (!(--wand->stats.food))
983	{	998	{
984	if (wand->arch)	999	if (wand->arch)
985	{	1000	{
986	CLEAR_FLAG (wand, FLAG_ANIMATE);	1001	CLEAR_FLAG (wand, FLAG_ANIMATE);
987	wand->face = wand->arch->clone.face;	1002	wand->face = wand->arch->face;
988	wand->set_speed (0);	1003	wand->set_speed (0);
989	}	1004	}
990	}	1005	}
991	/* Success */	1006	/* Success */
992	return 1;	1007	return 1;
…		…
1011	}	1026	}
1012		1027
1013	if (at_least_one)	1028	if (at_least_one)
1014	return 0;	1029	return 0;
1015		1030
1016	LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANG() without wand/horn/rod.\n", &head->name, head->count);	1031	LOG (llevError, "Error: Monster %s (%d) HAS_READY_RANGE() without wand/horn/rod.\n", &head->name, head->count);
1017	CLEAR_FLAG (head, FLAG_READY_RANGE);	1032	CLEAR_FLAG (head, FLAG_READY_RANGE);
1018	return 0;	1033	return 0;
1019	}	1034	}
1020		1035
1021	int	1036	int
…		…
1023	{	1038	{
1024	object *owner;	1039	object *owner;
1025		1040
1026	if (!(dir = path_to_player (part, pl, 0)))	1041	if (!(dir = path_to_player (part, pl, 0)))
1027	return 0;	1042	return 0;
		1043
1028	if (QUERY_FLAG (head, FLAG_CONFUSED))	1044	if (QUERY_FLAG (head, FLAG_CONFUSED))
1029	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	1045	dir = absdir (dir + rndm (3) + rndm (3) - 2);
1030		1046
1031	if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)	1047	if (QUERY_FLAG (head, FLAG_FRIENDLY) && (owner = head->owner) != NULL)
1032	{	1048	{
1033	int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);	1049	int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y);
1034		1050
…		…
1040	return fire_bow (head, part, NULL, dir, 0, part->x, part->y);	1056	return fire_bow (head, part, NULL, dir, 0, part->x, part->y);
1041		1057
1042	}	1058	}
1043		1059
1044	/* Checks if putting on 'item' will make 'who' do more	1060	/* Checks if putting on 'item' will make 'who' do more
1045	* damage. This is a very simplistic check - also checking things	1061	* damage. This is a very simplistic check - also checking things
1046	* like speed and ac are also relevant.	1062	* like speed and ac are also relevant.
1047	*	1063	*
1048	* return true if item is a better object.	1064	* return true if item is a better object.
1049	*/	1065	*/
1050
1051	int	1066	int
1052	check_good_weapon (object *who, object *item)	1067	check_good_weapon (object *who, object *item)
1053	{	1068	{
1054	object *other_weap;	1069	object *other_weap;
1055	int val = 0, i;	1070	int val = 0, i;
1056		1071
1057	for (other_weap = who->inv; other_weap != NULL; other_weap = other_weap->below)	1072	for (other_weap = who->inv; other_weap; other_weap = other_weap->below)
1058	if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED))	1073	if (other_weap->type == item->type && QUERY_FLAG (other_weap, FLAG_APPLIED))
1059	break;	1074	break;
1060		1075
1061	if (other_weap == NULL) /* No other weapons */	1076	if (!other_weap) /* No other weapons */
1062	return 1;	1077	return 1;
1063		1078
1064	/* Rather than go through and apply the new one, and see if it is	1079	/* Rather than go through and apply the new one, and see if it is
1065	* better, just do some simple checks	1080	* better, just do some simple checks
1066	* Put some multipliers for things that hvae several effects,	1081	* Put some multipliers for things that hvae several effects,
…		…
1071	val += (item->magic - other_weap->magic) * 3;	1086	val += (item->magic - other_weap->magic) * 3;
1072	/* Monsters don't really get benefits from things like regen rates	1087	/* Monsters don't really get benefits from things like regen rates
1073	* from items. But the bonus for their stats are very important.	1088	* from items. But the bonus for their stats are very important.
1074	*/	1089	*/
1075	for (i = 0; i < NUM_STATS; i++)	1090	for (i = 0; i < NUM_STATS; i++)
1076	val += (get_attr_value (&item->stats, i) - get_attr_value (&other_weap->stats, i)) * 2;	1091	val += item->stats.stat (i) - other_weap->stats.stat (i) * 2;
1077		1092
1078	if (val > 0)	1093	if (val > 0)
1079	return 1;	1094	return 1;
1080	else	1095	else
1081	return 0;	1096	return 0;
1082
1083	}	1097	}
1084		1098
1085	int	1099	int
1086	check_good_armour (object *who, object *item)	1100	check_good_armour (object *who, object *item)
1087	{	1101	{
1088	object *other_armour;	1102	object *other_armour;
1089	int val = 0, i;	1103	int val = 0, i;
1090		1104
1091	for (other_armour = who->inv; other_armour != NULL; other_armour = other_armour->below)	1105	for (other_armour = who->inv; other_armour; other_armour = other_armour->below)
1092	if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED))	1106	if (other_armour->type == item->type && QUERY_FLAG (other_armour, FLAG_APPLIED))
1093	break;	1107	break;
1094		1108
1095	if (other_armour == NULL) /* No other armour, use the new */	1109	if (other_armour == NULL) /* No other armour, use the new */
1096	return 1;	1110	return 1;
…		…
1118		1132
1119	if (val > 0)	1133	if (val > 0)
1120	return 1;	1134	return 1;
1121	else	1135	else
1122	return 0;	1136	return 0;
1123
1124	}	1137	}
1125		1138
1126	/*	1139	/*
1127	* monster_check_pickup(): checks for items that monster can pick up.	1140	* monster_check_pickup(): checks for items that monster can pick up.
1128	*	1141	*
…		…
1136	* This function was seen be continueing looping at one point (tmp->below	1149	* This function was seen be continueing looping at one point (tmp->below
1137	* became a recursive loop. It may be better to call monster_check_apply	1150	* became a recursive loop. It may be better to call monster_check_apply
1138	* after we pick everything up, since that function may call others which	1151	* after we pick everything up, since that function may call others which
1139	* affect stacking on this space.	1152	* affect stacking on this space.
1140	*/	1153	*/
1141
1142	void	1154	void
1143	monster_check_pickup (object *monster)	1155	monster_check_pickup (object *monster)
1144	{	1156	{
1145	object *tmp, *next;	1157	object *tmp, *next;
1146		1158
…		…
1165	* monster_can_pick(): If the monster is interested in picking up	1177	* monster_can_pick(): If the monster is interested in picking up
1166	* the item, then return 0. Otherwise 0.	1178	* the item, then return 0. Otherwise 0.
1167	* Instead of pick_up, flags for "greed", etc, should be used.	1179	* Instead of pick_up, flags for "greed", etc, should be used.
1168	* I've already utilized flags for bows, wands, rings, etc, etc. -Frank.	1180	* I've already utilized flags for bows, wands, rings, etc, etc. -Frank.
1169	*/	1181	*/
1170
1171	int	1182	int
1172	monster_can_pick (object *monster, object *item)	1183	monster_can_pick (object *monster, object *item)
1173	{	1184	{
1174	int flag = 0;	1185	int flag = 0;
1175	int i;	1186	int i;
…		…
1221	case ROD:	1232	case ROD:
1222	flag = QUERY_FLAG (monster, FLAG_USE_RANGE);	1233	flag = QUERY_FLAG (monster, FLAG_USE_RANGE);
1223	break;	1234	break;
1224		1235
1225	case SPELLBOOK:	1236	case SPELLBOOK:
1226	flag = (monster->arch != NULL && QUERY_FLAG ((&monster->arch->clone), FLAG_CAST_SPELL));	1237	flag = monster->arch && QUERY_FLAG (monster->arch, FLAG_CAST_SPELL);
1227	break;	1238	break;
1228		1239
1229	case SCROLL:	1240	case SCROLL:
1230	flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);	1241	flag = QUERY_FLAG (monster, FLAG_USE_SCROLL);
1231	break;	1242	break;
…		…
1233	case BOW:	1244	case BOW:
1234	case ARROW:	1245	case ARROW:
1235	flag = QUERY_FLAG (monster, FLAG_USE_BOW);	1246	flag = QUERY_FLAG (monster, FLAG_USE_BOW);
1236	break;	1247	break;
1237	}	1248	}
		1249
1238	/* Simplistic check - if the monster has a location to equip it, he will	1250	/* Simplistic check - if the monster has a location to equip it, he will
1239	* pick it up. Note that this doesn't handle cases where an item may	1251	* pick it up. Note that this doesn't handle cases where an item may
1240	* use several locations.	1252	* use several locations.
1241	*/	1253	*/
1242	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1254	for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1243	{	1255	{
1244	if (monster->body_info[i] && item->body_info[i])	1256	if (monster->slot[i].info && item->slot[i].info)
1245	{	1257	{
1246	flag = 1;	1258	flag = 1;
1247	break;	1259	break;
1248	}	1260	}
1249	}	1261	}
1250		1262
1251	if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag)))	1263	if (((!(monster->pick_up & 32)) && flag) || ((monster->pick_up & 32) && (!flag)))
1252	return 1;	1264	return 1;
		1265
1253	return 0;	1266	return 0;
1254	}	1267	}
1255		1268
1256	/*	1269	/*
1257	* monster_apply_below():	1270	* monster_apply_below():
1258	* Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's	1271	* Vick's (vick@bern.docs.uu.se) @921107 -> If a monster who's
1259	* eager to apply things, encounters something apply-able,	1272	* eager to apply things, encounters something apply-able,
1260	* then make him apply it	1273	* then make him apply it
1261	*/	1274	*/
1262
1263	void	1275	void
1264	monster_apply_below (object *monster)	1276	monster_apply_below (object *monster)
1265	{	1277	{
1266	object *tmp, *next;	1278	object *tmp, *next;
1267		1279
…		…
1294	* a pointer to that object is returned, so it can be dropped.	1306	* a pointer to that object is returned, so it can be dropped.
1295	* (so that other monsters can pick it up and use it)	1307	* (so that other monsters can pick it up and use it)
1296	* Note that as things are now, monsters never drop something -	1308	* Note that as things are now, monsters never drop something -
1297	* they can pick up all that they can use.	1309	* they can pick up all that they can use.
1298	*/	1310	*/
1299
1300	/* Sept 96, fixed this so skills will be readied -b.t.*/	1311	/* Sept 96, fixed this so skills will be readied -b.t.*/
1301
1302	void	1312	void
1303	monster_check_apply (object *mon, object *item)	1313	monster_check_apply (object *mon, object *item)
1304	{	1314	{
1305
1306	int flag = 0;	1315	int flag = 0;
1307		1316
1308	if (item->type == SPELLBOOK && mon->arch != NULL && (QUERY_FLAG ((&mon->arch->clone), FLAG_CAST_SPELL)))	1317	if (item->type == SPELLBOOK && mon->arch && (QUERY_FLAG (mon->arch, FLAG_CAST_SPELL)))
1309	{	1318	{
1310	SET_FLAG (mon, FLAG_CAST_SPELL);	1319	SET_FLAG (mon, FLAG_CAST_SPELL);
1311	return;	1320	return;
1312	}	1321	}
1313		1322
…		…
1322	if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW)	1331	if (QUERY_FLAG (mon, FLAG_USE_BOW) && item->type == ARROW)
1323	{	1332	{
1324	/* Check for the right kind of bow */	1333	/* Check for the right kind of bow */
1325	object *bow;	1334	object *bow;
1326		1335
1327	for (bow = mon->inv; bow != NULL; bow = bow->below)	1336	for (bow = mon->inv; bow; bow = bow->below)
1328	if (bow->type == BOW && bow->race == item->race)	1337	if (bow->type == BOW && bow->race == item->race)
1329	{	1338	{
1330	SET_FLAG (mon, FLAG_READY_BOW);	1339	SET_FLAG (mon, FLAG_READY_BOW);
1331	LOG (llevMonster, "Found correct bow for arrows.\n");	1340	LOG (llevMonster, "Found correct bow for arrows.\n");
1332	return; /* nothing more to do for arrows */	1341	return; /* nothing more to do for arrows */
…		…
1384	*/	1393	*/
1385	SET_FLAG (mon, FLAG_READY_SKILL);	1394	SET_FLAG (mon, FLAG_READY_SKILL);
1386	return;	1395	return;
1387	}	1396	}
1388		1397
1389
1390	/* if we don't match one of the above types, return now.	1398	/* if we don't match one of the above types, return now.
1391	* can_apply_object will say that we can apply things like flesh,	1399	* can_apply_object will say that we can apply things like flesh,
1392	* bolts, and whatever else, because it only checks against the	1400	* bolts, and whatever else, because it only checks against the
1393	* body_info locations.	1401	* body_info locations.
1394	*/	1402	*/
…		…
1405	/* should only be applying this item, not unapplying it.	1413	/* should only be applying this item, not unapplying it.
1406	* also, ignore status of curse so they can take off old armour.	1414	* also, ignore status of curse so they can take off old armour.
1407	* monsters have some advantages after all.	1415	* monsters have some advantages after all.
1408	*/	1416	*/
1409	manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE);	1417	manual_apply (mon, item, AP_APPLY | AP_IGNORE_CURSE);
1410
1411	return;
1412	}	1418	}
1413		1419
1414	void	1420	void
1415	npc_call_help (object *op)	1421	npc_call_help (object *op)
1416	{	1422	{
…		…
1434	if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))	1440	if (QUERY_FLAG (npc, FLAG_ALIVE) && QUERY_FLAG (npc, FLAG_UNAGGRESSIVE))
1435	npc->enemy = op->enemy;	1441	npc->enemy = op->enemy;
1436	}	1442	}
1437	}	1443	}
1438		1444
1439
1440	int	1445	int
1441	dist_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)	1446	dist_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1442	{	1447	{
1443
1444	if (can_hit (part, enemy, rv))	1448	if (can_hit (part, enemy, rv))
1445	return dir;	1449	return dir;
		1450
1446	if (rv->distance < 10)	1451	if (rv->distance < 10)
1447	return absdir (dir + 4);	1452	return absdir (dir + 4);
1448	else if (rv->distance > 18)	1453	else if (rv->distance > 18)
1449	return dir;	1454	return dir;
		1455
1450	return 0;	1456	return 0;
1451	}	1457	}
1452		1458
1453	int	1459	int
1454	run_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)	1460	run_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1455	{	1461	{
1456
1457	if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20)	1462	if ((can_hit (part, enemy, rv) && ob->move_status < 20) || ob->move_status < 20)
1458	{	1463	{
1459	ob->move_status++;	1464	ob->move_status++;
1460	return (dir);	1465	return (dir);
1461	}	1466	}
1462	else if (ob->move_status > 20)	1467	else if (ob->move_status > 20)
1463	ob->move_status = 0;	1468	ob->move_status = 0;
		1469
1464	return absdir (dir + 4);	1470	return absdir (dir + 4);
1465	}	1471	}
1466		1472
1467	int	1473	int
1468	hitrun_att (int dir, object *ob, object *enemy)	1474	hitrun_att (int dir, object *ob, object *enemy)
…		…
1471	return dir;	1477	return dir;
1472	else if (ob->move_status < 50)	1478	else if (ob->move_status < 50)
1473	return absdir (dir + 4);	1479	return absdir (dir + 4);
1474	else	1480	else
1475	ob->move_status = 0;	1481	ob->move_status = 0;
		1482
1476	return absdir (dir + 4);	1483	return absdir (dir + 4);
1477	}	1484	}
1478		1485
1479	int	1486	int
1480	wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)	1487	wait_att (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
…		…
1489	return 0;	1496	return 0;
1490	else if (ob->move_status < 10)	1497	else if (ob->move_status < 10)
1491	return dir;	1498	return dir;
1492	else if (ob->move_status < 15)	1499	else if (ob->move_status < 15)
1493	return absdir (dir + 4);	1500	return absdir (dir + 4);
		1501
1494	ob->move_status = 0;	1502	ob->move_status = 0;
1495	return 0;	1503	return 0;
1496	}	1504	}
1497		1505
1498	int	1506	int
…		…
1506	* at least one map has this set, and whatever the map contains, the	1514	* at least one map has this set, and whatever the map contains, the
1507	* server should try to be resilant enough to avoid the problem	1515	* server should try to be resilant enough to avoid the problem
1508	*/	1516	*/
1509	if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away)	1517	if (ob->stats.maxhp && (ob->stats.hp * 100) / ob->stats.maxhp < ob->run_away)
1510	return absdir (dir + 4);	1518	return absdir (dir + 4);
		1519
1511	return dist_att (dir, ob, enemy, part, rv);	1520	return dist_att (dir, ob, enemy, part, rv);
1512	}	1521	}
1513		1522
1514	int	1523	int
1515	wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv)	1524	wait_att2 (int dir, object *ob, object *enemy, object *part, rv_vector * rv)
1516	{	1525	{
1517	if (rv->distance < 9)	1526	if (rv->distance < 9)
1518	return absdir (dir + 4);	1527	return absdir (dir + 4);
		1528
1519	return 0;	1529	return 0;
1520	}	1530	}
1521		1531
1522	void	1532	void
1523	circ1_move (object *ob)	1533	circ1_move (object *ob)
1524	{	1534	{
1525	static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 };	1535	static int circle[12] = { 3, 3, 4, 5, 5, 6, 7, 7, 8, 1, 1, 2 };
		1536
1526	if (++ob->move_status > 11)	1537	if (++ob->move_status > 11)
1527	ob->move_status = 0;	1538	ob->move_status = 0;
		1539
1528	if (!(move_object (ob, circle[ob->move_status])))	1540	if (!(move_object (ob, circle[ob->move_status])))
1529	(void) move_object (ob, RANDOM () % 8 + 1);	1541	move_object (ob, rndm (8) + 1);
1530	}	1542	}
1531		1543
1532	void	1544	void
1533	circ2_move (object *ob)	1545	circ2_move (object *ob)
1534	{	1546	{
1535	static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 };	1547	static int circle[20] = { 3, 3, 3, 4, 4, 5, 5, 5, 6, 6, 7, 7, 7, 8, 8, 1, 1, 1, 2, 2 };
		1548
1536	if (++ob->move_status > 19)	1549	if (++ob->move_status > 19)
1537	ob->move_status = 0;	1550	ob->move_status = 0;
		1551
1538	if (!(move_object (ob, circle[ob->move_status])))	1552	if (!(move_object (ob, circle[ob->move_status])))
1539	(void) move_object (ob, RANDOM () % 8 + 1);	1553	move_object (ob, rndm (8) + 1);
1540	}	1554	}
1541		1555
1542	void	1556	void
1543	pace_movev (object *ob)	1557	pace_movev (object *ob)
1544	{	1558	{
1545	if (ob->move_status++ > 6)	1559	if (ob->move_status++ > 6)
1546	ob->move_status = 0;	1560	ob->move_status = 0;
		1561
1547	if (ob->move_status < 4)	1562	if (ob->move_status < 4)
1548	(void) move_object (ob, 5);	1563	move_object (ob, 5);
1549	else	1564	else
1550	(void) move_object (ob, 1);	1565	move_object (ob, 1);
1551	}	1566	}
1552		1567
1553	void	1568	void
1554	pace_moveh (object *ob)	1569	pace_moveh (object *ob)
1555	{	1570	{
1556	if (ob->move_status++ > 6)	1571	if (ob->move_status++ > 6)
1557	ob->move_status = 0;	1572	ob->move_status = 0;
		1573
1558	if (ob->move_status < 4)	1574	if (ob->move_status < 4)
1559	(void) move_object (ob, 3);	1575	move_object (ob, 3);
1560	else	1576	else
1561	(void) move_object (ob, 7);	1577	move_object (ob, 7);
1562	}	1578	}
1563		1579
1564	void	1580	void
1565	pace2_movev (object *ob)	1581	pace2_movev (object *ob)
1566	{	1582	{
1567	if (ob->move_status++ > 16)	1583	if (ob->move_status++ > 16)
1568	ob->move_status = 0;	1584	ob->move_status = 0;
		1585
1569	if (ob->move_status < 6)	1586	if (ob->move_status < 6)
1570	(void) move_object (ob, 5);	1587	move_object (ob, 5);
1571	else if (ob->move_status < 8)	1588	else if (ob->move_status < 8)
1572	return;	1589	return;
1573	else if (ob->move_status < 13)	1590	else if (ob->move_status < 13)
1574	(void) move_object (ob, 1);	1591	move_object (ob, 1);
1575	else	1592	else
1576	return;	1593	return;
1577	}	1594	}
1578		1595
1579	void	1596	void
1580	pace2_moveh (object *ob)	1597	pace2_moveh (object *ob)
1581	{	1598	{
1582	if (ob->move_status++ > 16)	1599	if (ob->move_status++ > 16)
1583	ob->move_status = 0;	1600	ob->move_status = 0;
		1601
1584	if (ob->move_status < 6)	1602	if (ob->move_status < 6)
1585	(void) move_object (ob, 3);	1603	move_object (ob, 3);
1586	else if (ob->move_status < 8)	1604	else if (ob->move_status < 8)
1587	return;	1605	return;
1588	else if (ob->move_status < 13)	1606	else if (ob->move_status < 13)
1589	(void) move_object (ob, 7);	1607	move_object (ob, 7);
1590	else	1608	else
1591	return;	1609	return;
1592	}	1610	}
1593		1611
1594	void	1612	void
1595	rand_move (object *ob)	1613	rand_move (object *ob)
1596	{	1614	{
1597	int i;
1598
1599	if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(RANDOM () % 9))))	1615	if (ob->move_status < 1 || ob->move_status > 8 || !(move_object (ob, ob->move_status || !(rndm (9)))))
1600	for (i = 0; i < 5; i++)	1616	for (int i = 0; i < 5; i++)
1601	if (move_object (ob, ob->move_status = RANDOM () % 8 + 1))	1617	if (move_object (ob, ob->move_status = rndm (8) + 1))
1602	return;	1618	return;
1603	}	1619	}
1604		1620
1605	void	1621	void
1606	check_earthwalls (object *op, maptile *m, int x, int y)	1622	check_earthwalls (object *op, maptile *m, int x, int y)
1607	{	1623	{
1608	object *tmp;
1609
1610	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1624	for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1611	{
1612	if (tmp->type == EARTHWALL)	1625	if (tmp->type == EARTHWALL)
1613	{	1626	{
1614	hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1);	1627	hit_player (tmp, op->stats.dam, op, AT_PHYSICAL, 1);
1615	return;	1628	return;
1616	}	1629	}
1617	}
1618	}	1630	}
1619		1631
1620	void	1632	void
1621	check_doors (object *op, maptile *m, int x, int y)	1633	check_doors (object *op, maptile *m, int x, int y)
1622	{	1634	{
1623	object *tmp;
1624
1625	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1635	for (object *tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1626	{
1627	if (tmp->type == DOOR)	1636	if (tmp->type == DOOR)
1628	{	1637	{
1629	hit_player (tmp, 1000, op, AT_PHYSICAL, 1);	1638	hit_player (tmp, 1000, op, AT_PHYSICAL, 1);
1630	return;	1639	return;
1631	}	1640	}
1632	}
1633	}	1641	}
1634		1642
1635	/* find_mon_throw_ob() - modeled on find_throw_ob	1643	/* find_mon_throw_ob() - modeled on find_throw_ob
1636	* This is probably overly simplistic as it is now - We want	1644	* This is probably overly simplistic as it is now - We want
1637	* monsters to throw things like chairs and other pieces of	1645	* monsters to throw things like chairs and other pieces of
1638	* furniture, even if they are not good throwable objects.	1646	* furniture, even if they are not good throwable objects.
1639	* Probably better to have the monster throw a throwable object	1647	* Probably better to have the monster throw a throwable object
1640	* first, then throw any non equipped weapon.	1648	* first, then throw any non equipped weapon.
1641	*/	1649	*/
1642
1643	object *	1650	object *
1644	find_mon_throw_ob (object *op)	1651	find_mon_throw_ob (object *op)
1645	{	1652	{
1646	object *tmp = NULL;	1653	object *tmp = NULL;
1647		1654
…		…
1651	tmp = op;	1658	tmp = op;
1652		1659
1653	/* New throw code: look through the inventory. Grap the first legal is_thrown	1660	/* New throw code: look through the inventory. Grap the first legal is_thrown
1654	* marked item and throw it to the enemy.	1661	* marked item and throw it to the enemy.
1655	*/	1662	*/
1656
1657	for (tmp = op->inv; tmp; tmp = tmp->below)	1663	for (tmp = op->inv; tmp; tmp = tmp->below)
1658	{	1664	{
1659
1660	/* Can't throw invisible objects or items that are applied */	1665	/* Can't throw invisible objects or items that are applied */
1661	if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED))	1666	if (tmp->invisible || QUERY_FLAG (tmp, FLAG_APPLIED))
1662	continue;	1667	continue;
1663		1668
1664	if (QUERY_FLAG (tmp, FLAG_IS_THROWN))	1669	if (QUERY_FLAG (tmp, FLAG_IS_THROWN))
…		…
1680	* properly. I also so odd code in place that checked for x distance	1685	* properly. I also so odd code in place that checked for x distance
1681	* OR y distance being within some range - that seemed wrong - both should	1686	* OR y distance being within some range - that seemed wrong - both should
1682	* be within the valid range. MSW 2001-08-05	1687	* be within the valid range. MSW 2001-08-05
1683	* Returns 0 if enemy can not be detected, 1 if it is detected	1688	* Returns 0 if enemy can not be detected, 1 if it is detected
1684	*/	1689	*/
1685
1686	int	1690	int
1687	can_detect_enemy (object *op, object *enemy, rv_vector * rv)	1691	can_detect_enemy (object *op, object *enemy, rv_vector * rv)
1688	{	1692	{
1689	int radius = MIN_MON_RADIUS, hide_discovery;	1693	int radius = MIN_MON_RADIUS, hide_discovery;
1690		1694
…		…
1697	return 0;	1701	return 0;
1698		1702
1699	get_rangevector (op, enemy, rv, 0);	1703	get_rangevector (op, enemy, rv, 0);
1700		1704
1701	/* Monsters always ignore the DM */	1705	/* Monsters always ignore the DM */
1702	if ((op->type != PLAYER) && QUERY_FLAG (enemy, FLAG_WIZ))	1706	if (op->type != PLAYER && QUERY_FLAG (enemy, FLAG_WIZ))
1703	return 0;	1707	return 0;
1704		1708
1705	/* simple check. Should probably put some range checks in here. */	1709	/* simple check. Should probably put some range checks in here. */
1706	if (can_see_enemy (op, enemy))	1710	if (can_see_enemy (op, enemy))
1707	return 1;	1711	return 1;
…		…
1720		1724
1721	/* use this for invis also */	1725	/* use this for invis also */
1722	hide_discovery = op->stats.Int / 5;	1726	hide_discovery = op->stats.Int / 5;
1723		1727
1724	/* Determine Detection radii */	1728	/* Determine Detection radii */
1725	if (!enemy->hide) /* to detect non-hidden (eg dark/invis enemy) */	1729	if (!enemy->flag [FLAG_HIDDEN]) /* to detect non-hidden (eg dark/invis enemy) */
1726	radius = (op->stats.Wis / 5) + 1 > MIN_MON_RADIUS ? (op->stats.Wis / 5) + 1 : MIN_MON_RADIUS;	1730	radius = max (MIN_MON_RADIUS, op->stats.Wis / 5 + 1);
1727	else	1731	else
1728	{ /* a level/INT/Dex adjustment for hiding */	1732	{ /* a level/INT/Dex adjustment for hiding */
1729	object *sk_hide;
1730	int bonus = (op->level / 2) + (op->stats.Int / 5);	1733	int bonus = op->level / 2 + op->stats.Int / 5;
1731		1734
1732	if (enemy->type == PLAYER)	1735	if (enemy->is_player ())
1733	{	1736	{
1734	if ((sk_hide = find_skill_by_number (enemy, SK_HIDING)))	1737	if (object *sk_hide = find_skill_by_number (enemy, SK_HIDING))
1735	bonus -= sk_hide->level;	1738	bonus -= sk_hide->level;
1736	else	1739	else
1737	{	1740	{
1738	LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n");	1741	LOG (llevError, "can_detect_enemy() got hidden player w/o hiding skill!\n");
1739	make_visible (enemy);	1742	make_visible (enemy);
…		…
1748	} /* else creature has modifiers for hiding */	1751	} /* else creature has modifiers for hiding */
1749		1752
1750	/* Radii stealth adjustment. Only if you are stealthy	1753	/* Radii stealth adjustment. Only if you are stealthy
1751	* will you be able to sneak up closer to creatures */	1754	* will you be able to sneak up closer to creatures */
1752	if (QUERY_FLAG (enemy, FLAG_STEALTH))	1755	if (QUERY_FLAG (enemy, FLAG_STEALTH))
1753	radius = radius / 2, hide_discovery = hide_discovery / 3;	1756	{
		1757	radius /= 2;
		1758	hide_discovery /= 3;
		1759	}
1754		1760
1755	/* Radii adjustment for enemy standing in the dark */	1761	/* Radii adjustment for enemy standing in the dark */
1756	if (op->map->darkness > 0 && !stand_in_light (enemy))	1762	if (op->map->darklevel () > 0 && !stand_in_light (enemy))
1757	{	1763	{
1758	/* on dark maps body heat can help indicate location with infravision	1764	/* on dark maps body heat can help indicate location with infravision
1759	* undead don't have body heat, so no benefit detecting them.	1765	* undead don't have body heat, so no benefit detecting them.
1760	*/	1766	*/
1761	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy))	1767	if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) && !is_true_undead (enemy))
1762	radius += op->map->darkness / 2;	1768	radius += op->map->darklevel () / 2;
1763	else	1769	else
1764	radius -= op->map->darkness / 2;	1770	radius -= op->map->darklevel () / 2;
1765		1771
1766	/* op next to a monster (and not in complete darkness)	1772	/* op next to a monster (and not in complete darkness)
1767	* the monster should have a chance to see you.	1773	* the monster should have a chance to see you.
1768	*/	1774	*/
1769	if (radius < MIN_MON_RADIUS && op->map->darkness < 5 && rv->distance <= 1)	1775	if (radius < MIN_MON_RADIUS && op->map->darklevel () < 5 && rv->distance <= 1)
1770	radius = MIN_MON_RADIUS;	1776	radius = MIN_MON_RADIUS;
1771	} /* if on dark map */	1777	} /* if on dark map */
1772		1778
1773	/* Lets not worry about monsters that have incredible detection	1779	/* Lets not worry about monsters that have incredible detection
1774	* radii, we only need to worry here about things the player can	1780	* radii, we only need to worry here about things the player can
…		…
1776	* may have for their map - in that way, creatures at the edge will	1782	* may have for their map - in that way, creatures at the edge will
1777	* do something. Note that the distance field in the	1783	* do something. Note that the distance field in the
1778	* vector is real distance, so in theory this should be 18 to	1784	* vector is real distance, so in theory this should be 18 to
1779	* find that.	1785	* find that.
1780	*/	1786	*/
1781	if (radius > 13)	1787	// note that the above reasoning was utter bullshit even at the time it was written
1782	radius = 13;	1788	// we use 25, lets see if we have the cpu time for it
		1789	radius = min (25, radius);
1783		1790
1784	/* Enemy in range! Now test for detection */	1791	/* Enemy in range! Now test for detection */
1785	if ((int) rv->distance <= radius)	1792	if (rv->distance <= radius)
1786	{	1793	{
1787	/* ah, we are within range, detected? take cases */	1794	/* ah, we are within range, detected? take cases */
1788	if (!enemy->invisible) /* enemy in dark squares... are seen! */	1795	if (!enemy->invisible) /* enemy in dark squares... are seen! */
1789	return 1;	1796	return 1;
1790		1797
1791	/* hidden or low-quality invisible */	1798	/* hidden or low-quality invisible */
1792	if (enemy->hide && (rv->distance <= 1) && (RANDOM () % 100 <= hide_discovery))	1799	if (enemy->flag [FLAG_HIDDEN] && rv->distance <= 1 && rndm (100) <= hide_discovery)
1793	{	1800	{
1794	make_visible (enemy);	1801	make_visible (enemy);
		1802
1795	/* inform players of new status */	1803	/* inform players of new status */
1796	if (enemy->type == PLAYER && player_can_view (enemy, op))	1804	if (enemy->type == PLAYER && player_can_view (enemy, op))
1797	new_draw_info_format (NDI_UNIQUE, 0, enemy, "You are discovered by %s!", &op->name);	1805	new_draw_info_format (NDI_UNIQUE, 0, enemy, "You are discovered by %s!", &op->name);
		1806
1798	return 1; /* detected enemy */	1807	return 1; /* detected enemy */
1799	}	1808	}
1800	else if (enemy->invisible)	1809	else if (enemy->invisible)
1801	{	1810	{
1802	/* Change this around - instead of negating the invisible, just	1811	/* Change this around - instead of negating the invisible, just
1803	* return true so that the mosnter that managed to detect you can	1812	* return true so that the monster that managed to detect you can
1804	* do something to you. Decreasing the duration of invisible	1813	* do something to you. Decreasing the duration of invisible
1805	* doesn't make a lot of sense IMO, as a bunch of stupid creatures	1814	* doesn't make a lot of sense IMO, as a bunch of stupid creatures
1806	* can then basically negate the spell. The spell isn't negated -	1815	* can then basically negate the spell. The spell isn't negated -
1807	* they just know where you are!	1816	* they just know where you are!
1808	*/	1817	*/
1809	if ((RANDOM () % 50) <= hide_discovery)	1818	if (rndm (50) <= hide_discovery)
1810	{	1819	{
1811	if (enemy->type == PLAYER)	1820	if (enemy->type == PLAYER)
1812	{
1813	new_draw_info_format (NDI_UNIQUE, 0, enemy, "You see %s noticing your position.", query_name (op));	1821	new_draw_info_format (NDI_UNIQUE, 0, enemy, "You see %s noticing your position.", query_name (op));
1814	}	1822
1815	return 1;	1823	return 1;
1816	}	1824	}
1817	}	1825	}
1818	} /* within range */	1826	} /* within range */
1819		1827
…		…
1824	/* determine if op stands in a lighted square. This is not a very	1832	/* determine if op stands in a lighted square. This is not a very
1825	* intellegent algorithm. For one thing, we ignore los here, SO it	1833	* intellegent algorithm. For one thing, we ignore los here, SO it
1826	* is possible for a bright light to illuminate a player on the	1834	* is possible for a bright light to illuminate a player on the
1827	* other side of a wall (!).	1835	* other side of a wall (!).
1828	*/	1836	*/
1829
1830	int	1837	int
1831	stand_in_light (object *op)	1838	stand_in_light (object *op)
1832	{	1839	{
1833	sint16 nx, ny;
1834	maptile *m;
1835
1836
1837	if (!op)	1840	if (op)
1838	return 0;	1841	{
1839	if (op->glow_radius > 0)	1842	if (op->glow_radius > 0)
1840	return 1;	1843	return 1;
1841		1844
1842	if (op->map)	1845	if (op->map)
1843	{	1846	unordered_mapwalk (op, -MAX_LIGHT_RADIUS, -MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS, MAX_LIGHT_RADIUS)
1844	int x, y, x1, y1;	1847	{
1845
1846
1847
1848	/* Check the spaces with the max light radius to see if any of them	1848	/* Check the spaces with the max light radius to see if any of them
1849	* have lights, and if any of them light the player enough, then return 1.	1849	* have lights, and if any of them light the player enough, then return 1.
1850	*/
1851	for (x = op->x - MAX_LIGHT_RADII; x <= op->x + MAX_LIGHT_RADII; x++)
1852	{
1853	for (y = op->y - MAX_LIGHT_RADII; y <= op->y + MAX_LIGHT_RADII; y++)
1854	{	1850	*/
1855	m = op->map;	1851	int light = m->at (nx, ny).light;
1856	nx = x;
1857	ny = y;
1858		1852
1859	if (get_map_flags (m, &m, nx, ny, &nx, &ny) & P_OUT_OF_MAP)	1853	if (expect_false (light > 0) && idistance (dx, dy) <= light)
1860	continue;
1861
1862	x1 = abs (x - op->x) * abs (x - op->x);
1863	y1 = abs (y - op->y) * abs (y - op->y);
1864	if (isqrt (x1 + y1) < GET_MAP_LIGHT (m, nx, ny))
1865	return 1;	1854	return 1;
1866	}	1855	}
1867	}
1868	}	1856	}
		1857
1869	return 0;	1858	return 0;
1870	}	1859	}
1871
1872		1860
1873	/* assuming no walls/barriers, lets check to see if its *possible*	1861	/* assuming no walls/barriers, lets check to see if its *possible*
1874	* to see an enemy. Note, "detection" is different from "seeing".	1862	* to see an enemy. Note, "detection" is different from "seeing".
1875	* See can_detect_enemy() for more details. -b.t.	1863	* See can_detect_enemy() for more details. -b.t.
1876	* return 0 if can't be seen, 1 if can be	1864	* return 0 if can't be seen, 1 if can be
1877	*/	1865	*/
1878
1879	int	1866	int
1880	can_see_enemy (object *op, object *enemy)	1867	can_see_enemy (object *op, object *enemy)
1881	{	1868	{
1882	object *looker = op->head ? op->head : op;	1869	object *looker = op->head ? op->head : op;
1883		1870
…		…
1899	* However,if you carry any source of light, then the hidden	1886	* However,if you carry any source of light, then the hidden
1900	* creature is seeable (and stupid) */	1887	* creature is seeable (and stupid) */
1901		1888
1902	if (has_carried_lights (enemy))	1889	if (has_carried_lights (enemy))
1903	{	1890	{
1904	if (enemy->hide)	1891	if (enemy->flag [FLAG_HIDDEN])
1905	{	1892	{
1906	make_visible (enemy);	1893	make_visible (enemy);
1907	new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");	1894	new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");
1908	}	1895	}
		1896
1909	return 1;	1897	return 1;
1910	}	1898	}
1911	else if (enemy->hide)	1899	else if (enemy->flag [FLAG_HIDDEN])
1912	return 0;	1900	return 0;
1913		1901
1914	/* Invisible enemy. Break apart the check for invis undead/invis looker	1902	/* Invisible enemy. Break apart the check for invis undead/invis looker
1915	* into more simple checks - the QUERY_FLAG doesn't return 1/0 values,	1903	* into more simple checks - the QUERY_FLAG doesn't return 1/0 values,
1916	* and making it a conditional makes the code pretty ugly.	1904	* and making it a conditional makes the code pretty ugly.
1917	*/	1905	*/
1918	if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))	1906	if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
1919	{
1920	if (makes_invisible_to (enemy, looker))	1907	if (makes_invisible_to (enemy, looker))
1921	return 0;	1908	return 0;
1922	}
1923	}	1909	}
1924	else if (looker->type == PLAYER) /* for players, a (possible) shortcut */	1910	else if (looker->is_player ()) /* for players, a (possible) shortcut */
1925	if (player_can_view (looker, enemy))	1911	if (player_can_view (looker, enemy))
1926	return 1;	1912	return 1;
1927		1913
1928	/* ENEMY IN DARK MAP. Without infravision, the enemy is not seen	1914	/* ENEMY IN DARK MAP. Without infravision, the enemy is not seen
1929	* unless they carry a light or stand in light. Darkness doesnt	1915	* unless they carry a light or stand in light. Darkness doesnt
…		…
1932	* we care about the enemy maps status, not the looker.	1918	* we care about the enemy maps status, not the looker.
1933	* only relevant for tiled maps, but it is possible that the	1919	* only relevant for tiled maps, but it is possible that the
1934	* enemy is on a bright map and the looker on a dark - in that	1920	* enemy is on a bright map and the looker on a dark - in that
1935	* case, the looker can still see the enemy	1921	* case, the looker can still see the enemy
1936	*/	1922	*/
1937	if (enemy->map->darkness > 0 && !stand_in_light (enemy)	1923	if (enemy->map->darklevel () > 0
		1924	&& !stand_in_light (enemy)
1938	&& (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS)))	1925	&& (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS)))
1939	return 0;	1926	return 0;
1940		1927
1941	return 1;	1928	return 1;
1942	}	1929	}
		1930

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines