ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/spell_attack.C

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.16 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.95 by elmex, Tue Jan 19 16:13:05 2010 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002-2003,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 it under
8	it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
9	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
10	(at your option) any later version.	11	* 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 Affero GNU General Public License
18	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/* This file contains all the spell attack code. Grouping this code	25	/* This file contains all the spell attack code. Grouping this code
25	* together should hopefully make it easier to find the relevent bits	26	* together should hopefully make it easier to find the relevent bits
26	* of code	27	* of code
27	*/	28	*/
28		29
29	#include <global.h>	30	#include <global.h>
30	#include <object.h>	31	#include <object.h>
31	#include <living.h>	32	#include <living.h>
32	#ifndef __CEXTRACT__
33	# include <sproto.h>	33	#include <sproto.h>
34	#endif
35	#include <spells.h>	34	#include <spells.h>
36	#include <sounds.h>	35	#include <sounds.h>
37		36
38	/* this function checks to see if a spell pushes objects as well	37	/* this function checks to see if a spell pushes objects as well
39	* as flies over and damages them (only used for cones for now)	38	* as flies over and damages them (only used for cones for now)
40	* but moved here so it could be applied to bolts too	39	* but moved here so it could be applied to bolts too
41	* op is the spell object.	40	* op is the spell object.
42	*/	41	*/
43		42	static void
44	void
45	check_spell_knockback (object *op)	43	check_spell_knockback (object *op)
46	{	44	{
47	object *tmp, *tmp2; /* object on the map */
48	int weight_move;	45	int weight_move;
49	int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */	46	int frictionmod = 2; /*poor man's physics - multipy targets weight by this amount */
50		47
51	if (!op->weight)	48	if (!op->weight)
52	{ /*shouldn't happen but if cone object has no weight drop out */	49	{ /*shouldn't happen but if cone object has no weight drop out */
…		…
57	{	54	{
58	weight_move = op->weight + (op->weight * op->level) / 3;	55	weight_move = op->weight + (op->weight * op->level) / 3;
59	/*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */	56	/*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
60	}	57	}
61		58
62	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	59	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
63	{	60	{
64	int num_sections = 1;	61	int num_sections = 1;
65		62
66	/* don't move DM */	63	/* don't move DM */
67	if (QUERY_FLAG (tmp, FLAG_WIZ))	64	if (QUERY_FLAG (tmp, FLAG_WIZ))
…		…
74	/* don't move floors or immobile objects */	71	/* don't move floors or immobile objects */
75	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))	72	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || (!QUERY_FLAG (tmp, FLAG_ALIVE) && QUERY_FLAG (tmp, FLAG_NO_PICK)))
76	continue;	73	continue;
77		74
78	/* count the object's sections */	75	/* count the object's sections */
79	for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more)	76	for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
80	num_sections++;	77	num_sections++;
81		78
82	/* I'm not sure if it makes sense to divide by num_sections - bigger	79	/* I'm not sure if it makes sense to divide by num_sections - bigger
83	* objects should be harder to move, and we are moving the entire	80	* objects should be harder to move, and we are moving the entire
84	* object, not just the head, so the total weight should be relevant.	81	* object, not just the head, so the total weight should be relevant.
…		…
108	*	105	*
109	* BOLT CODE	106	* BOLT CODE
110	*	107	*
111	***************************************************************************/	108	***************************************************************************/
112		109
113	/* Causes op to fork. op is the original bolt, tmp	110	/* Causes op to fork. op is the original bolt, tmp
114	* is the first piece of the fork.	111	* is the first piece of the fork.
115	*/	112	*/
116		113	static void
117	void
118	forklightning (object *op, object *tmp)	114	forklightning (object *op, object *tmp)
119	{	115	{
120	int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */	116	int new_dir = 1; /* direction or -1 for left, +1 for right 0 if no new bolt */
121	int t_dir; /* stores temporary dir calculation */	117	int t_dir; /* stores temporary dir calculation */
122	maptile *m;	118	maptile *m;
…		…
140		136
141	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))	137	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (m, sx, sy)))
142	return;	138	return;
143		139
144	/* OK, we made a fork */	140	/* OK, we made a fork */
145	new_bolt = get_object ();	141	new_bolt = tmp->clone ();
146	copy_object (tmp, new_bolt);
147		142
148	/* reduce chances of subsequent forking */	143	/* reduce chances of subsequent forking */
149	new_bolt->stats.Dex -= 10;	144	new_bolt->stats.Dex -= 10;
150	tmp->stats.Dex -= 10; /* less forks from main bolt too */	145	tmp->stats.Dex -= 10; /* less forks from main bolt too */
151	new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */	146	new_bolt->stats.Con += 25 * new_dir; /* adjust the left bias */
152	new_bolt->speed_left = -0.1;	147	new_bolt->speed_left = -0.1f;
153	new_bolt->direction = t_dir;	148	new_bolt->direction = t_dir;
154	new_bolt->duration++;	149	new_bolt->duration++;
155	new_bolt->x = sx;
156	new_bolt->y = sy;
157	new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */	150	new_bolt->stats.dam /= 2; /* reduce daughter bolt damage */
158	new_bolt->stats.dam++;	151	new_bolt->stats.dam++;
159	tmp->stats.dam /= 2; /* reduce father bolt damage */	152	tmp->stats.dam /= 2; /* reduce father bolt damage */
160	tmp->stats.dam++;	153	tmp->stats.dam++;
161	new_bolt = insert_ob_in_map (new_bolt, m, op, 0);	154
		155	if ((new_bolt = m->insert (new_bolt, sx, sy, op)))
162	update_turn_face (new_bolt);	156	update_turn_face (new_bolt);
163	}	157	}
164		158
165	/* move_bolt: moves bolt 'op'. Basically, it just advances a space,	159	/* move_bolt: moves bolt 'op'. Basically, it just advances a space,
166	* and checks for various things that may stop it.	160	* and checks for various things that may stop it.
167	*/	161	*/
168
169	void	162	void
170	move_bolt (object *op)	163	move_bolt (object *op)
171	{	164	{
172	object *tmp;
173	int mflags;	165	int mflags;
174	sint16 x, y;	166	sint16 x, y;
175	maptile *m;	167	maptile *m;
176		168
177	if (--(op->duration) < 0)	169	if (--op->duration < 0)
178	{	170	{
179	op->remove ();
180	op->destroy (0);	171	op->drop_and_destroy ();
181	return;	172	return;
182	}	173	}
183		174
184	hit_map (op, 0, op->attacktype, 1);	175	hit_map (op, 0, op->attacktype, 1);
185		176
186	if (!op->direction)	177	if (!op->direction)
187	return;	178	return;
188		179
189	if (--op->range < 0)	180	if (--op->range < 0)
190	{
191	op->range = 0;	181	op->range = 0;
192	}
193	else	182	else
194	{	183	{
195	x = op->x + DIRX (op);	184	x = op->x + DIRX (op);
196	y = op->y + DIRY (op);	185	y = op->y + DIRY (op);
197	m = op->map;	186	m = op->map;
…		…
205	* on the space. So only call reflwall if we think the data it returns	194	* on the space. So only call reflwall if we think the data it returns
206	* will be useful.	195	* will be useful.
207	*/	196	*/
208	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))	197	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)) || ((mflags & P_IS_ALIVE) && reflwall (m, x, y, op)))
209	{	198	{
210
211	if (!QUERY_FLAG (op, FLAG_REFLECTING))	199	if (!QUERY_FLAG (op, FLAG_REFLECTING))
212	return;	200	return;
213		201
214	/* Since walls don't run diagonal, if the bolt is in	202	/* Since walls don't run diagonal, if the bolt is in
215	* one of 4 main directions, it just reflects back in the	203	* one of 4 main directions, it just reflects back in the
…		…
245	else if (left)	233	else if (left)
246	op->direction = absdir (op->direction + 2);	234	op->direction = absdir (op->direction + 2);
247	else if (right)	235	else if (right)
248	op->direction = absdir (op->direction - 2);	236	op->direction = absdir (op->direction - 2);
249	}	237	}
		238
250	update_turn_face (op); /* A bolt *must* be IS_TURNABLE */	239	update_turn_face (op); /* A bolt *must* be IS_TURNABLE */
251	return;	240	return;
252	}	241	}
253	else	242	else
254	{ /* Create a copy of this object and put it ahead */	243	{ /* Create a copy of this object and put it ahead */
255	tmp = get_object ();	244	object *tmp = op->clone ();
256	copy_object (op, tmp);	245
		246	m->insert (tmp, x, y, op);
257	tmp->speed_left = -0.1;	247	tmp->speed_left = -0.1f;
258	tmp->x += DIRX (tmp), tmp->y += DIRY (tmp);
259	tmp = insert_ob_in_map (tmp, op->map, op, 0);
260	/* To make up for the decrease at the top of the function */	248	/* To make up for the decrease at the top of the function */
261	tmp->duration++;	249	tmp->duration++;
262		250
263	/* New forking code. Possibly create forks of this object	251	/* New forking code. Possibly create forks of this object
264	* going off in other directions.	252	* going off in other directions.
265	*/	253	*/
266
267	if (rndm (0, 99) < tmp->stats.Dex)	254	if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
268	{ /* stats.Dex % of forking */	255	forklightning (op, tmp); /* stats.Dex % of forking */
269	forklightning (op, tmp);	256
270	}
271	/* In this way, the object left behind sticks on the space, but	257	/* In this way, the object left behind sticks on the space, but
272	* doesn't create any bolts that continue to move onward.	258	* doesn't create any bolts that continue to move onward.
273	*/	259	*/
274	op->range = 0;	260	op->range = 0;
275	} /* copy object and move it along */	261	} /* copy object and move it along */
…		…
282	* we remove the magic flag - that can be derived from	268	* we remove the magic flag - that can be derived from
283	* spob->attacktype.	269	* spob->attacktype.
284	* This function sets up the appropriate owner and skill	270	* This function sets up the appropriate owner and skill
285	* pointers.	271	* pointers.
286	*/	272	*/
287
288	int	273	int
289	fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)	274	fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
290	{	275	{
291	object *tmp = NULL;	276	object *tmp = NULL;
292	int mflags;	277	int mflags;
293		278
294	if (!spob->other_arch)	279	if (!spob->other_arch)
295	return 0;	280	return 0;
296		281
297	tmp = arch_to_object (spob->other_arch);	282	tmp = spob->other_arch->instance ();
298	if (tmp == NULL)	283	if (tmp == NULL)
299	return 0;	284	return 0;
300		285
301	/* peterm: level dependency for bolts */	286	/* peterm: level dependency for bolts */
302	tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);	287	tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
303	tmp->attacktype = spob->attacktype;	288	tmp->attacktype = spob->attacktype;
		289
304	if (spob->slaying)	290	if (spob->slaying)
305	tmp->slaying = spob->slaying;	291	tmp->slaying = spob->slaying;
		292
306	tmp->range = spob->range + SP_level_range_adjust (caster, spob);	293	tmp->range = spob->range + SP_level_range_adjust (caster, spob);
307	tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);	294	tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
308	tmp->stats.Dex = spob->stats.Dex;	295	tmp->stats.Dex = spob->stats.Dex;
309	tmp->stats.Con = spob->stats.Con;	296	tmp->stats.Con = spob->stats.Con;
310		297
311	tmp->direction = dir;	298	tmp->direction = dir;
312	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	299	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
313	SET_ANIMATION (tmp, dir);	300	SET_ANIMATION (tmp, dir);
314		301
315	set_owner (tmp, op);	302	tmp->set_owner (op);
316	set_spell_skill (op, caster, spob, tmp);	303	set_spell_skill (op, caster, spob, tmp);
317		304
318	tmp->x = op->x + DIRX (tmp);	305	tmp->x = op->x + DIRX (tmp);
319	tmp->y = op->y + DIRY (tmp);	306	tmp->y = op->y + DIRY (tmp);
320	tmp->map = op->map;	307	tmp->map = op->map;
321		308
		309	maptile *newmap;
322	mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);	310	mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
323	if (mflags & P_OUT_OF_MAP)	311	if (mflags & P_OUT_OF_MAP)
324	{	312	{
325	tmp->destroy (0);	313	tmp->drop_and_destroy ();
326	return 0;	314	return 0;
327	}	315	}
		316
		317	tmp->map = newmap;
		318
328	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	319	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
329	{	320	{
330	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	321	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
331	{	322	{
332	tmp->destroy (0);	323	tmp->drop_and_destroy ();
333	return 0;	324	return 0;
334	}	325	}
		326
335	tmp->x = op->x;	327	tmp->x = op->x;
336	tmp->y = op->y;	328	tmp->y = op->y;
337	tmp->direction = absdir (tmp->direction + 4);	329	tmp->direction = absdir (tmp->direction + 4);
338	tmp->map = op->map;	330	tmp->map = op->map;
339	}	331	}
340	if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)	332
		333	if ((tmp = tmp->insert_at (tmp, op)))
341	move_bolt (tmp);	334	move_bolt (tmp);
		335
342	return 1;	336	return 1;
343	}	337	}
344
345
346		338
347	/***************************************************************************	339	/***************************************************************************
348	*	340	*
349	* BULLET/BALL CODE	341	* BULLET/BALL CODE
350	*	342	*
351	***************************************************************************/	343	***************************************************************************/
352		344
353	/* expands an explosion. op is a piece of the	345	/* expands an explosion. op is a piece of the
354	* explosion - this expans it in the different directions.	346	* explosion - this expands it in the different directions.
355	* At least that is what I think this does.	347	* At least that is what I think this does.
356	*/	348	*/
357	void	349	void
358	explosion (object *op)	350	explosion (object *op)
359	{	351	{
360	object *tmp;
361	maptile *m = op->map;	352	maptile *m = op->map;
362	int i;	353	int i;
363		354
364	if (--(op->duration) < 0)	355	if (--op->duration < 0)
365	{	356	{
366	op->remove ();
367	op->destroy (0);	357	op->destroy ();
368	return;	358	return;
369	}	359	}
		360
370	hit_map (op, 0, op->attacktype, 0);	361	hit_map (op, 0, op->attacktype, 0);
371		362
372	if (op->range > 0)	363	if (op->range > 0)
373	{	364	{
374	for (i = 1; i < 9; i++)	365	for (i = 1; i < 9; i++)
375	{	366	{
376	sint16 dx, dy;	367	sint16 dx, dy;
377		368
378	dx = op->x + freearr_x[i];	369	dx = op->x + freearr_x[i];
379	dy = op->y + freearr_y[i];	370	dy = op->y + freearr_y[i];
		371
380	/* ok_to_put_more already does things like checks for walls,	372	/* ok_to_put_more already does things like checks for walls,
381	* out of map, etc.	373	* out of map, etc.
382	*/	374	*/
383	if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))	375	if (ok_to_put_more (op->map, dx, dy, op, op->attacktype))
384	{	376	{
385	tmp = get_object ();	377	object *tmp = op->clone ();
386	copy_object (op, tmp);	378
387	tmp->state = 0;	379	tmp->state = 0;
388	tmp->speed_left = -0.21;	380	tmp->speed_left = -0.21f;
389	tmp->range--;	381	tmp->range--;
390	tmp->value = 0;	382	tmp->value = 0;
391	tmp->x = dx;	383
392	tmp->y = dy;	384	m->insert (tmp, dx, dy, op);
393	insert_ob_in_map (tmp, m, op, 0);
394	}	385	}
395	}	386	}
396	}	387	}
397	}	388	}
398
399		389
400	/* Causes an object to explode, eg, a firebullet,	390	/* Causes an object to explode, eg, a firebullet,
401	* poison cloud ball, etc. op is the object to	391	* poison cloud ball, etc. op is the object to
402	* explode.	392	* explode.
403	*/	393	*/
404	void	394	static void
405	explode_bullet (object *op)	395	explode_bullet (object *op)
406	{	396	{
407	object *tmp, *owner;	397	object *tmp, *owner;
408		398
409	if (op->other_arch == NULL)	399	if (!op->other_arch)
410	{	400	{
411	LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");	401	LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
412	op->remove ();
413	op->destroy (0);	402	op->destroy ();
414	return;	403	return;
415	}	404	}
416		405
417	if (op->env)	406	if (op->env)
418	{	407	{
419	object *env;	408	object *env = op->outer_env ();
420		409
421	env = object_get_env_recursive (op);
422	if (env->map == NULL || out_of_map (env->map, env->x, env->y))	410	if (!env->map || out_of_map (env->map, env->x, env->y))
423	{	411	{
424	LOG (llevError, "BUG: explode_bullet(): env out of map\n");	412	LOG (llevError, "BUG: explode_bullet(): env out of map\n");
425	op->remove ();
426	op->destroy (0);	413	op->destroy ();
427	return;	414	return;
428	}	415	}
429	op->remove ();	416
430	op->x = env->x;	417	op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
431	op->y = env->y;
432	insert_ob_in_map (op, env->map, op, INS_NO_MERGE | INS_NO_WALK_ON);
433	}	418	}
434	else if (out_of_map (op->map, op->x, op->y))	419	else if (out_of_map (op->map, op->x, op->y))
435	{	420	{
436	LOG (llevError, "BUG: explode_bullet(): op out of map\n");	421	LOG (llevError, "BUG: explode_bullet(): op out of map\n");
437	op->remove ();
438	op->destroy (0);	422	op->destroy ();
439	return;	423	return;
440	}	424	}
441		425
442	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps	426	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
443	// NOTE: If this breaks something important: remove this. I can't think of anything	427	// NOTE: If this breaks something important: remove this. I can't think of anything
444	// bad at the moment that might happen from this.	428	// bad at the moment that might happen from this.
445	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)	429	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
446	{	430	{
447	op->remove ();
448	op->destroy (0);	431	op->destroy ();
449	return;	432	return;
450	}	433	}
451		434
452	if (op->attacktype)	435	if (op->attacktype)
453	{	436	{
454	hit_map (op, 0, op->attacktype, 1);	437	hit_map (op, 0, op->attacktype, 1);
		438
455	if (op->destroyed ())	439	if (op->destroyed ())
456	return;	440	return;
457	}	441	}
458		442
459	/* other_arch contains what this explodes into */	443	/* other_arch contains what this explodes into */
460	tmp = arch_to_object (op->other_arch);	444	tmp = op->other_arch->instance ();
461		445
462	copy_owner (tmp, op);	446	tmp->set_owner (op);
463	tmp->skill = op->skill;	447	tmp->skill = op->skill;
464		448
465	owner = get_owner (op);	449	owner = op->owner;
466		450
467	if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))	451	if ((tmp->attacktype & AT_HOLYWORD
		452	|| tmp->attacktype & AT_GODPOWER)
		453	&& owner
		454	&& !tailor_god_spell (tmp, owner))
468	{	455	{
469	op->remove ();
470	op->destroy (0);	456	op->destroy ();
471	return;	457	return;
472	}	458	}
473
474	tmp->x = op->x;
475	tmp->y = op->y;
476		459
477	/* special for bombs - it actually has sane values for these */	460	/* special for bombs - it actually has sane values for these */
478	if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)	461	if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
479	{	462	{
480	tmp->attacktype = op->attacktype;	463	tmp->attacktype = op->attacktype;
…		…
484	}	467	}
485	else	468	else
486	{	469	{
487	if (op->attacktype & AT_MAGIC)	470	if (op->attacktype & AT_MAGIC)
488	tmp->attacktype |= AT_MAGIC;	471	tmp->attacktype |= AT_MAGIC;
		472
489	/* Spell doc describes what is going on here */	473	/* Spell doc describes what is going on here */
490	tmp->stats.dam = op->dam_modifier;	474	tmp->stats.dam = op->dam_modifier;
491	tmp->range = op->stats.maxhp;	475	tmp->range = op->stats.maxhp;
492	tmp->duration = op->stats.hp;	476	tmp->duration = op->stats.hp;
493	/* Used for spell tracking - just need a unique val for this spell -	477	/* Used for spell tracking - just need a unique val for this spell -
…		…
501	tmp->stats.sp = op->direction;	485	tmp->stats.sp = op->direction;
502		486
503	/* Prevent recursion */	487	/* Prevent recursion */
504	op->move_on = 0;	488	op->move_on = 0;
505		489
506	insert_ob_in_map (tmp, op->map, op, 0);	490	tmp->insert_at (op, op);
		491	tmp->play_sound (tmp->sound);
		492
507	/* remove the firebullet */	493	/* remove the firebullet */
508	if (!op->destroyed ())
509	{
510	op->remove ();
511	op->destroy (0);	494	op->destroy ();
512	}
513	}	495	}
514
515
516		496
517	/* checks to see what op should do, given the space it is on	497	/* checks to see what op should do, given the space it is on
518	* (eg, explode, damage player, etc)	498	* (eg, explode, damage player, etc)
519	*/	499	*/
520
521	void	500	void
522	check_bullet (object *op)	501	check_bullet (object *op)
523	{	502	{
524	object *tmp;	503	object *tmp;
525	int dam, mflags;	504	int dam, mflags;
…		…
540		519
541	/* If nothing alive on this space, no reason to do anything further */	520	/* If nothing alive on this space, no reason to do anything further */
542	if (!(mflags & P_IS_ALIVE))	521	if (!(mflags & P_IS_ALIVE))
543	return;	522	return;
544		523
545	for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	524	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
546	{	525	{
547	if (QUERY_FLAG (tmp, FLAG_ALIVE))	526	if (QUERY_FLAG (tmp, FLAG_ALIVE))
548	{	527	{
549	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);	528	dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
		529
		530	// TODO: can't understand the following if's
550	if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)	531	if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
551	{	532	{
552	if (!QUERY_FLAG (op, FLAG_REMOVED))	533	if (!QUERY_FLAG (op, FLAG_REMOVED))
553	{	534	{
554	op->remove ();
555	op->destroy (0);	535	op->destroy ();
556	return;	536	return;
557	}	537	}
558	}	538	}
559	}	539	}
560	}	540	}
561	}	541	}
562
563		542
564	/* Basically, we move 'op' one square, and if it hits something,	543	/* Basically, we move 'op' one square, and if it hits something,
565	* call check_bullet.	544	* call check_bullet.
566	* This function is only applicable to bullets, but not to all	545	* This function is only applicable to bullets, but not to all
567	* fired arches (eg, bolts).	546	* fired arches (eg, bolts).
568	*/	547	*/
569
570	void	548	void
571	move_bullet (object *op)	549	move_bullet (object *op)
572	{	550	{
573	sint16 new_x, new_y;
574	int mflags;
575	maptile *m;
576
577	#if 0	551	#if 0
578	/* We need a better general purpose way to do this */	552	/* We need a better general purpose way to do this */
579		553
580	/* peterm: added to make comet leave a trail of burnouts	554	/* peterm: added to make comet leave a trail of burnouts
581	it's an unadulterated hack, but the effect is cool. */	555	it's an unadulterated hack, but the effect is cool. */
…		…
589		563
590	/* Reached the end of its life - remove it */	564	/* Reached the end of its life - remove it */
591	if (--op->range <= 0)	565	if (--op->range <= 0)
592	{	566	{
593	if (op->other_arch)	567	if (op->other_arch)
594	{
595	explode_bullet (op);	568	explode_bullet (op);
596	}
597	else	569	else
598	{
599	op->remove ();
600	op->destroy (0);	570	op->destroy ();
601	}
602	return;
603	}
604		571
605	new_x = op->x + DIRX (op);	572	return;
606	new_y = op->y + DIRY (op);
607	m = op->map;
608	mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
609
610	if (mflags & P_OUT_OF_MAP)
611	{	573	}
612	op->remove ();	574
		575	mapxy pos (op);
		576	pos.move (op->direction);
		577
		578	if (!pos.normalise ())
		579	{
613	op->destroy (0);	580	op->destroy ();
614	return;	581	return;
615	}	582	}
616		583
617	if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))	584	mapspace &ms = pos.ms ();
		585
		586	ms.update ();
		587
		588	if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
618	{	589	{
619	if (op->other_arch)	590	if (op->other_arch)
620	{
621	explode_bullet (op);	591	explode_bullet (op);
622	}
623	else	592	else
624	{
625	op->remove ();
626	op->destroy (0);	593	op->destroy ();
627	}
628	return;
629	}
630		594
631	op->remove ();	595	return;
632	op->x = new_x;	596	}
633	op->y = new_y;	597
634	if ((op = insert_ob_in_map (op, m, op, 0)) == NULL)	598	if (!(op = pos.insert (op, op)))
635	return;	599	return;
636		600
637	if (reflwall (op->map, op->x, op->y, op))	601	if (reflwall (op->map, op->x, op->y, op))
638	{	602	{
639	op->direction = absdir (op->direction + 4);	603	op->direction = absdir (op->direction + 4);
640	update_turn_face (op);	604	update_turn_face (op);
641	}	605	}
642	else	606	else
643	{
644	check_bullet (op);	607	check_bullet (op);
645	}
646	}	608	}
647
648
649
650		609
651	/* fire_bullet	610	/* fire_bullet
652	* object op (cast from caster) files a bolt in dir.	611	* object op (cast from caster) files a bolt in dir.
653	* spob is the spell object for the bolt.	612	* spob is the spell object for the bolt.
654	* we remove the magic flag - that can be derived from	613	* we remove the magic flag - that can be derived from
655	* spob->attacktype.	614	* spob->attacktype.
656	* This function sets up the appropriate owner and skill	615	* This function sets up the appropriate owner and skill
657	* pointers.	616	* pointers.
658	*/	617	*/
659
660	int	618	int
661	fire_bullet (object *op, object *caster, int dir, object *spob)	619	fire_bullet (object *op, object *caster, int dir, object *spob)
662	{	620	{
663	object *tmp = NULL;	621	object *tmp = NULL;
664	int mflags;	622	int mflags;
665		623
666	if (!spob->other_arch)	624	if (!spob->other_arch)
667	return 0;	625	return 0;
668		626
669	tmp = arch_to_object (spob->other_arch);	627	tmp = spob->other_arch->instance ();
670	if (tmp == NULL)	628	if (!tmp)
671	return 0;	629	return 0;
672		630
673	/* peterm: level dependency for bolts */	631	/* peterm: level dependency for bolts */
674	tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);	632	tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
675	tmp->attacktype = spob->attacktype;	633	tmp->attacktype = spob->attacktype;
676	if (spob->slaying)	634	if (spob->slaying)
677	tmp->slaying = spob->slaying;	635	tmp->slaying = spob->slaying;
678		636
…		…
685		643
686	tmp->direction = dir;	644	tmp->direction = dir;
687	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	645	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
688	SET_ANIMATION (tmp, dir);	646	SET_ANIMATION (tmp, dir);
689		647
690	set_owner (tmp, op);	648	tmp->set_owner (op);
691	set_spell_skill (op, caster, spob, tmp);	649	set_spell_skill (op, caster, spob, tmp);
692		650
693	tmp->x = op->x + freearr_x[dir];	651	tmp->x = op->x + freearr_x[dir];
694	tmp->y = op->y + freearr_y[dir];	652	tmp->y = op->y + freearr_y[dir];
695	tmp->map = op->map;	653	tmp->map = op->map;
696		654
		655	maptile *newmap;
697	mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);	656	mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
698	if (mflags & P_OUT_OF_MAP)	657	if (mflags & P_OUT_OF_MAP)
699	{	658	{
700	tmp->destroy (0);	659	tmp->destroy ();
701	return 0;	660	return 0;
702	}	661	}
		662
		663	tmp->map = newmap;
		664
		665	// in case the bullet has direction 0 we explode it in place.
		666	// direction 0 is possible for instance when a poison cloud trap springs.
		667	if (tmp->direction == 0)
		668	{
		669	if (tmp->other_arch
		670	&& (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
		671	explode_bullet (tmp); // explode object will/should remove tmp
		672	else
		673	tmp->destroy ();
		674
		675	return 0;
		676	}
		677
703	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))	678	if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
704	{	679	{
705	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))	680	if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
706	{	681	{
707	tmp->destroy (0);	682	tmp->destroy ();
708	return 0;	683	return 0;
709	}	684	}
		685
710	tmp->x = op->x;	686	tmp->x = op->x;
711	tmp->y = op->y;	687	tmp->y = op->y;
712	tmp->direction = absdir (tmp->direction + 4);	688	tmp->direction = absdir (tmp->direction + 4);
713	tmp->map = op->map;	689	tmp->map = op->map;
714	}	690	}
715	if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)	691
716	{	692	if ((tmp = tmp->insert_at (tmp, op)))
717	check_bullet (tmp);	693	check_bullet (tmp);
718	}	694
719	return 1;	695	return 1;
720	}	696	}
721
722
723
724		697
725	/*****************************************************************************	698	/*****************************************************************************
726	*	699	*
727	* CONE RELATED FUNCTIONS	700	* CONE RELATED FUNCTIONS
728	*	701	*
729	*****************************************************************************/	702	*****************************************************************************/
730		703
731
732	/* drops an object based on what is in the cone's "other_arch" */	704	/* drops an object based on what is in the cone's "other_arch" */
733	void	705	static void
734	cone_drop (object *op)	706	cone_drop (object *op)
735	{	707	{
736	object *new_ob = arch_to_object (op->other_arch);	708	object *new_ob = op->other_arch->instance ();
737		709
738	new_ob->x = op->x;
739	new_ob->y = op->y;
740	new_ob->level = op->level;	710	new_ob->level = op->level;
741	set_owner (new_ob, op->owner);	711	new_ob->set_owner (op->owner);
742		712
743	/* preserve skill ownership */	713	/* preserve skill ownership */
744	if (op->skill && op->skill != new_ob->skill)	714	if (op->skill && op->skill != new_ob->skill)
745	{
746	new_ob->skill = op->skill;	715	new_ob->skill = op->skill;
747	}
748	insert_ob_in_map (new_ob, op->map, op, 0);
749		716
		717	new_ob->insert_at (op, op);
750	}	718	}
751		719
752	/* move_cone: causes cone object 'op' to move a space/hit creatures */	720	/* move_cone: causes cone object 'op' to move a space/hit creatures */
753		721
754	void	722	void
755	move_cone (object *op)	723	move_cone (object *op)
756	{	724	{
757	int i;
758
759	/* if no map then hit_map will crash so just ignore object */	725	/* if no map then hit_map will crash so just ignore object */
760	if (!op->map)	726	if (!op->map)
761	{	727	{
762	LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");	728	LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
763	op->speed = 0;	729	op->set_speed (0);
764	update_ob_speed (op);
765	return;	730	return;
766	}	731	}
767		732
768	/* lava saves it's life, but not yours :) */	733	/* lava saves it's life, but not yours :) */
769	if (QUERY_FLAG (op, FLAG_LIFESAVE))	734	if (QUERY_FLAG (op, FLAG_LIFESAVE))
…		…
775	#if 0	740	#if 0
776	/* Disable this - enabling it makes monsters easier, as	741	/* Disable this - enabling it makes monsters easier, as
777	* when their cone dies when they die.	742	* when their cone dies when they die.
778	*/	743	*/
779	/* If no owner left, the spell dies out. */	744	/* If no owner left, the spell dies out. */
780	if (get_owner (op) == NULL)	745	if (op->owner == NULL)
781	{	746	{
782	op->remove ();
783	op->destroy (0);	747	op->destroy ();
784	return;	748	return;
785	}	749	}
786	#endif	750	#endif
787		751
788	hit_map (op, 0, op->attacktype, 0);	752	hit_map (op, 0, op->attacktype, 0);
		753
		754	if (!op->is_on_map ())
		755	return;
789		756
790	/* Check to see if we should push anything.	757	/* Check to see if we should push anything.
791	* Spell objects with weight push whatever they encounter to some	758	* Spell objects with weight push whatever they encounter to some
792	* degree.	759	* degree.
793	*/	760	*/
794	if (op->weight)	761	if (op->weight)
		762	{
795	check_spell_knockback (op);	763	check_spell_knockback (op);
796		764
797	if (op->destroyed ())	765	if (!op->is_on_map ())
798	return;	766	return;
		767	}
799		768
800	if ((op->duration--) < 0)	769	if (op->duration-- < 0)
801	{	770	{
802	op->remove ();
803	op->destroy (0);	771	op->destroy ();
804	return;	772	return;
805	}	773	}
806	/* Object has hit maximum range, so don't have it move	774	/* Object has hit maximum range, so don't have it move
807	* any further. When the duration above expires,	775	* any further. When the duration above expires,
808	* then the object will get removed.	776	* then the object will get removed.
…		…
811	{	779	{
812	op->range = 0; /* just so it doesn't wrap */	780	op->range = 0; /* just so it doesn't wrap */
813	return;	781	return;
814	}	782	}
815		783
816	for (i = -1; i < 2; i++)	784	for (int i = -1; i <= 1; i++)
817	{	785	{
818	sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];	786	sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
819		787
820	if (ok_to_put_more (op->map, x, y, op, op->attacktype))	788	if (ok_to_put_more (op->map, x, y, op, op->attacktype))
821	{	789	{
822	object *tmp = get_object ();	790	object *tmp = op->clone ();
823
824	copy_object (op, tmp);
825	tmp->x = x;
826	tmp->y = y;
827		791
828	tmp->duration = op->duration + 1;	792	tmp->duration = op->duration + 1;
829		793
830	/* Use for spell tracking - see ok_to_put_more() */	794	/* Use for spell tracking - see ok_to_put_more() */
831	tmp->stats.maxhp = op->stats.maxhp;	795	tmp->stats.maxhp = op->stats.maxhp;
832	insert_ob_in_map (tmp, op->map, op, 0);	796
		797	op->map->insert (tmp, x, y, op);
		798
833	if (tmp->other_arch)	799	if (tmp->other_arch)
834	cone_drop (tmp);	800	cone_drop (tmp);
835	}	801	}
836	}	802	}
837	}	803	}
…		…
870		836
871	/* Need to know what the movetype of the object we are about	837	/* Need to know what the movetype of the object we are about
872	* to create is, so we can know if the space we are about to	838	* to create is, so we can know if the space we are about to
873	* insert it into is blocked.	839	* insert it into is blocked.
874	*/	840	*/
875	movetype = spell->other_arch->clone.move_type;	841	movetype = spell->other_arch->move_type;
876		842
877	for (i = range_min; i <= range_max; i++)	843	for (i = range_min; i <= range_max; i++)
878	{	844	{
879	sint16 x, y, d;	845	sint16 x, y;
880		846
881	/* We can't use absdir here, because it never returns	847	/* We can't use absdir here, because it never returns
882	* 0. If this is a rune, we want to hit the person on top	848	* 0. If this is a rune, we want to hit the person on top
883	* of the trap (d==0). If it is not a rune, then we don't want	849	* of the trap (d==0). If it is not a rune, then we don't want
884	* to hit that person.	850	* to hit that person.
885	*/	851	*/
886	d = dir + i;	852	int d = dir ? absdir (dir + i) : i;
887	while (d < 0)
888	d += 8;
889	while (d > 8)
890	d -= 8;
891		853
892	/* If it's not a rune, we don't want to blast the caster.	854	/* If it's not a rune, we don't want to blast the caster.
893	* In that case, we have to see - if dir is specified,	855	* In that case, we have to see - if dir is specified,
894	* turn this into direction 8. If dir is not specified (all	856	* turn this into direction 8. If dir is not specified (all
895	* direction) skip - otherwise, one line would do more damage	857	* direction) skip - otherwise, one line would do more damage
…		…
912		874
913	if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)	875	if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
914	continue;	876	continue;
915		877
916	success = 1;	878	success = 1;
917	tmp = arch_to_object (spell->other_arch);	879	tmp = spell->other_arch->instance ();
918	set_owner (tmp, op);	880	tmp->set_owner (op);
919	set_spell_skill (op, caster, spell, tmp);	881	set_spell_skill (op, caster, spell, tmp);
920	tmp->level = caster_level (caster, spell);	882	tmp->level = casting_level (caster, spell);
921	tmp->x = sx;
922	tmp->y = sy;
923	tmp->attacktype = spell->attacktype;	883	tmp->attacktype = spell->attacktype;
924		884
925	/* holy word stuff */	885	/* holy word stuff */
926	if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))	886	if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
927	if (!tailor_god_spell (tmp, op))	887	if (!tailor_god_spell (tmp, op))
…		…
961	else	921	else
962	tmp->duration += caster->level / 3;	922	tmp->duration += caster->level / 3;
963	}	923	}
964		924
965	if (!(tmp->move_type & MOVE_FLY_LOW))	925	if (!(tmp->move_type & MOVE_FLY_LOW))
966	LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->name);	926	LOG (llevDebug, "cast_cone(): arch %s doesn't have flying 1\n", &spell->other_arch->archname);
967		927
968	if (!tmp->move_on && tmp->stats.dam)	928	if (!tmp->move_on && tmp->stats.dam)
969	{
970	LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->name);	929	LOG (llevDebug, "cast_cone(): arch %s doesn't have move_on set\n", &spell->other_arch->archname);
971	}
972		930
973	insert_ob_in_map (tmp, m, op, 0);	931	m->insert (tmp, sx, sy, op);
974		932
975	/* This is used for tracking spells so that one effect doesn't hit	933	/* This is used for tracking spells so that one effect doesn't hit
976	* a single space too many times.	934	* a single space too many times.
977	*/	935	*/
978	tmp->stats.maxhp = tmp->count;	936	tmp->stats.maxhp = tmp->count;
…		…
988	*	946	*
989	* BOMB related code	947	* BOMB related code
990	*	948	*
991	****************************************************************************/	949	****************************************************************************/
992		950
993
994	/* This handles an exploding bomb.	951	/* This handles an exploding bomb.
995	* op is the original bomb object.	952	* op is the original bomb object.
996	*/	953	*/
997	void	954	void
998	animate_bomb (object *op)	955	animate_bomb (object *op)
999	{	956	{
1000	int i;
1001	object *env, *tmp;
1002	archetype *at;
1003
1004	if (op->state != NUM_ANIMATIONS (op) - 1)	957	if (op->state != NUM_ANIMATIONS (op) - 1)
1005	return;	958	return;
1006		959
1007	env = object_get_env_recursive (op);	960	object *env = op->outer_env ();
1008		961
1009	if (op->env)	962	if (op->env)
1010	{	963	{
1011	if (env->map == NULL)	964	if (!env->map)
1012	return;	965	return;
1013		966
1014	if (env->type == PLAYER)	967	if (!(op = op->insert_at (env, op)))
1015	esrv_del_item (env->contr, op->count);
1016
1017	op->remove ();
1018	op->x = env->x;
1019	op->y = env->y;
1020	if ((op = insert_ob_in_map (op, env->map, op, 0)) == NULL)
1021	return;	968	return;
1022	}	969	}
1023		970
1024	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding	971	// elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
1025	// on a safe map. I don't like this special casing, but it seems to be neccessary	972	// on a safe map. I don't like this special casing, but it seems to be neccessary
1026	// as bombs can be carried.	973	// as bombs can be carried.
1027	if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)	974	if (op->ms ().flags () & P_SAFE)
1028	{	975	{
1029	op->remove ();
1030	op->destroy (0);	976	op->destroy ();
1031	return;	977	return;
1032	}	978	}
1033		979
1034	/* This copies a lot of the code from the fire bullet,	980	/* This copies a lot of the code from the fire bullet,
1035	* but using the cast_bullet isn't really feasible,	981	* but using the cast_bullet isn't really feasible,
1036	* so just set up the appropriate values.	982	* so just set up the appropriate values.
1037	*/	983	*/
1038	at = archetype::find (SPLINT);	984	if (archetype *at = archetype::find (SPLINT))
1039	if (at)
1040	{	985	{
1041	for (i = 1; i < 9; i++)	986	for (int i = 1; i < 9; i++)
1042	{	987	{
1043	if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))	988	if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
1044	continue;	989	continue;
1045	tmp = arch_to_object (at);	990
		991	object *tmp = at->instance ();
1046	tmp->direction = i;	992	tmp->direction = i;
1047	tmp->range = op->range;	993	tmp->range = op->range;
1048	tmp->stats.dam = op->stats.dam;	994	tmp->stats.dam = op->stats.dam;
1049	tmp->duration = op->duration;	995	tmp->duration = op->duration;
1050	tmp->attacktype = op->attacktype;	996	tmp->attacktype = op->attacktype;
1051	copy_owner (tmp, op);	997	tmp->set_owner (op);
1052	if (op->skill && op->skill != tmp->skill)	998	if (op->skill && op->skill != tmp->skill)
1053	{
1054	tmp->skill = op->skill;	999	tmp->skill = op->skill;
1055	}	1000
1056	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))	1001	if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
1057	SET_ANIMATION (tmp, i);	1002	SET_ANIMATION (tmp, i);
1058	tmp->x = op->x + freearr_x[i];	1003
1059	tmp->y = op->y + freearr_x[i];	1004	op->map->insert (tmp, op->x + freearr_x[i], op->y + freearr_x[i], op);
1060	insert_ob_in_map (tmp, op->map, op, 0);
1061	move_bullet (tmp);	1005	move_bullet (tmp);
1062	}	1006	}
1063	}	1007	}
1064		1008
1065	explode_bullet (op);	1009	explode_bullet (op);
1066	}	1010	}
1067		1011
1068	int	1012	int
1069	create_bomb (object *op, object *caster, int dir, object *spell)	1013	create_bomb (object *op, object *caster, int dir, object *spell)
1070	{	1014	{
1071
1072	object *tmp;	1015	object *tmp;
1073	int mflags;	1016	int mflags;
1074	sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];	1017	sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
1075	maptile *m;	1018	maptile *m;
1076		1019
1077	mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);	1020	mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
		1021
		1022	// when creating a bomb below ourself it should always work, even
		1023	// when movement is blocked (somehow we got here, somehow we are here,
		1024	// so we should also be able to make a bomb here). (originally added
		1025	// to fix create bomb traps in doors, which cast with dir=0).
		1026	if (dir)
		1027	{
1078	if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))	1028	if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
1079	{	1029	{
1080	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");	1030	new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
1081	return 0;	1031	return 0;
		1032	}
1082	}	1033	}
1083	tmp = arch_to_object (spell->other_arch);	1034
		1035	tmp = spell->other_arch->instance ();
1084		1036
1085	/* level dependencies for bomb */	1037	/* level dependencies for bomb */
1086	tmp->range = spell->range + SP_level_range_adjust (caster, spell);	1038	tmp->range = spell->range + SP_level_range_adjust (caster, spell);
1087	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1039	tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1088	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);	1040	tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
1089	tmp->attacktype = spell->attacktype;	1041	tmp->attacktype = spell->attacktype;
1090		1042
1091	set_owner (tmp, op);	1043	tmp->set_owner (op);
1092	set_spell_skill (op, caster, spell, tmp);	1044	set_spell_skill (op, caster, spell, tmp);
1093	tmp->x = dx;	1045
1094	tmp->y = dy;	1046	m->insert (tmp, dx, dy, op);
1095	insert_ob_in_map (tmp, m, op, 0);
1096	return 1;	1047	return 1;
1097	}	1048	}
1098		1049
1099	/****************************************************************************	1050	/****************************************************************************
1100	*	1051	*
…		…
1109	* dir is the direction to look in.	1060	* dir is the direction to look in.
1110	* range is how far out to look.	1061	* range is how far out to look.
1111	* type is the type of spell - either SPELL_MANA or SPELL_GRACE.	1062	* type is the type of spell - either SPELL_MANA or SPELL_GRACE.
1112	* this info is used for blocked magic/unholy spaces.	1063	* this info is used for blocked magic/unholy spaces.
1113	*/	1064	*/
1114		1065	static object *
1115	object *
1116	get_pointed_target (object *op, int dir, int range, int type)	1066	get_pointed_target (object *op, int dir, int range, int type)
1117	{	1067	{
1118	object *target;	1068	object *target;
1119	sint16 x, y;	1069	sint16 x, y;
1120	int dist, mflags;	1070	int dist, mflags;
…		…
1138	return NULL;	1088	return NULL;
1139	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)	1089	if (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
1140	return NULL;	1090	return NULL;
1141		1091
1142	if (mflags & P_IS_ALIVE)	1092	if (mflags & P_IS_ALIVE)
1143	{
1144	for (target = get_map_ob (mp, x, y); target; target = target->above)	1093	for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
1145	{	1094	if (QUERY_FLAG (target, FLAG_MONSTER))
1146	if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
1147	{
1148	return target;	1095	return target;
1149	}
1150	}
1151	}
1152	}	1096	}
		1097
1153	return NULL;	1098	return NULL;
1154	}	1099	}
1155
1156		1100
1157	/* cast_smite_arch() - the priest points to a creature and causes	1101	/* cast_smite_arch() - the priest points to a creature and causes
1158	* a 'godly curse' to decend.	1102	* a 'godly curse' to decend.
1159	* usual params -	1103	* usual params -
1160	* op = player	1104	* op = player
1161	* caster = object casting the spell.	1105	* caster = object casting the spell.
1162	* dir = direction being cast	1106	* dir = direction being cast
1163	* spell = spell object	1107	* spell = spell object
1164	*/	1108	*/
1165
1166	int	1109	int
1167	cast_smite_spell (object *op, object *caster, int dir, object *spell)	1110	cast_smite_spell (object *op, object *caster, int dir, object *spell)
1168	{	1111	{
1169	object *effect, *target;	1112	object *effect, *target;
1170	object *god = find_god (determine_god (op));	1113	object *god = find_god (determine_god (op));
…		…
1180	* interesting spell.	1123	* interesting spell.
1181	* if it is a cleric spell, you need a god, and the creature	1124	* if it is a cleric spell, you need a god, and the creature
1182	* can't be friendly to your god.	1125	* can't be friendly to your god.
1183	*/	1126	*/
1184		1127
1185	if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL)	1128	if (!target
		1129	|| target->flag [FLAG_REFL_SPELL]
1186	|| (!god && spell->stats.grace)	1130	|| (!god && spell->stats.grace)
1187	|| (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race)))	1131	|| (god && target->title == god->name)
		1132	|| (god && target->race.contains (god->race)))
1188	{	1133	{
1189	new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");	1134	new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
1190	return 0;	1135	return 0;
1191	}	1136	}
1192		1137
1193	if (spell->other_arch)	1138	if (spell->other_arch)
1194	effect = arch_to_object (spell->other_arch);	1139	effect = spell->other_arch->instance ();
1195	else	1140	else
1196	return 0;	1141	return 0;
1197		1142
1198	/* tailor the effect by priest level and worshipped God */	1143	/* tailor the effect by priest level and worshipped God */
1199	effect->level = caster_level (caster, spell);	1144	effect->level = casting_level (caster, spell);
1200	effect->attacktype = spell->attacktype;	1145	effect->attacktype = spell->attacktype;
1201	if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))	1146	if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
1202	{	1147	{
1203	if (tailor_god_spell (effect, op))	1148	if (tailor_god_spell (effect, op))
1204	new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));	1149	new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
1205	else	1150	else
1206	{	1151	{
1207	new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");	1152	new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
1208	return 0;	1153	return 0;
1209	}	1154	}
…		…
1216	if (effect->attacktype & AT_DEATH)	1161	if (effect->attacktype & AT_DEATH)
1217	{	1162	{
1218	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1163	effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1219		1164
1220	/* casting death spells at undead isn't a good thing */	1165	/* casting death spells at undead isn't a good thing */
1221	if QUERY_FLAG
1222	(target, FLAG_UNDEAD)	1166	if (QUERY_FLAG (target, FLAG_UNDEAD))
1223	{	1167	{
1224	if (random_roll (0, 2, op, PREFER_LOW))	1168	if (random_roll (0, 2, op, PREFER_LOW))
1225	{	1169	{
1226	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");	1170	new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
1227	effect->x = op->x;	1171	effect->x = op->x;
…		…
1229	}	1173	}
1230	else	1174	else
1231	{	1175	{
1232	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));	1176	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
1233	target->stats.hp = target->stats.maxhp * 2;	1177	target->stats.hp = target->stats.maxhp * 2;
1234	effect->destroy (0);	1178	effect->destroy ();
1235	return 0;	1179	return 0;
1236	}	1180	}
1237	}	1181	}
1238	}	1182	}
1239	else	1183	else
1240	{	1184	{
1241	/* how much woe to inflict :) */	1185	/* how much woe to inflict :) */
1242	effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1186	effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
1243	}	1187	}
1244		1188
1245	set_owner (effect, op);	1189	effect->set_owner (op);
1246	set_spell_skill (op, caster, spell, effect);	1190	set_spell_skill (op, caster, spell, effect);
1247		1191
1248	/* ok, tell it where to be, and insert! */	1192	/* ok, tell it where to be, and insert! */
1249	effect->x = target->x;	1193	effect->insert_at (target, op);
1250	effect->y = target->y;
1251	insert_ob_in_map (effect, target->map, op, 0);
1252		1194
1253	return 1;	1195	return 1;
1254	}	1196	}
1255
1256		1197
1257	/****************************************************************************	1198	/****************************************************************************
1258	*	1199	*
1259	* MAGIC MISSILE code.	1200	* MAGIC MISSILE code.
1260	* note that the fire_bullet is used to fire the missile. The	1201	* note that the fire_bullet is used to fire the missile. The
…		…
1263		1204
1264	/* op is a missile that needs to be moved */	1205	/* op is a missile that needs to be moved */
1265	void	1206	void
1266	move_missile (object *op)	1207	move_missile (object *op)
1267	{	1208	{
1268	int i, mflags;
1269	object *owner;
1270	sint16 new_x, new_y;
1271	maptile *m;
1272
1273	if (op->range-- <= 0)	1209	if (op->range-- <= 0)
1274	{	1210	{
1275	op->remove ();	1211	op->drop_and_destroy ();
		1212	return;
		1213	}
		1214
		1215	mapxy pos (op);
		1216	pos.move (op->direction);
		1217
		1218	if (!pos.normalise ())
		1219	{
1276	op->destroy (0);	1220	op->destroy ();
1277	return;	1221	return;
1278	}
1279
1280	owner = get_owner (op);
1281	#if 0
1282	/* It'd make things nastier if this wasn't here - spells cast by
1283	* monster that are then killed would continue to survive
1284	*/
1285	if (owner == NULL)
1286	{	1222	}
1287	op->remove ();
1288	op->destroy (0);
1289	return;
1290	}
1291	#endif
1292		1223
1293	new_x = op->x + DIRX (op);	1224	mapspace &ms = pos.ms ();
1294	new_y = op->y + DIRY (op);
1295		1225
1296	mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);	1226	if (ms.flags () & P_IS_ALIVE || ms.blocks (op))
1297
1298	if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
1299	{	1227	{
1300	hit_map (op, op->direction, AT_MAGIC, 1);	1228	hit_map (op, op->direction, AT_MAGIC, 1);
1301	/* Basically, missile only hits one thing then goes away.	1229	/* Basically, missile only hits one thing then goes away.
1302	* we need to remove it if someone hasn't already done so.	1230	* we need to remove it if someone hasn't already done so.
1303	*/	1231	*/
1304	if (!op->destroyed ())
1305	op->destroy (0);
1306
1307	return;
1308	}
1309
1310	op->remove ();
1311
1312	if (!op->direction || (mflags & P_OUT_OF_MAP))
1313	{
1314	op->destroy (0);	1232	op->destroy ();
1315	return;	1233	return;
		1234	}
		1235
		1236	if (!op->direction)
1316	}	1237	{
		1238	op->destroy ();
		1239	return;
		1240	}
1317		1241
1318	op->x = new_x;	1242	int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
1319	op->y = new_y;
1320	op->map = m;
1321	i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
1322	if (i > 0 && i != op->direction)	1243	if (i > 0 && i != op->direction)
1323	{	1244	{
1324	op->direction = i;	1245	op->direction = i;
1325	SET_ANIMATION (op, op->direction);	1246	SET_ANIMATION (op, op->direction);
1326	}	1247	}
1327		1248
1328	insert_ob_in_map (op, op->map, op, 0);	1249	pos.insert (op, op);
1329	}	1250	}
1330		1251
1331	/****************************************************************************	1252	/****************************************************************************
1332	* Destruction	1253	* Destruction
1333	****************************************************************************/	1254	****************************************************************************/
…		…
1336	* we do this by creating a force and inserting it in the	1257	* we do this by creating a force and inserting it in the
1337	* object. if time is 0, the object glows permanently. To truely	1258	* object. if time is 0, the object glows permanently. To truely
1338	* make this work for non-living objects, we would have to	1259	* make this work for non-living objects, we would have to
1339	* give them the capability to have an inventory. b.t.	1260	* give them the capability to have an inventory. b.t.
1340	*/	1261	*/
1341		1262	static int
1342	int
1343	make_object_glow (object *op, int radius, int time)	1263	make_object_glow (object *op, int radius, int time)
1344	{	1264	{
1345	object *tmp;
1346
1347	/* some things are unaffected... */	1265	/* some things are unaffected... */
1348	if (op->path_denied & PATH_LIGHT)	1266	if (op->path_denied & PATH_LIGHT)
1349	return 0;	1267	return 0;
1350		1268
1351	tmp = get_archetype (FORCE_NAME);	1269	object *tmp = get_archetype (FORCE_NAME);
1352	tmp->speed = 0.01;	1270	tmp->speed = 0.01;
1353	tmp->stats.food = time;	1271	tmp->stats.food = time;
1354	SET_FLAG (tmp, FLAG_IS_USED_UP);	1272	SET_FLAG (tmp, FLAG_IS_USED_UP);
1355	tmp->glow_radius = radius;	1273	tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
1356	if (tmp->glow_radius > MAX_LIGHT_RADII)
1357	tmp->glow_radius = MAX_LIGHT_RADII;
1358
1359	tmp->x = op->x;
1360	tmp->y = op->y;
1361	if (tmp->speed < MIN_ACTIVE_SPEED)
1362	tmp->speed = MIN_ACTIVE_SPEED; /* safety */
1363	tmp = insert_ob_in_ob (tmp, op);	1274	tmp = insert_ob_in_ob (tmp, op);
		1275
1364	if (tmp->glow_radius > op->glow_radius)	1276	if (tmp->glow_radius > op->glow_radius)
1365	op->glow_radius = tmp->glow_radius;	1277	op->set_glow_radius (tmp->glow_radius);
1366		1278
1367	if (!tmp->env || op != tmp->env)
1368	{
1369	LOG (llevError, "make_object_glow() failed to insert glowing force in %s\n", &op->name);
1370	return 0;
1371	}
1372	return 1;	1279	return 1;
1373	}	1280	}
1374
1375
1376
1377		1281
1378	int	1282	int
1379	cast_destruction (object *op, object *caster, object *spell_ob)	1283	cast_destruction (object *op, object *caster, object *spell_ob)
1380	{	1284	{
1381	int i, j, range, mflags, friendly = 0, dam, dur;
1382	sint16 sx, sy;
1383	maptile *m;
1384	object *tmp;
1385	const char *skill;
1386
1387	range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);	1285	int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
1388	dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);	1286	int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
1389	dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);	1287	int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
1390	if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER)	1288
1391	friendly = 1;	1289	bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
1392		1290
1393	/* destruction doesn't use another spell object, so we need	1291	/* destruction doesn't use another spell object, so we need
1394	* update op's skill pointer so that exp is properly awarded.	1292	* update op's skill pointer so that exp is properly awarded.
1395	* We do some shortcuts here - since this is just temporary
1396	* and we'll reset the values back, we don't need to go through
1397	* the full share string/free_string route.
1398	*/	1293	*/
1399	skill = op->skill;	1294	const shstr skill = op->skill;
		1295
1400	if (caster == op)	1296	if (caster == op)
1401	op->skill = spell_ob->skill;	1297	op->skill = spell_ob->skill;
1402	else if (caster->skill)	1298	else if (caster->skill)
1403	op->skill = caster->skill;	1299	op->skill = caster->skill;
1404	else	1300	else
1405	op->skill = NULL;	1301	op->skill = 0;
1406		1302
1407	change_skill (op, find_skill_by_name (op, op->skill), 1);	1303	op->change_skill (find_skill_by_name (op, op->skill));
1408		1304
1409	for (i = -range; i < range; i++)	1305	unordered_mapwalk (op, -range, -range, range, range)
1410	{	1306	{
1411	for (j = -range; j < range; j++)	1307	mapspace &ms = m->at (nx, ny);
1412	{	1308
1413	m = op->map;
1414	sx = op->x + i;
1415	sy = op->y + j;
1416	mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
1417	if (mflags & P_OUT_OF_MAP)
1418	continue;
1419	if (mflags & P_IS_ALIVE)	1309	if (ms.flags () & P_IS_ALIVE)
		1310	for (object *next, *tmp = ms.bot; tmp; tmp = next)
1420	{	1311	{
1421	for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above)	1312	next = tmp->above;
		1313
		1314	if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
1422	{	1315	{
1423	if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
1424	break;
1425	}
1426	if (tmp)
1427	{
1428	if (tmp->head)
1429	tmp = tmp->head;	1316	tmp = tmp->head_ ();
1430		1317
1431	if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||	1318	if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
1432	(!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))	1319	|| (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
1433	{	1320	{
1434	if (spell_ob->subtype == SP_DESTRUCTION)	1321	if (spell_ob->subtype == SP_DESTRUCTION)
1435	{	1322	{
1436	hit_player (tmp, dam, op, spell_ob->attacktype, 0);	1323	hit_player (tmp, dam, op, spell_ob->attacktype, 0);
		1324
1437	if (spell_ob->other_arch)	1325	if (spell_ob->other_arch)
1438	{	1326	m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1439	tmp = arch_to_object (spell_ob->other_arch);
1440	tmp->x = sx;
1441	tmp->y = sy;
1442	insert_ob_in_map (tmp, m, op, 0);
1443	}
1444	}	1327	}
1445	else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist[ATNR_MAGIC] != 100)	1328	else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
1446	{	1329	{
1447	if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)	1330	if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
1448	{	1331	m->insert (spell_ob->other_arch->instance (), nx, ny, op);
1449	object *effect = arch_to_object (spell_ob->other_arch);
1450
1451	effect->x = sx;
1452	effect->y = sy;
1453	insert_ob_in_map (effect, m, op, 0);
1454	}
1455	}	1332	}
1456	}	1333	}
1457	}	1334	}
1458	}	1335	}
1459	}
1460	}	1336	}
		1337
1461	op->skill = skill;	1338	op->skill = skill;
1462	return 1;	1339	return 1;
1463	}	1340	}
1464		1341
1465	/***************************************************************************	1342	/***************************************************************************
1466	*	1343	*
1467	* CURSE	1344	* CURSE
1468	*	1345	*
1469	***************************************************************************/	1346	***************************************************************************/
1470
1471	int	1347	int
1472	cast_curse (object *op, object *caster, object *spell_ob, int dir)	1348	cast_curse (object *op, object *caster, object *spell_ob, int dir)
1473	{	1349	{
1474	object *god = find_god (determine_god (op));	1350	object *god = find_god (determine_god (op));
1475	object *tmp, *force;	1351	object *tmp, *force;
…		…
1479	{	1355	{
1480	new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");	1356	new_draw_info (NDI_UNIQUE, 0, op, "There is no one in that direction to curse.");
1481	return 0;	1357	return 0;
1482	}	1358	}
1483		1359
		1360	tmp = tmp->head_ ();
		1361
1484	/* If we've already got a force of this type, don't add a new one. */	1362	/* If we've already got a force of this type, don't add a new one. */
1485	for (force = tmp->inv; force != NULL; force = force->below)	1363	for (force = tmp->inv; force; force = force->below)
1486	{	1364	{
1487	if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)	1365	if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
1488	{	1366	{
1489	if (force->name == spell_ob->name)	1367	if (force->name == spell_ob->name)
1490	{	1368	{
…		…
1496	return 0;	1374	return 0;
1497	}	1375	}
1498	}	1376	}
1499	}	1377	}
1500		1378
1501	if (force == NULL)	1379	if (!force)
1502	{	1380	{
1503	force = get_archetype (FORCE_NAME);	1381	force = get_archetype (FORCE_NAME);
1504	force->subtype = FORCE_CHANGE_ABILITY;	1382	force->subtype = FORCE_CHANGE_ABILITY;
		1383
1505	if (spell_ob->race)	1384	if (spell_ob->race)
1506	force->name = spell_ob->race;	1385	force->name = spell_ob->race;
1507	else	1386	else
1508	force->name = spell_ob->name;	1387	force->name = spell_ob->name;
1509		1388
…		…
1519	{	1398	{
1520	force->duration = duration;	1399	force->duration = duration;
1521	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");	1400	new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
1522	}	1401	}
1523	else	1402	else
1524	{
1525	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");	1403	new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
1526	}	1404
1527	return 1;	1405	return 1;
1528	}	1406	}
		1407
1529	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;	1408	force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
1530	force->speed = 1.0;	1409	force->speed = 1.f;
1531	force->speed_left = -1.0;	1410	force->speed_left = -1.f;
1532	SET_FLAG (force, FLAG_APPLIED);	1411	SET_FLAG (force, FLAG_APPLIED);
1533		1412
1534	if (god)	1413	if (god)
1535	{	1414	{
1536	if (spell_ob->last_grace)	1415	if (spell_ob->last_grace)
…		…
1549	force->stats.ac = spell_ob->stats.ac;	1428	force->stats.ac = spell_ob->stats.ac;
1550	force->stats.wc = spell_ob->stats.wc;	1429	force->stats.wc = spell_ob->stats.wc;
1551		1430
1552	change_abil (tmp, force); /* Mostly to display any messages */	1431	change_abil (tmp, force); /* Mostly to display any messages */
1553	insert_ob_in_ob (force, tmp);	1432	insert_ob_in_ob (force, tmp);
1554	fix_player (tmp);	1433	tmp->update_stats ();
		1434
1555	return 1;	1435	return 1;
1556
1557	}	1436	}
1558
1559		1437
1560	/**********************************************************************	1438	/**********************************************************************
1561	* mood change	1439	* mood change
1562	* Arguably, this may or may not be an attack spell. But since it	1440	* Arguably, this may or may not be an attack spell. But since it
1563	* effects monsters, it seems best to put it into this file	1441	* effects monsters, it seems best to put it into this file
…		…
1568	*/	1446	*/
1569	int	1447	int
1570	mood_change (object *op, object *caster, object *spell)	1448	mood_change (object *op, object *caster, object *spell)
1571	{	1449	{
1572	object *tmp, *god, *head;	1450	object *tmp, *god, *head;
1573	int done_one, range, mflags, level, at, best_at;	1451	int done_one, range, level, at, best_at;
1574	sint16 x, y, nx, ny;
1575	maptile *m;
1576	const char *race;	1452	const char *race;
1577		1453
1578	/* We precompute some values here so that we don't have to keep	1454	/* We precompute some values here so that we don't have to keep
1579	* doing it over and over again.	1455	* doing it over and over again.
1580	*/	1456	*/
1581	god = find_god (determine_god (op));	1457	god = find_god (determine_god (op));
1582	level = caster_level (caster, spell);	1458	level = casting_level (caster, spell);
1583	range = spell->range + SP_level_range_adjust (caster, spell);	1459	range = spell->range + SP_level_range_adjust (caster, spell);
1584		1460
1585	/* On the bright side, no monster should ever have a race of GOD_...	1461	/* On the bright side, no monster should ever have a race of GOD_...
1586	* so even if the player doesn't worship a god, if race=GOD_.., it	1462	* so even if the player doesn't worship a god, if race=GOD_.., it
1587	* won't ever match anything.	1463	* won't ever match anything.
1588	*/	1464	*/
1589	if (!spell->race)	1465	if (!spell->race)
1590	race = NULL;	1466	race = NULL;
1591	else if (god && !strcmp (spell->race, "GOD_SLAYING"))	1467	else if (god && spell->race == shstr_GOD_SLAYING)
1592	race = god->slaying;	1468	race = god->slaying;
1593	else if (god && !strcmp (spell->race, "GOD_FRIEND"))	1469	else if (god && spell->race == shstr_GOD_FRIEND)
1594	race = god->race;	1470	race = god->race;
1595	else	1471	else
1596	race = spell->race;	1472	race = spell->race;
1597		1473
1598		1474	unordered_mapwalk (op, -range, -range, range, range)
1599	for (x = op->x - range; x <= op->x + range; x++)
1600	for (y = op->y - range; y <= op->y + range; y++)
1601	{	1475	{
		1476	mapspace &ms = m->at (nx, ny);
1602		1477
1603	done_one = 0;
1604	m = op->map;
1605	nx = x;
1606	ny = y;
1607	mflags = get_map_flags (m, &m, x, y, &nx, &ny);
1608	if (mflags & P_OUT_OF_MAP)
1609	continue;
1610
1611	/* If there is nothing living on this space, no need to go further */	1478	/* If there is nothing living on this space, no need to go further */
1612	if (!(mflags & P_IS_ALIVE))	1479	if (!ms.flags () & P_IS_ALIVE)
1613	continue;	1480	continue;
1614		1481
1615	for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)	1482	// players can only affect spaces that they can actually see
1616	if (QUERY_FLAG (tmp, FLAG_MONSTER))	1483	if (caster
		1484	&& caster->contr
		1485	&& caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
		1486	continue;
		1487
		1488	for (tmp = ms.top; tmp; tmp = tmp->below)
		1489	if (tmp->flag [FLAG_MONSTER])
1617	break;	1490	break;
1618		1491
1619	/* There can be living objects that are not monsters */	1492	/* There can be living objects that are not monsters */
1620	if (!tmp || tmp->type == PLAYER)	1493	if (!tmp)
1621	continue;	1494	continue;
1622		1495
1623	/* Only the head has meaningful data, so resolve to that */	1496	/* Only the head has meaningful data, so resolve to that */
1624	if (tmp->head)
1625	head = tmp->head;	1497	head = tmp->head_ ();
1626	else
1627	head = tmp;
1628		1498
1629	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */	1499	/* Make sure the race is OK. Likewise, only effect undead if spell specifically allows it */
1630	if (race && head->race && !strstr (race, head->race))	1500	if (race && head->race && !strstr (race, head->race))
1631	continue;	1501	continue;
		1502
1632	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))	1503	if (QUERY_FLAG (head, FLAG_UNDEAD) && !QUERY_FLAG (spell, FLAG_UNDEAD))
1633	continue;	1504	continue;
1634		1505
1635	/* Now do a bunch of stuff related to saving throws */	1506	/* Now do a bunch of stuff related to saving throws */
1636	best_at = -1;	1507	best_at = -1;
1637	if (spell->attacktype)	1508	if (spell->attacktype)
1638	{	1509	{
1639	for (at = 0; at < NROFATTACKS; at++)	1510	for (at = 0; at < NROFATTACKS; at++)
1640	if (spell->attacktype & (1 << at))	1511	if (spell->attacktype & (1 << at))
1641	if (best_at == -1 || head->resist[at] > head->resist[best_at])	1512	if (best_at == -1 || head->resist[at] > head->resist[best_at])
1642	best_at = at;	1513	best_at = at;
1643		1514
1644	if (best_at == -1)	1515	if (best_at == -1)
1645	at = 0;	1516	at = 0;
1646	else	1517	else
1647	{	1518	{
1648	if (head->resist[best_at] == 100)	1519	if (head->resist[best_at] == 100)
1649	continue;	1520	continue;
1650	else	1521	else
1651	at = head->resist[best_at] / 5;	1522	at = head->resist[best_at] / 5;
1652	}	1523	}
		1524
1653	at -= level / 5;	1525	at -= level / 5;
1654	if (did_make_save (head, head->level, at))	1526	if (did_make_save (head, head->level, at))
1655	continue;	1527	continue;
1656	}	1528	}
1657	else /* spell->attacktype */	1529	else /* spell->attacktype */
		1530	{
1658	/*	1531	/*
1659	Spell has no attacktype (charm & such), so we'll have a specific saving:	1532	Spell has no attacktype (charm & such), so we'll have a specific saving:
1660	* if spell level < monster level, no go	1533	* if spell level < monster level, no go
1661	* else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )	1534	* else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
1662		1535
…		…
1664		1537
1665	This is required to fix the 'charm monster' abuse, where a player level 1 can	1538	This is required to fix the 'charm monster' abuse, where a player level 1 can
1666	charm a level 125 monster...	1539	charm a level 125 monster...
1667		1540
1668	Ryo, august 14th	1541	Ryo, august 14th
1669	*/	1542	*/
1670	{
1671	if (head->level > level)	1543	if (head->level > level)
1672	continue;	1544	continue;
		1545
1673	if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))	1546	if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
1674	/* Failed, no effect */	1547	/* Failed, no effect */
1675	continue;	1548	continue;
1676	}	1549	}
1677		1550
1678	/* Done with saving throw. Now start effecting the monster */	1551	/* Done with saving throw. Now start affecting the monster */
		1552	done_one = 0;
1679		1553
1680	/* aggravation */	1554	/* aggravation */
1681	if (QUERY_FLAG (spell, FLAG_MONSTER))	1555	if (QUERY_FLAG (spell, FLAG_MONSTER))
1682	{	1556	{
1683	CLEAR_FLAG (head, FLAG_SLEEP);	1557	CLEAR_FLAG (head, FLAG_SLEEP);
1684	if (QUERY_FLAG (head, FLAG_FRIENDLY))
1685	remove_friendly_object (head);	1558	remove_friendly_object (head);
1686
1687	done_one = 1;	1559	done_one = 1;
1688	head->enemy = op;	1560	head->enemy = op;
1689	}	1561	}
1690		1562
1691	/* calm monsters */	1563	/* calm monsters */
1692	if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))	1564	if (QUERY_FLAG (spell, FLAG_UNAGGRESSIVE) && !QUERY_FLAG (head, FLAG_UNAGGRESSIVE))
1693	{	1565	{
1694	SET_FLAG (head, FLAG_UNAGGRESSIVE);	1566	SET_FLAG (head, FLAG_UNAGGRESSIVE);
1695	head->enemy = NULL;	1567	head->enemy = NULL;
1696	done_one = 1;	1568	done_one = 1;
1697	}	1569	}
1698		1570
1699	/* berserk monsters */	1571	/* berserk monsters */
1700	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))	1572	if (QUERY_FLAG (spell, FLAG_BERSERK) && !QUERY_FLAG (head, FLAG_BERSERK))
1701	{	1573	{
1702	SET_FLAG (head, FLAG_BERSERK);	1574	SET_FLAG (head, FLAG_BERSERK);
1703	done_one = 1;	1575	done_one = 1;
1704	}	1576	}
		1577
1705	/* charm */	1578	/* charm */
1706	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))	1579	if (QUERY_FLAG (spell, FLAG_NO_ATTACK) && !QUERY_FLAG (head, FLAG_FRIENDLY))
1707	{	1580	{
1708	SET_FLAG (head, FLAG_FRIENDLY);	1581	INVOKE_OBJECT (KILL, head, ARG_OBJECT (caster));
		1582
1709	/* Prevent uncontolled outbreaks of self replicating monsters.	1583	/* Prevent uncontrolled outbreaks of self replicating monsters.
1710	Typical use case is charm, go somwhere, use aggravation to make hostile.	1584	Typical use case is charm, go somwhere, use aggravation to make hostile.
1711	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */	1585	This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
1712	CLEAR_FLAG (head, FLAG_GENERATOR);	1586	CLEAR_FLAG (head, FLAG_GENERATOR);
1713	set_owner (head, op);	1587	head->set_owner (op);
1714	set_spell_skill (op, caster, spell, head);	1588	set_spell_skill (op, caster, spell, head);
1715	add_friendly_object (head);	1589	add_friendly_object (head);
1716	head->attack_movement = PETMOVE;	1590	head->attack_movement = PETMOVE;
1717	done_one = 1;	1591	done_one = 1;
1718	change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);	1592	change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
1719	head->stats.exp = 0;	1593	head->stats.exp = 0;
1720	}	1594	}
1721		1595
1722	/* If a monster was effected, put an effect in */	1596	/* If a monster was effected, put an effect in */
1723	if (done_one && spell->other_arch)	1597	if (done_one && spell->other_arch)
1724	{	1598	m->insert (spell->other_arch->instance (), nx, ny, op);
1725	tmp = arch_to_object (spell->other_arch);	1599	}
1726	tmp->x = nx;
1727	tmp->y = ny;
1728	insert_ob_in_map (tmp, m, op, 0);
1729	}
1730	} /* for y */
1731		1600
1732	return 1;	1601	return 1;
1733	}	1602	}
1734
1735		1603
1736	/* Move_ball_spell: This handles ball type spells that just sort of wander	1604	/* Move_ball_spell: This handles ball type spells that just sort of wander
1737	* about. was called move_ball_lightning, but since more than the ball	1605	* about. was called move_ball_lightning, but since more than the ball
1738	* lightning spell used it, that seemed misnamed.	1606	* lightning spell used it, that seemed misnamed.
1739	* op is the spell effect.	1607	* op is the spell effect.
1740	* note that duration is handled by process_object() in time.c	1608	* note that duration is handled by process_object() in time.c
1741	*/	1609	*/
1742
1743	void	1610	void
1744	move_ball_spell (object *op)	1611	move_ball_spell (object *op)
1745	{	1612	{
1746	int i, j, dam_save, dir, mflags;	1613	int i, j, dam_save, dir, mflags;
1747	sint16 nx, ny, hx, hy;	1614	sint16 nx, ny, hx, hy;
1748	object *owner;	1615	object *owner;
1749	maptile *m;	1616	maptile *m;
1750		1617
1751	owner = get_owner (op);	1618	owner = op->owner;
1752		1619
1753	/* the following logic makes sure that the ball doesn't move into a wall,	1620	/* the following logic makes sure that the ball doesn't move into a wall,
1754	* and makes sure that it will move along a wall to try and get at it's	1621	* and makes sure that it will move along a wall to try and get at it's
1755	* victim. The block immediately below more or less chooses a random	1622	* victim. The block immediately below more or less chooses a random
1756	* offset to move the ball, eg, keep it mostly on course, with some	1623	* offset to move the ball, eg, keep it mostly on course, with some
…		…
1766	for (i = 1; i < 9; i++)	1633	for (i = 1; i < 9; i++)
1767	{	1634	{
1768	/* i bit 0: alters sign of offset	1635	/* i bit 0: alters sign of offset
1769	* other bits (i / 2): absolute value of offset	1636	* other bits (i / 2): absolute value of offset
1770	*/	1637	*/
1771
1772	int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);	1638	int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
1773	int tmpdir = absdir (op->direction + offset);	1639	int tmpdir = absdir (op->direction + offset);
1774		1640
1775	nx = op->x + freearr_x[tmpdir];	1641	nx = op->x + freearr_x[tmpdir];
1776	ny = op->y + freearr_y[tmpdir];	1642	ny = op->y + freearr_y[tmpdir];
…		…
1778	{	1644	{
1779	dir = tmpdir;	1645	dir = tmpdir;
1780	break;	1646	break;
1781	}	1647	}
1782	}	1648	}
		1649
1783	if (dir == 0)	1650	if (dir == 0)
1784	{	1651	{
1785	nx = op->x;	1652	nx = op->x;
1786	ny = op->y;	1653	ny = op->y;
1787	m = op->map;	1654	m = op->map;
1788	}	1655	}
1789		1656
1790	op->remove ();	1657	m->insert (op, nx, ny, op);
1791	op->y = ny;
1792	op->x = nx;
1793	insert_ob_in_map (op, m, op, 0);
1794		1658
1795	dam_save = op->stats.dam; /* save the original dam: we do halfdam on	1659	dam_save = op->stats.dam; /* save the original dam: we do halfdam on
1796	surrounding squares */	1660	surrounding squares */
1797		1661
1798	/* loop over current square and neighbors to hit.	1662	/* loop over current square and neighbors to hit.
1799	* if this has an other_arch field, we insert that in	1663	* if this has an other_arch field, we insert that in
1800	* the surround spaces.	1664	* the surround spaces.
1801	*/	1665	*/
1802	for (j = 0; j < 9; j++)	1666	for (j = 0; j < 9; j++)
1803	{	1667	{
1804	object *new_ob;
1805
1806	hx = nx + freearr_x[j];	1668	hx = nx + freearr_x[j];
1807	hy = ny + freearr_y[j];	1669	hy = ny + freearr_y[j];
1808		1670
1809	m = op->map;	1671	m = op->map;
1810	mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);	1672	mflags = get_map_flags (m, &m, hx, hy, &hx, &hy);
…		…
1818		1680
1819	if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))	1681	if ((mflags & P_IS_ALIVE) && (!owner || owner->x != hx || owner->y != hy || !on_same_map (owner, op)))
1820	{	1682	{
1821	if (j)	1683	if (j)
1822	op->stats.dam = dam_save / 2;	1684	op->stats.dam = dam_save / 2;
		1685
1823	hit_map (op, j, op->attacktype, 1);	1686	hit_map (op, j, op->attacktype, 1);
1824
1825	}	1687	}
1826		1688
1827	/* insert the other arch */	1689	/* insert the other arch */
1828	if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))	1690	if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
1829	{	1691	m->insert (op->other_arch->instance (), hx, hy, op);
1830	new_ob = arch_to_object (op->other_arch);
1831	new_ob->x = hx;
1832	new_ob->y = hy;
1833	insert_ob_in_map (new_ob, m, op, 0);
1834	}
1835	}	1692	}
1836		1693
1837	/* restore to the center location and damage */	1694	/* restore to the center location and damage */
1838	op->stats.dam = dam_save;	1695	op->stats.dam = dam_save;
1839		1696
1840	i = spell_find_dir (op->map, op->x, op->y, get_owner (op));	1697	i = spell_find_dir (op->map, op->x, op->y, op->owner);
1841		1698
1842	if (i >= 0)	1699	if (i >= 0)
1843	{ /* we have a preferred direction! */	1700	{ /* we have a preferred direction! */
1844	/* pick another direction if the preferred dir is blocked. */	1701	/* pick another direction if the preferred dir is blocked. */
1845	if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||	1702	if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
1846	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))	1703	OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy)))
1847	{
1848	i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */	1704	i = absdir (i + rndm (0, 2) - 1); /* -1, 0, +1 */
1849	}	1705
1850	op->direction = i;	1706	op->direction = i;
1851	}	1707	}
1852	}	1708	}
1853		1709
1854
1855	/* move_swarm_spell: peterm	1710	/* move_swarm_spell: peterm
1856	* This is an implementation of the swarm spell. It was written for	1711	* This is an implementation of the swarm spell. It was written for
1857	* meteor swarm, but it could be used for any swarm. A swarm spell	1712	* meteor swarm, but it could be used for any swarm. A swarm spell
1858	* is a special type of object that casts swarms of other types	1713	* is a special type of object that casts swarms of other types
1859	* of spells. Which spell it casts is flexible. It fires the spells	1714	* of spells. Which spell it casts is flexible. It fires the spells
1860	* from a set of squares surrounding the caster, in a given direction.	1715	* from a set of squares surrounding the caster, in a given direction.
1861	*/	1716	*/
1862
1863	void	1717	void
1864	move_swarm_spell (object *op)	1718	move_swarm_spell (object *op)
1865	{	1719	{
1866	#if 0	1720	#if 0
1867	static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };	1721	static int cardinal_adjust[9] = { -3, -2, -1, 0, 0, 0, 1, 2, 3 };
1868	static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };	1722	static int diagonal_adjust[10] = { -3, -2, -2, -1, 0, 0, 1, 2, 2, 3 };
1869	sint16 target_x, target_y, origin_x, origin_y;	1723	sint16 target_x, target_y, origin_x, origin_y;
1870	int adjustdir;	1724	int adjustdir;
1871	maptile *m;	1725	maptile *m;
1872	#endif	1726	#endif
1873	int basedir;
1874	object *owner;	1727	object *owner = op->env;
1875		1728
1876	owner = get_owner (op);	1729	if (!owner) // MUST not happen, remove when true TODO
1877	if (op->duration == 0 || owner == NULL)
1878	{	1730	{
1879	op->remove ();	1731	LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
1880	op->destroy (0);	1732	op->destroy ();
1881	return;	1733	return;
		1734	}
		1735
		1736	if (!op->duration || !owner->is_on_map ())
1882	}	1737	{
		1738	op->drop_and_destroy ();
		1739	return;
		1740	}
		1741
1883	op->duration--;	1742	op->duration--;
1884		1743
1885	basedir = op->direction;	1744	int basedir = op->direction;
1886	if (basedir == 0)	1745	if (!basedir)
1887	{	1746	{
1888	/* spray in all directions! 8) */	1747	/* spray in all directions! 8) */
1889	basedir = rndm (1, 8);	1748	op->facing = (op->facing + op->state) & 7;
		1749	basedir = op->facing + 1;
1890	}	1750	}
1891		1751
1892	#if 0	1752	#if 0
1893	// this is bogus: it causes wrong places to be checked below	1753	// this is bogus: it causes wrong places to be checked below
1894	// (a wall 2 cells away will block the effect...) and	1754	// (a wall 2 cells away will block the effect...) and
1895	// doesn't work for SP_BULLET anyhow, so again tests the wrong	1755	// doesn't work for SP_BULLET anyhow, so again tests the wrong
1896	// space.	1756	// space.
1897	// should be fixed later, but correctness before featurs...	1757	// should be fixed later, but correctness before features...
1898	// (schmorp)	1758	// (schmorp)
1899		1759
1900	/* new offset calculation to make swarm element distribution	1760	/* new offset calculation to make swarm element distribution
1901	* more uniform	1761	* more uniform
1902	*/	1762	*/
…		…
1955	{	1815	{
1956	/* Bullet spells have a bunch more customization that needs to be done */	1816	/* Bullet spells have a bunch more customization that needs to be done */
1957	if (op->spell->subtype == SP_BULLET)	1817	if (op->spell->subtype == SP_BULLET)
1958	fire_bullet (owner, op, basedir, op->spell);	1818	fire_bullet (owner, op, basedir, op->spell);
1959	else if (op->spell->subtype == SP_MAGIC_MISSILE)	1819	else if (op->spell->subtype == SP_MAGIC_MISSILE)
1960	fire_arch_from_position (owner, op, op->x, op->y, basedir, op->spell);	1820	fire_arch_from_position (owner, op, owner->x, owner->y, basedir, op->spell);
1961	}	1821	}
1962	}	1822	}
1963
1964
1965
1966		1823
1967	/* fire_swarm:	1824	/* fire_swarm:
1968	* The following routine creates a swarm of objects. It actually	1825	* The following routine creates a swarm of objects. It actually
1969	* sets up a specific swarm object, which then fires off all	1826	* sets up a specific swarm object, which then fires off all
1970	* the parts of the swarm.	1827	* the parts of the swarm.
…		…
1973	* caster: the caster (owner, wand, rod, scroll)	1830	* caster: the caster (owner, wand, rod, scroll)
1974	* dir: the direction everything will be fired in	1831	* dir: the direction everything will be fired in
1975	* spell - the spell that is this spell.	1832	* spell - the spell that is this spell.
1976	* n: the number to be fired.	1833	* n: the number to be fired.
1977	*/	1834	*/
1978
1979	int	1835	int
1980	fire_swarm (object *op, object *caster, object *spell, int dir)	1836	fire_swarm (object *op, object *caster, object *spell, int dir)
1981	{	1837	{
1982	object *tmp;
1983	int i;
1984
1985	if (!spell->other_arch)	1838	if (!spell->other_arch)
1986	return 0;	1839	return 0;
1987		1840
1988	tmp = get_archetype (SWARM_SPELL);	1841	object *tmp = archetype::get (SWARM_SPELL);
1989	tmp->x = op->x;	1842
1990	tmp->y = op->y;
1991	set_owner (tmp, op); /* needed so that if swarm elements kill, caster gets xp. */
1992	set_spell_skill (op, caster, spell, tmp);	1843	set_spell_skill (op, caster, spell, tmp);
1993
1994	tmp->level = caster_level (caster, spell); /*needed later, to get level dep. right. */	1844	tmp->level = casting_level (caster, spell); /* needed later, to get level dep. right. */
1995	tmp->spell = arch_to_object (spell->other_arch);	1845	tmp->spell = spell->other_arch->instance ();
1996
1997	tmp->attacktype = tmp->spell->attacktype;	1846	tmp->attacktype = tmp->spell->attacktype;
1998		1847
1999	if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)	1848	if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
2000	{
2001	if (!tailor_god_spell (tmp, op))	1849	if (!tailor_god_spell (tmp, op))
2002	return 1;	1850	return 1;
2003	}	1851
2004	tmp->duration = SP_level_duration_adjust (caster, spell);	1852	tmp->duration = SP_level_duration_adjust (caster, spell);
2005	for (i = 0; i < spell->duration; i++)	1853	for (int i = 0; i < spell->duration; i++)
2006	tmp->duration += die_roll (1, 3, op, PREFER_HIGH);	1854	tmp->duration += die_roll (1, 3, op, PREFER_HIGH);
2007		1855
		1856	tmp->invisible = 1;
		1857	tmp->flag [FLAG_NO_DROP] = 1; // make sure it stays in inv, or else
2008	tmp->direction = dir;	1858	tmp->direction = dir;
2009	tmp->invisible = 1;	1859	tmp->facing = rndm (1, 8); // initial firing direction
2010	insert_ob_in_map (tmp, op->map, op, 0);	1860	tmp->state = rndm (4) * 2 + 1; // direction increment
		1861
		1862	op->insert (tmp);
		1863
2011	return 1;	1864	return 1;
2012	}	1865	}
2013
2014		1866
2015	/* See the spells documentation file for why this is its own	1867	/* See the spells documentation file for why this is its own
2016	* function.	1868	* function.
2017	*/	1869	*/
2018	int	1870	int
…		…
2023	int dam, mflags;	1875	int dam, mflags;
2024	maptile *m;	1876	maptile *m;
2025		1877
2026	dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);	1878	dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
2027		1879
2028	if (!dir)	1880	if (dir)
2029	{
2030	new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
2031	return 0;
2032	}	1881	{
2033
2034	x = op->x + freearr_x[dir];	1882	x = op->x + freearr_x[dir];
2035	y = op->y + freearr_y[dir];	1883	y = op->y + freearr_y[dir];
2036	m = op->map;	1884	m = op->map;
2037		1885
2038	mflags = get_map_flags (m, &m, x, y, &x, &y);	1886	mflags = get_map_flags (m, &m, x, y, &x, &y);
2039		1887
2040	if (mflags & P_OUT_OF_MAP)	1888	if (mflags & P_OUT_OF_MAP)
2041	{	1889	{
2042	new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");	1890	new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
2043	return 0;	1891	return 0;
2044	}	1892	}
2045		1893
2046	if (mflags & P_IS_ALIVE && spell->attacktype)	1894	if (mflags & P_IS_ALIVE && spell->attacktype)
2047	{	1895	{
2048	for (target = get_map_ob (m, x, y); target; target = target->above)	1896	for (target = GET_MAP_OB (m, x, y); target; target = target->above)
2049	if (QUERY_FLAG (target, FLAG_MONSTER))	1897	if (QUERY_FLAG (target, FLAG_MONSTER))
2050	{	1898	{
2051	/* oky doky. got a target monster. Lets make a blinding attack */	1899	/* oky doky. got a target monster. Lets make a blinding attack */
2052	if (target->head)	1900	if (target->head)
2053	target = target->head;	1901	target = target->head;
		1902
2054	(void) hit_player (target, dam, op, spell->attacktype, 1);	1903	hit_player (target, dam, op, spell->attacktype, 1);
2055	return 1; /* one success only! */	1904	return 1; /* one success only! */
		1905	}
2056	}	1906	}
2057	}
2058		1907
2059	/* no live target, perhaps a wall is in the way? */	1908	/* no live target, perhaps a wall is in the way? */
2060	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))	1909	if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
2061	{	1910	{
2062	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");	1911	new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
2063	return 0;	1912	return 0;
		1913	}
2064	}	1914	}
2065		1915
2066	/* ok, looks groovy to just insert a new light on the map */	1916	/* ok, looks groovy to just insert a new light on the map */
2067	tmp = arch_to_object (spell->other_arch);	1917	tmp = spell->other_arch->instance ();
2068	if (!tmp)	1918	if (!tmp)
2069	{	1919	{
2070	LOG (llevError, "Error: spell arch for cast_light() missing.\n");	1920	LOG (llevError, "Error: spell arch for cast_light() missing.\n");
2071	return 0;	1921	return 0;
2072	}	1922	}
		1923
2073	tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);	1924	tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
		1925
2074	if (tmp->glow_radius)	1926	if (tmp->glow_radius)
2075	{	1927	tmp->set_glow_radius (
2076	tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);	1928	clamp (spell->range + SP_level_range_adjust (caster, spell), 1, MAX_LIGHT_RADIUS)
2077	if (tmp->glow_radius > MAX_LIGHT_RADII)	1929	);
2078	tmp->glow_radius = MAX_LIGHT_RADII;	1930
2079	}	1931	if (dir)
2080	tmp->x = x;	1932	m->insert (tmp, x, y, op);
2081	tmp->y = y;	1933	else
2082	insert_ob_in_map (tmp, m, op, 0);	1934	caster->outer_env_or_self ()->insert (tmp);
		1935
2083	return 1;	1936	return 1;
2084	}	1937	}
2085
2086
2087
2088		1938
2089	/* cast_cause_disease: this spell looks along <dir> from the	1939	/* cast_cause_disease: this spell looks along <dir> from the
2090	* player and infects someone.	1940	* player and infects someone.
2091	* op is the player/monster, caster is the object, dir is the direction	1941	* op is the player/monster, caster is the object, dir is the direction
2092	* to cast, disease_arch is the specific disease, and type is the spell number	1942	* to cast, disease_arch is the specific disease, and type is the spell number
2093	* perhaps this should actually be in disease.c?	1943	* perhaps this should actually be in disease.c?
2094	*/	1944	*/
2095
2096	int	1945	int
2097	cast_cause_disease (object *op, object *caster, object *spell, int dir)	1946	cast_cause_disease (object *op, object *caster, object *spell, int dir)
2098	{	1947	{
2099	sint16 x, y;	1948	sint16 x, y;
2100	int i, mflags, range, dam_mod, dur_mod;	1949	int i, mflags, range, dam_mod, dur_mod;
…		…
2107	/* If casting from a scroll, no direction will be available, so refer to the	1956	/* If casting from a scroll, no direction will be available, so refer to the
2108	* direction the player is pointing.	1957	* direction the player is pointing.
2109	*/	1958	*/
2110	if (!dir)	1959	if (!dir)
2111	dir = op->facing;	1960	dir = op->facing;
		1961
2112	if (!dir)	1962	if (!dir)
2113	return 0; /* won't find anything if casting on ourself, so just return */	1963	return 0; /* won't find anything if casting on ourself, so just return */
2114		1964
2115	/* Calculate these once here */	1965	/* Calculate these once here */
2116	range = spell->range + SP_level_range_adjust (caster, spell);	1966	range = spell->range + SP_level_range_adjust (caster, spell);
…		…
2135		1985
2136	/* Only bother looking on this space if there is something living here */	1986	/* Only bother looking on this space if there is something living here */
2137	if (mflags & P_IS_ALIVE)	1987	if (mflags & P_IS_ALIVE)
2138	{	1988	{
2139	/* search this square for a victim */	1989	/* search this square for a victim */
2140	for (walk = get_map_ob (m, x, y); walk; walk = walk->above)	1990	for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
2141	if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))	1991	if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
2142	{ /* found a victim */	1992	{ /* found a victim */
2143	object *disease = arch_to_object (spell->other_arch);	1993	object *disease = spell->other_arch->instance ();
2144		1994
2145	set_owner (disease, op);	1995	disease->set_owner (op);
2146	set_spell_skill (op, caster, spell, disease);	1996	set_spell_skill (op, caster, spell, disease);
2147	disease->stats.exp = 0;	1997	disease->stats.exp = 0;
2148	disease->level = caster_level (caster, spell);	1998	disease->level = casting_level (caster, spell);
2149		1999
2150	/* do level adjustments */	2000	/* do level adjustments */
2151	if (disease->stats.wc)	2001	if (disease->stats.wc)
2152	disease->stats.wc += dur_mod / 2;	2002	disease->stats.wc += dur_mod / 2;
2153		2003
2154	if (disease->magic > 0)	2004	if (disease->magic > 0)
2155	disease->magic += dur_mod / 4;	2005	disease->magic += dur_mod / 8;
2156		2006
2157	if (disease->stats.maxhp > 0)	2007	if (disease->stats.maxhp > 0)
2158	disease->stats.maxhp += dur_mod;	2008	disease->stats.maxhp += dur_mod;
2159		2009
2160	if (disease->stats.maxgrace > 0)	2010	if (disease->stats.maxgrace > 0)
…		…
2195	if (disease->stats.sp)	2045	if (disease->stats.sp)
2196	disease->stats.sp -= dam_mod;	2046	disease->stats.sp -= dam_mod;
2197		2047
2198	if (infect_object (walk, disease, 1))	2048	if (infect_object (walk, disease, 1))
2199	{	2049	{
2200	object *flash; /* visual effect for inflicting disease */
2201
2202	new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);	2050	new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
2203		2051
2204	disease->destroy (0); /* don't need this one anymore */	2052	disease->destroy (); /* don't need this one anymore */
2205	flash = get_archetype (ARCH_DETECT_MAGIC);	2053	walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
2206	flash->x = x;
2207	flash->y = y;
2208	flash->map = walk->map;
2209	insert_ob_in_map (flash, walk->map, op, 0);
2210	return 1;	2054	return 1;
2211	}	2055	}
		2056
2212	disease->destroy (0);	2057	disease->destroy ();
2213	}	2058	}
2214	} /* if living creature */	2059	} /* if living creature */
2215	} /* for range of spaces */	2060	} /* for range of spaces */
		2061
2216	new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");	2062	new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");
2217	return 1;	2063	return 1;
2218	}	2064	}

Diff Legend

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