ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/attack.C

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.15 by root, Thu Sep 14 20:46:10 2006 UTC vs.
Revision 1.110 by root, Tue Sep 1 20:56:05 2009 UTC

1
2	/*	1	/*
3	* static char *rcsid_attack_c =	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4	* "$Id: attack.C,v 1.15 2006/09/14 20:46:10 root Exp $";	3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
		6	* Copyright (©) 1992,2007 Frank Tore Johansen
		7	*
		8	* Deliantra is free software: you can redistribute it and/or modify
		9	* it under the terms of the GNU General Public License as published by
		10	* the Free Software Foundation, either version 3 of the License, or
		11	* (at your option) any later version.
		12	*
		13	* This program is distributed in the hope that it will be useful,
		14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	* GNU General Public License for more details.
		17	*
		18	* You should have received a copy of the GNU General Public License
		19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		20	*
		21	* The authors can be reached via e-mail to <support@deliantra.net>
5	*/	22	*/
6		23
7	/*
8	CrossFire, A Multiplayer game for X-windows
9
10	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen
12
13	This program is free software; you can redistribute it and/or modify
14	it under the terms of the GNU General Public License as published by
15	the Free Software Foundation; either version 2 of the License, or
16	(at your option) any later version.
17
18	This program is distributed in the hope that it will be useful,
19	but WITHOUT ANY WARRANTY; without even the implied warranty of
20	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21	GNU General Public License for more details.
22
23	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26
27	The authors can be reached via e-mail to crossfire-devel@real-time.com
28	*/
29	#include <assert.h>	24	#include <assert.h>
30	#include <global.h>	25	#include <global.h>
31	#include <living.h>	26	#include <living.h>
32	#include <material.h>	27	#include <material.h>
33	#include <skills.h>	28	#include <skills.h>
34
35	#ifndef __CEXTRACT__
36	# include <sproto.h>
37	#endif
38
39	#include <sounds.h>	29	#include <sounds.h>
		30	#include <sproto.h>
40		31
41	typedef struct att_msg_str	32	typedef struct att_msg_str
42	{	33	{
43	char *msg1;	34	char *msg1;
44	char *msg2;	35	char *msg2;
…		…
50	* its magical benefits.	41	* its magical benefits.
51	*/	42	*/
52	void	43	void
53	cancellation (object *op)	44	cancellation (object *op)
54	{	45	{
55	object *tmp;
56
57	if (op->invisible)	46	if (op->invisible)
58	return;	47	return;
59		48
60	if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)	49	if (QUERY_FLAG (op, FLAG_ALIVE) || op->type == CONTAINER || op->type == THROWN_OBJ)
61	{	50	{
62	/* Recur through the inventory */	51	/* Recurse through the inventory */
63	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	52	for (object *tmp = op->inv; tmp; tmp = tmp->below)
64	if (!did_make_save_item (tmp, AT_CANCELLATION, op))	53	if (!did_make_save_item (tmp, AT_CANCELLATION, op))
65	cancellation (tmp);	54	cancellation (tmp);
66	}	55	}
67	else if (FABS (op->magic) <= (rndm (0, 5)))	56	else if (FABS (op->magic) <= rndm (0, 5))
68	{	57	{
69	/* Nullify this object. This code could probably be more complete */	58	/* Nullify this object. This code could probably be more complete */
70	/* in what abilities it should cancel */	59	/* in what abilities it should cancel */
71	op->magic = 0;	60	op->magic = 0;
		61
72	CLEAR_FLAG (op, FLAG_DAMNED);	62	CLEAR_FLAG (op, FLAG_DAMNED);
73	CLEAR_FLAG (op, FLAG_CURSED);	63	CLEAR_FLAG (op, FLAG_CURSED);
74	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);	64	CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL);
75	CLEAR_FLAG (op, FLAG_KNOWN_CURSED);	65	CLEAR_FLAG (op, FLAG_KNOWN_CURSED);
76	if (op->env && op->env->type == PLAYER)
77	{
78	esrv_send_item (op->env, op);
79	}
80	}
81	}
82		66
83		67	if (object *pl = op->visible_to ())
		68	esrv_update_item (UPD_FLAGS, pl, op);
		69	}
		70	}
84		71
85	/* did_make_save_item just checks to make sure the item actually	72	/* did_make_save_item just checks to make sure the item actually
86	* made its saving throw based on the tables. It does not take	73	* made its saving throw based on the tables. It does not take
87	* any further action (like destroying the item).	74	* any further action (like destroying the item).
88	*/	75	*/
89
90	int	76	int
91	did_make_save_item (object *op, int type, object *originator)	77	did_make_save_item (object *op, int type, object *originator)
92	{	78	{
93	int i, roll, saves = 0, attacks = 0, number;	79	int i, roll, saves = 0, attacks = 0, number;
94	materialtype_t *mt;	80	materialtype_t *mt;
95		81
96	if (op->materialname == NULL)	82	if (!op->materialname)
97	{	83	{
98	for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)	84	for (mt = materialt; mt; mt = mt->next)
99	{
100	if (op->material & mt->material)	85	if (op->materials & mt->material)
101	break;	86	break;
102	}
103	}	87	}
104	else	88	else
105	mt = name_to_material (op->materialname);	89	mt = name_to_material (op->materialname);
106	if (mt == NULL)	90
		91	if (!mt)
107	return TRUE;	92	return TRUE;
		93
108	roll = rndm (1, 20);	94	roll = rndm (1, 20);
109		95
110	/* the attacktypes have no meaning for object saves	96	/* the attacktypes have no meaning for object saves
111	* If the type is only magic, don't adjust type - basically, if	97	* If the type is only magic, don't adjust type - basically, if
112	* pure magic is hitting an object, it should save. However, if it	98	* pure magic is hitting an object, it should save. However, if it
…		…
118	if (type != AT_MAGIC)	104	if (type != AT_MAGIC)
119	type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |	105	type &= ~(AT_CONFUSION | AT_DRAIN | AT_GHOSTHIT | AT_POISON | AT_SLOW |
120	AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |	106	AT_PARALYZE | AT_TURN_UNDEAD | AT_FEAR | AT_DEPLETE | AT_DEATH |
121	AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);	107	AT_COUNTERSPELL | AT_HOLYWORD | AT_BLIND | AT_LIFE_STEALING | AT_MAGIC);
122		108
123	if (type == 0)	109	if (type == 0) return TRUE;
124	return TRUE;	110
125	if (roll == 20)	111	if (roll == 20) return TRUE;
126	return TRUE;	112	if (roll == 1) return FALSE;
127	if (roll == 1)
128	return FALSE;
129		113
130	for (number = 0; number < NROFATTACKS; number++)	114	for (number = 0; number < NROFATTACKS; number++)
131	{	115	{
132	i = 1 << number;	116	i = 1 << number;
		117
133	if (!(i & type))	118	if (!(i & type))
134	continue;	119	continue;
		120
135	attacks++;	121	attacks++;
136	if (op->resist[number] == 100)	122	if (op->resist[number] == 100)
137	saves++;	123	saves++;
138	else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)	124	else if (roll >= mt->save[number] - op->magic - op->resist[number] / 100)
139	saves++;	125	saves++;
…		…
141	saves++;	127	saves++;
142	}	128	}
143		129
144	if (saves == attacks || attacks == 0)	130	if (saves == attacks || attacks == 0)
145	return TRUE;	131	return TRUE;
		132
146	if ((saves == 0) || (rndm (1, attacks) > saves))	133	if (saves == 0 || (rndm (1, attacks) > saves))
147	return FALSE;	134	return FALSE;
		135
148	return TRUE;	136	return TRUE;
149	}	137	}
150		138
151	/* This function calls did_make_save_item. It then performs the	139	/* This function calls did_make_save_item. It then performs the
152	* appropriate actions to the item (such as burning the item up,	140	* appropriate actions to the item (such as burning the item up,
153	* calling cancellation, etc.)	141	* calling cancellation, etc.)
154	*/	142	*/
155
156	void	143	void
157	save_throw_object (object *op, int type, object *originator)	144	save_throw_object (object *op, int type, object *originator)
158	{	145	{
159	if (!did_make_save_item (op, type, originator))	146	if (!did_make_save_item (op, type, originator))
160	{	147	{
161	object *env = op->env;	148	object *env = op->env;
162	int x = op->x, y = op->y;	149	int x = op->x, y = op->y;
163	mapstruct *m = op->map;	150	maptile *m = op->map;
164		151
165	op = stop_item (op);	152	op = stop_item (op);
166	if (op == NULL)	153	if (!op)
167	return;	154	return;
168		155
169	/* Hacked the following so that type LIGHTER will work.	156	/* Hacked the following so that type LIGHTER will work.
170	* Also, objects which are potenital "lights" that are hit by	157	* Also, objects which are potential "lights" that are hit by
171	* flame/elect attacks will be set to glow. "lights" are any	158	* flame/elect attacks will be set to glow. "lights" are any
172	* object with +/- glow_radius and an "other_arch" to change to.	159	* object with +/- glow_radius and an "other_arch" to change to.
173	* (and please note that we cant fail our save and reach this	160	* (and please note that we cant fail our save and reach this
174	* function if the object doesnt contain a material that can burn.	161	* function if the object doesnt contain a material that can burn.
175	* So forget lighting magical swords on fire with this!) -b.t.	162	* So forget lighting magical swords on fire with this!) -b.t.
176	*/	163	*/
177	if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE))	164	if (type & (AT_FIRE | AT_ELECTRICITY)
		165	&& (QUERY_FLAG (op, FLAG_IS_LIGHTABLE)
		166	|| op->type == LAMP
		167	|| op->type == TORCH
178	{	168	))
179	const char *arch = op->other_arch->name;	169	{
180		170	switch (op->type)
181	op = decrease_ob_nr (op, 1);
182
183	if (op)
184	fix_stopped_item (op, m, originator);
185
186	if ((op = get_archetype (arch)) != NULL)
187	{	171	{
188	if (env)	172	case LAMP:
		173	// turn on a lamp
		174	apply_lamp (op, true);
		175	break;
		176
		177	default:
		178	// for instance icecubes:
		179	if (op->other_arch)
189	{	180	{
190	op->x = env->x, op->y = env->y;	181	const char *arch = op->other_arch->archname;
191	insert_ob_in_ob (op, env);	182
		183	if (op->decrease ())
		184	fix_stopped_item (op, m, originator);
		185
		186	if ((op = archetype::get (arch)))
		187	{
192	if (env->contr)	188	if (env)
193	esrv_send_item (env, op);	189	env->insert (op);
		190	else
		191	m->insert (op, x, y, originator);
		192	}
194	}	193	}
195	else
196	{
197	op->x = x, op->y = y;
198	insert_ob_in_map (op, m, originator, 0);
199	}
200	}	194	}
201
202	return;	195	return;
203	}	196	}
204		197
205	if (type & AT_CANCELLATION)	198	if (type & AT_CANCELLATION)
206	{ /* Cancellation. */	199	{ /* Cancellation. */
…		…
209	return;	202	return;
210	}	203	}
211		204
212	if (op->nrof > 1)	205	if (op->nrof > 1)
213	{	206	{
214	op = decrease_ob_nr (op, rndm (0, op->nrof - 1));	207	if (op->decrease (rndm (0, op->nrof - 1)))
215
216	if (op)
217	fix_stopped_item (op, m, originator);	208	fix_stopped_item (op, m, originator);
218	}	209	}
219	else	210	else
220	{	211	{
221	if (op->env)	212	// drop everything to the ground, if possible
222	{	213	op->insert_at (originator);
223	object *tmp = is_player_inv (op->env);	214	op->drop_and_destroy ();
224
225	if (tmp)
226	esrv_del_item (tmp->contr, op->count);
227	}
228
229	if (!QUERY_FLAG (op, FLAG_REMOVED))
230	remove_ob (op);
231
232	free_object (op);
233	}	215	}
234		216
235	if (type & (AT_FIRE | AT_ELECTRICITY))	217	if (type & (AT_FIRE | AT_ELECTRICITY))
236	if (env)	218	if (env)
237	{	219	{
238	op = get_archetype ("burnout");	220	op = archetype::get (shstr_burnout);
239	op->x = env->x, op->y = env->y;	221	op->x = env->x, op->y = env->y;
240	insert_ob_in_ob (op, env);	222	env->insert (op);
241	}	223	}
242	else	224	else
243	replace_insert_ob_in_map ("burnout", originator);	225	replace_insert_ob_in_map (shstr_burnout, originator);
244		226
245	return;	227	return;
246	}	228	}
247		229
248	/* The value of 50 is arbitrary. */	230	/* The value of 50 is arbitrary. */
249	if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))	231	if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && rndm (2))
250	{	232	{
251	object *tmp;
252	archetype *at = find_archetype ("icecube");	233	archetype *at = archetype::find (shstr_icecube);
253		234
254	if (at == NULL)	235	if (at == NULL)
255	return;	236	return;
256		237
257	op = stop_item (op);	238	op = stop_item (op);
258	if (op == NULL)	239	if (op == NULL)
259	return;	240	return;
260		241
261	if ((tmp = present_arch (at, op->map, op->x, op->y)) == NULL)	242	object *tmp = present_arch (at, op->map, op->x, op->y);
		243	if (!tmp)
262	{	244	{
263	tmp = arch_to_object (at);	245	tmp = arch_to_object (at);
264	tmp->x = op->x, tmp->y = op->y;	246	tmp->x = op->x, tmp->y = op->y;
265	/* This was in the old (pre new movement code) -	247	/* This was in the old (pre new movement code) -
266	* icecubes have slow_move set to 1 - don't want	248	* icecubes have slow_move set to 1 - don't want
…		…
269	tmp->move_slow_penalty = 0;	251	tmp->move_slow_penalty = 0;
270	tmp->move_slow = 0;	252	tmp->move_slow = 0;
271	insert_ob_in_map (tmp, op->map, originator, 0);	253	insert_ob_in_map (tmp, op->map, originator, 0);
272	}	254	}
273		255
274	if (!QUERY_FLAG (op, FLAG_REMOVED))	256	tmp->insert (op);
275	remove_ob (op);
276
277	insert_ob_in_ob (op, tmp);
278	return;	257	return;
279	}	258	}
280	}	259	}
281		260
282	/* Object op is hitting the map.	261	/* Object op is hitting the map.
283	* op is going in direction 'dir'	262	* op is going in direction 'dir'
284	* type is the attacktype of the object.	263	* type is the attacktype of the object.
285	* full_hit is set if monster area does not matter.	264	* full_hit is set if monster area does not matter.
286	* returns 1 if it hits something, 0 otherwise.	265	* returns 1 if it hits something, 0 otherwise.
287	*/	266	*/
288
289	int	267	int
290	hit_map (object *op, int dir, int type, int full_hit)	268	hit_map (object *op, int dir, int type, int full_hit)
291	{	269	{
292	object *tmp, *next;
293	mapstruct *map;	270	maptile *map;
294	sint16 x, y;	271	sint16 x, y;
295	int retflag = 0; /* added this flag.. will return 1 if it hits a monster */	272	int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
296		273
297	tag_t op_tag, next_tag = 0;
298
299	if (QUERY_FLAG (op, FLAG_FREED))	274	if (QUERY_FLAG (op, FLAG_FREED))
300	{	275	{
301	LOG (llevError, "BUG: hit_map(): free object\n");	276	LOG (llevError, "BUG: hit_map(): free object\n");
302	return 0;	277	return 0;
303	}	278	}
304		279
305	if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)	280	if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL)
306	{	281	{
307	LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name);	282	LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
308	return 0;	283	return 0;
309	}	284	}
310		285
311	if (!op->map)	286	if (!op->map)
312	{	287	{
…		…
315	}	290	}
316		291
317	if (op->head)	292	if (op->head)
318	op = op->head;	293	op = op->head;
319		294
320	op_tag = op->count;	295	mapxy pos (op);
		296	pos.move (dir);
321		297
322	map = op->map;	298	if (!pos.normalise ())
323	x = op->x + freearr_x[dir];	299	return 0;
324	y = op->y + freearr_y[dir];
325
326	int mflags = get_map_flags (map, &map, x, y, &x, &y);
327		300
328	// elmex: a safe map tile can't be hit!	301	// elmex: a safe map tile can't be hit!
329	// this should prevent most harmful effects on items and players there.	302	// this should prevent most harmful effects on items and players there.
330	if (mflags & (P_OUT_OF_MAP | P_SAFE))	303	mapspace &ms = pos.ms ();
		304
		305	if (ms.flags () & P_SAFE)
331	return 0;	306	return 0;
332		307
333	/* peterm: a few special cases for special attacktypes --counterspell	308	/* peterm: a few special cases for special attacktypes --counterspell
334	* must be out here because it strikes things which are not alive	309	* must be out here because it strikes things which are not alive
335	*/	310	*/
336		311	if (type & (AT_COUNTERSPELL | AT_CHAOS))
		312	{
337	if (type & AT_COUNTERSPELL)	313	if (type & AT_COUNTERSPELL)
338	{	314	{
339	counterspell (op, dir); /* see spell_effect.c */	315	counterspell (op, dir); /* see spell_effect.c */
340		316
341	/* If the only attacktype is counterspell or magic, don't need	317	/* If the only attacktype is counterspell or magic, don't need
342	* to do any further processing.	318	* to do any further processing.
343	*/
344	if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
345	return 0;
346
347	type &= ~AT_COUNTERSPELL;
348	}
349
350	if (type & AT_CHAOS)
351	{
352	shuffle_attack (op, 1); /*1 flag tells it to change the face */
353	update_object (op, UP_OBJ_FACE);
354	type &= ~AT_CHAOS;
355	}
356
357	next = get_map_ob (map, x, y);
358	if (next)
359	next_tag = next->count;
360
361	while (next)
362	{
363	if (was_destroyed (next, next_tag))
364	{
365	/* There may still be objects that were above 'next', but there is no
366	* simple way to find out short of copying all object references and
367	* tags into a temporary array before we start processing the first
368	* object. That's why we just abort.
369	*
370	* This happens whenever attack spells (like fire) hit a pile
371	* of objects. This is not a bug - nor an error. The errormessage
372	* below was spamming the logs for absolutely no reason.
373	*/	319	*/
374	/* LOG (llevDebug, "hit_map(): next object destroyed\n"); */	320	if (!(type & ~(AT_COUNTERSPELL | AT_MAGIC)))
375	break;	321	return 0;
		322
		323	type &= ~AT_COUNTERSPELL;
		324	}
		325
		326	if (type & AT_CHAOS)
376	}	327	{
		328	shuffle_attack (op, 1); /* flag tells it to change the face */
		329	update_object (op, UP_OBJ_FACE);
		330	type &= ~AT_CHAOS;
		331	}
		332	}
377		333
		334	/* There may still be objects that were above 'next', but there is no
		335	* simple way to find out short of copying all object references and
		336	* tags into a temporary array before we start processing the first
		337	* object. That's why we just abort on destroy.
		338	*
		339	* This happens whenever attack spells (like fire) hit a pile
		340	* of objects. This is not a bug - nor an error.
		341	*/
		342	for (object *next = ms.bot; next && !next->destroyed (); )
		343	{
378	tmp = next;	344	object *tmp = next;
379	next = tmp->above;	345	next = tmp->above;
380
381	if (next)
382	next_tag = next->count;
383
384	if (QUERY_FLAG (tmp, FLAG_FREED))
385	{
386	LOG (llevError, "BUG: hit_map(): found freed object\n");
387	break;
388	}
389		346
390	/* Something could have happened to 'tmp' while 'tmp->below' was processed.	347	/* Something could have happened to 'tmp' while 'tmp->below' was processed.
391	* For example, 'tmp' was put in an icecube.	348	* For example, 'tmp' was put in an icecube.
392	* This is one of the few cases where on_same_map should not be used.	349	* This is one of the few cases where on_same_map should not be used.
393	*/	350	*/
394	if (tmp->map != map || tmp->x != x || tmp->y != y)	351	if (tmp->map != pos.m || tmp->x != pos.x || tmp->y != pos.y)
395	continue;	352	continue;
396		353
397	if (QUERY_FLAG (tmp, FLAG_ALIVE))	354	if (QUERY_FLAG (tmp, FLAG_ALIVE))
398	{	355	{
399	hit_player (tmp, op->stats.dam, op, type, full_hit);	356	hit_player (tmp, op->stats.dam, op, type, full_hit);
400	retflag |= 1;	357	retflag |= 1;
		358
401	if (was_destroyed (op, op_tag))	359	if (op->destroyed ())
402	break;	360	break;
403	}	361	}
404
405	/* Here we are potentially destroying an object. If the object has	362	/* Here we are potentially destroying an object. If the object has
406	* NO_PASS set, it is also immune - you can't destroy walls. Note	363	* NO_PASS set, it is also immune - you can't destroy walls. Note
407	* that weak walls have is_alive set, which prevent objects from	364	* that weak walls have is_alive set, which prevent objects from
408	* passing over/through them. We don't care what type of movement	365	* passing over/through them. We don't care what type of movement
409	* the wall blocks - if it blocks any type of movement, can't be	366	* the wall blocks - if it blocks any type of movement, can't be
410	* destroyed right now.	367	* destroyed right now.
411	*/	368	*/
412	else if ((tmp->material || tmp->materialname) && op->stats.dam > 0 && !tmp->move_block)	369	else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
413	{	370	{
414	save_throw_object (tmp, type, op);	371	save_throw_object (tmp, type, op);
		372
415	if (was_destroyed (op, op_tag))	373	if (op->destroyed ())
416	break;	374	break;
417	}	375	}
418	}	376	}
419		377
420	return 0;	378	return 0;
…		…
423	void	381	void
424	attack_message (int dam, int type, object *op, object *hitter)	382	attack_message (int dam, int type, object *op, object *hitter)
425	{	383	{
426	char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];	384	char buf[MAX_BUF], buf1[MAX_BUF], buf2[MAX_BUF];
427	int i, found = 0;	385	int i, found = 0;
428	mapstruct *map;	386	maptile *map;
429	object *next, *tmp;	387	object *next, *tmp;
430		388
431	/* put in a few special messages for some of the common attacktypes	389	/* put in a few special messages for some of the common attacktypes
432	* a player might have. For example, fire, electric, cold, etc	390	* a player might have. For example, fire, electric, cold, etc
433	* [garbled 20010919]	391	* [garbled 20010919]
…		…
450	sprintf (buf1, "missed %s", &op->name);	408	sprintf (buf1, "missed %s", &op->name);
451	sprintf (buf2, " misses");	409	sprintf (buf2, " misses");
452	found++;	410	found++;
453	}	411	}
454	else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||	412	else if ((hitter->type == DISEASE || hitter->type == SYMPTOM ||
455	hitter->type == POISONING || (type & AT_POISON && IS_LIVE (op))) && !found)	413	hitter->type == POISONING || (type & AT_POISON && op->is_alive ())) && !found)
456	{	414	{
457	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)	415	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_SUFFER][i].level != -1; i++)
458	if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)	416	if (dam < attack_mess[ATM_SUFFER][i].level || attack_mess[ATM_SUFFER][i + 1].level == -1)
459	{	417	{
460	sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);	418	sprintf (buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, &op->name, attack_mess[ATM_SUFFER][i].buf2);
…		…
472	strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);	430	strcpy (buf2, attack_mess[ATM_DOOR][i].buf3);
473	found++;	431	found++;
474	break;	432	break;
475	}	433	}
476	}	434	}
477	else if (hitter->type == PLAYER && IS_LIVE (op))	435	else if (hitter->type == PLAYER && op->is_alive ())
478	{	436	{
479	if (USING_SKILL (hitter, SK_KARATE))	437	if (USING_SKILL (hitter, SK_KARATE))
480	{	438	{
481	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)	439	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_KARATE][i].level != -1; i++)
482	if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)	440	if (dam < attack_mess[ATM_KARATE][i].level || attack_mess[ATM_KARATE][i + 1].level == -1)
…		…
508	found++;	466	found++;
509	break;	467	break;
510	}	468	}
511	}	469	}
512	}	470	}
		471
513	if (found)	472	if (found)
514	{	473	{
515	/* done */	474	/* done */
516	}	475	}
517	else if (IS_ARROW (hitter) && (type == AT_PHYSICAL || type == AT_MAGIC))	476	else if (hitter->is_arrow () && (type == AT_PHYSICAL || type == AT_MAGIC))
518	{	477	{
519	sprintf (buf1, "hit"); /* just in case */	478	sprintf (buf1, "hit"); /* just in case */
520	for (i = 0; i < MAXATTACKMESS; i++)	479	for (i = 0; i < MAXATTACKMESS; i++)
521	if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)	480	if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i + 1].level == -1)
522	{	481	{
523	strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);	482	strcpy (buf2, attack_mess[ATM_ARROW][i].buf3);
524	found++;	483	found++;
525	break;	484	break;
526	}	485	}
527	}	486	}
528	else if (type & AT_DRAIN && IS_LIVE (op))	487	else if (type & AT_DRAIN && op->is_alive ())
529	{	488	{
530	/* drain is first, because some items have multiple attypes */	489	/* drain is first, because some items have multiple attypes */
531	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)	490	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_DRAIN][i].level != -1; i++)
532	if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)	491	if (dam < attack_mess[ATM_DRAIN][i].level || attack_mess[ATM_DRAIN][i + 1].level == -1)
533	{	492	{
…		…
535	strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);	494	strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3);
536	found++;	495	found++;
537	break;	496	break;
538	}	497	}
539	}	498	}
540	else if (type & AT_ELECTRICITY && IS_LIVE (op))	499	else if (type & AT_ELECTRICITY && op->is_alive ())
541	{	500	{
542	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)	501	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_ELEC][i].level != -1; i++)
543	if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)	502	if (dam < attack_mess[ATM_ELEC][i].level || attack_mess[ATM_ELEC][i + 1].level == -1)
544	{	503	{
545	sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);	504	sprintf (buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, &op->name, attack_mess[ATM_ELEC][i].buf2);
546	strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);	505	strcpy (buf2, attack_mess[ATM_ELEC][i].buf3);
547	found++;	506	found++;
548	break;	507	break;
549	}	508	}
550	}	509	}
551	else if (type & AT_COLD && IS_LIVE (op))	510	else if (type & AT_COLD && op->is_alive ())
552	{	511	{
553	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)	512	for (i = 0; i < MAXATTACKMESS && attack_mess[ATM_COLD][i].level != -1; i++)
554	if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)	513	if (dam < attack_mess[ATM_COLD][i].level || attack_mess[ATM_COLD][i + 1].level == -1)
555	{	514	{
556	sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);	515	sprintf (buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, &op->name, attack_mess[ATM_COLD][i].buf2);
…		…
574	{	533	{
575	int mtype;	534	int mtype;
576		535
577	switch (hitter->current_weapon->weapontype)	536	switch (hitter->current_weapon->weapontype)
578	{	537	{
579	case WEAP_HIT:	538	case WEAP_HIT:
580	mtype = ATM_BASIC;	539	mtype = ATM_BASIC;
581	break;	540	break;
582	case WEAP_SLASH:	541	case WEAP_SLASH:
583	mtype = ATM_SLASH;	542	mtype = ATM_SLASH;
584	break;	543	break;
585	case WEAP_PIERCE:	544	case WEAP_PIERCE:
586	mtype = ATM_PIERCE;	545	mtype = ATM_PIERCE;
587	break;	546	break;
588	case WEAP_CLEAVE:	547	case WEAP_CLEAVE:
589	mtype = ATM_CLEAVE;	548	mtype = ATM_CLEAVE;
590	break;	549	break;
591	case WEAP_SLICE:	550	case WEAP_SLICE:
592	mtype = ATM_SLICE;	551	mtype = ATM_SLICE;
593	break;	552	break;
594	case WEAP_STAB:	553	case WEAP_STAB:
595	mtype = ATM_STAB;	554	mtype = ATM_STAB;
596	break;	555	break;
597	case WEAP_WHIP:	556	case WEAP_WHIP:
598	mtype = ATM_WHIP;	557	mtype = ATM_WHIP;
599	break;	558	break;
600	case WEAP_CRUSH:	559	case WEAP_CRUSH:
601	mtype = ATM_CRUSH;	560	mtype = ATM_CRUSH;
602	break;	561	break;
603	case WEAP_BLUD:	562	case WEAP_BLUD:
604	mtype = ATM_BLUD;	563	mtype = ATM_BLUD;
605	break;	564	break;
606	default:	565	default:
607	mtype = ATM_BASIC;	566	mtype = ATM_BASIC;
608	break;	567	break;
609	}	568	}
		569
610	for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)	570	for (i = 0; i < MAXATTACKMESS && attack_mess[mtype][i].level != -1; i++)
611	if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)	571	if (dam < attack_mess[mtype][i].level || attack_mess[mtype][i + 1].level == -1)
612	{	572	{
613	sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);	573	sprintf (buf1, "%s %s%s", attack_mess[mtype][i].buf1, &op->name, attack_mess[mtype][i].buf2);
614	strcpy (buf2, attack_mess[mtype][i].buf3);	574	strcpy (buf2, attack_mess[mtype][i].buf3);
…		…
633	strcpy (buf1, "hit");	593	strcpy (buf1, "hit");
634	strcpy (buf2, " hits");	594	strcpy (buf2, " hits");
635	}	595	}
636		596
637	/* bail out if a monster is casting spells */	597	/* bail out if a monster is casting spells */
638	if (!(hitter->type == PLAYER || (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)))	598	if (!(hitter->type == PLAYER || (hitter->owner != NULL && hitter->owner->type == PLAYER)))
639	return;	599	return;
640		600
641	/* scale down magic considerably. */	601	/* scale down magic considerably. */
642	if (type & AT_MAGIC && rndm (0, 5))	602	if (type & AT_MAGIC && rndm (0, 5))
643	return;	603	return;
644		604
645	/* Did a player hurt another player? Inform both! */	605	/* Did a player hurt another player? Inform both! */
646	if (op->type == PLAYER && (get_owner (hitter) == NULL ? hitter->type : hitter->owner->type) == PLAYER)	606	if (op->type == PLAYER && (hitter->owner == NULL ? hitter->type : hitter->owner->type) == PLAYER)
647	{	607	{
648	if (get_owner (hitter) != NULL)	608	if (hitter->owner != NULL)
649	sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);	609	sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
650	else	610	else
651	{	611	{
652	sprintf (buf, "%s%s you.", &hitter->name, buf2);	612	sprintf (buf, "%s%s you.", &hitter->name, buf2);
		613
653	if (dam != 0)	614	if (dam != 0)
654	{	615	{
655	if (dam < 10)	616	if (dam < 10)
656	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0);	617	op->contr->play_sound (sound_find ("player_is_hit1"));
657	else if (dam < 20)	618	else if (dam < 20)
658	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0);	619	op->contr->play_sound (sound_find ("player_is_hit2"));
659	else	620	else
660	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0);	621	op->contr->play_sound (sound_find ("player_is_hit3"));
661	}	622	}
662	}	623	}
		624
663	new_draw_info (NDI_BLACK, 0, op, buf);	625	new_draw_info (NDI_BLACK, 0, op, buf);
664	} /* end of player hitting player */	626	} /* end of player hitting player */
665		627
666	if (hitter->type == PLAYER)	628	if (hitter->type == PLAYER)
667	{	629	{
668	sprintf (buf, "You %s.", buf1);	630	sprintf (buf, "You %s.", buf1);
		631
669	if (dam != 0)	632	if (dam != 0)
670	{	633	{
671	if (dam < 10)	634	if (dam < 10)
672	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0);	635	op->play_sound (sound_find ("player_hits1"));
673	else if (dam < 20)	636	else if (dam < 20)
674	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0);	637	op->play_sound (sound_find ("player_hits2"));
675	else	638	else
676	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0);	639	op->play_sound (sound_find ("player_hits3"));
677	}	640	}
		641
678	new_draw_info (NDI_BLACK, 0, hitter, buf);	642	new_draw_info (NDI_BLACK, 0, hitter, buf);
679	}	643	}
680	else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)	644	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
681	{	645	{
682	/* look for stacked spells and start reducing the message chances */	646	/* look for stacked spells and start reducing the message chances */
683	if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))	647	if (hitter->type == SPELL_EFFECT && (hitter->subtype == SP_EXPLOSION || hitter->subtype == SP_BULLET || hitter->subtype == SP_CONE))
684	{	648	{
685	i = 4;	649	i = 4;
686	map = hitter->map;	650	map = hitter->map;
687	if (out_of_map (map, hitter->x, hitter->y))	651	if (out_of_map (map, hitter->x, hitter->y))
688	return;	652	return;
		653
689	next = get_map_ob (map, hitter->x, hitter->y);	654	next = GET_MAP_OB (map, hitter->x, hitter->y);
690	if (next)	655	if (next)
691	while (next)	656	while (next)
692	{	657	{
693	if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))	658	if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION || next->subtype == SP_BULLET || next->subtype == SP_CONE))
694	i *= 3;	659	i *= 3;
		660
695	tmp = next;	661	tmp = next;
696	next = tmp->above;	662	next = tmp->above;
697	}	663	}
		664
698	if (i < 0)	665	if (i < 0)
699	return;	666	return;
		667
700	if (rndm (0, i) != 0)	668	if (rndm (0, i) != 0)
701	return;	669	return;
702	}	670	}
703	else if (rndm (0, 5) != 0)	671	else if (rndm (0, 5) != 0)
704	return;	672	return;
		673
705	sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);	674	sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
706	play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);	675	op->play_sound (sound_find ("player_hits4"));
707	new_draw_info (NDI_BLACK, 0, hitter->owner, buf);	676	new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
708	}	677	}
709	}	678	}
710		679
711		680
…		…
715	if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))	684	if (QUERY_FLAG (*target, FLAG_FREED) || QUERY_FLAG (*hitter, FLAG_FREED))
716	{	685	{
717	LOG (llevError, "BUG: get_attack_mode(): freed object\n");	686	LOG (llevError, "BUG: get_attack_mode(): freed object\n");
718	return 1;	687	return 1;
719	}	688	}
		689
720	if ((*target)->head)	690	if ((*target)->head)
721	*target = (*target)->head;	691	*target = (*target)->head;
		692
722	if ((*hitter)->head)	693	if ((*hitter)->head)
723	*hitter = (*hitter)->head;	694	*hitter = (*hitter)->head;
		695
		696	if ((*target)->type == LOCKED_DOOR)
		697	return 1; // locked doors cannot be hit
		698
724	if ((*hitter)->env != NULL || (*target)->env != NULL)	699	if ((*hitter)->env || (*target)->env)
725	{	700	{
726	*simple_attack = 1;	701	*simple_attack = 1;
727	return 0;	702	return 0;
728	}	703	}
		704
729	if (QUERY_FLAG (*target, FLAG_REMOVED)	705	if (QUERY_FLAG (*target, FLAG_REMOVED)
730	|| QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target)))	706	|| QUERY_FLAG (*hitter, FLAG_REMOVED)
		707	|| !(*hitter)->map
		708	|| !on_same_map (*hitter, *target))
731	{	709	{
732	LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name);	710	LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
		711	(*hitter)->debug_desc (), (*target)->debug_desc ());
733	return 1;	712	return 1;
734	}	713	}
		714
735	*simple_attack = 0;	715	*simple_attack = 0;
736	return 0;	716	return 0;
737	}	717	}
738		718
739	static int	719	static int
…		…
760	attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)	740	attack_ob_simple (object *op, object *hitter, int base_dam, int base_wc)
761	{	741	{
762	int simple_attack, roll, dam = 0;	742	int simple_attack, roll, dam = 0;
763	uint32 type;	743	uint32 type;
764	shstr op_name;	744	shstr op_name;
765	tag_t op_tag, hitter_tag;
766		745
767	if (get_attack_mode (&op, &hitter, &simple_attack))	746	if (get_attack_mode (&op, &hitter, &simple_attack))
768	goto error;	747	goto error;
769		748
770	if (hitter->current_weapon)	749	if (hitter->current_weapon)
771	if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))	750	if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
772	return RESULT_INT (0);	751	return RESULT_INT (0);
773		752
774	if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))	753	if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
775	return RESULT_INT (0);	754	return RESULT_INT (0);
776
777	op_tag = op->count;
778	hitter_tag = hitter->count;
779		755
780	/*	756	/*
781	* A little check to make it more difficult to dance forward and back	757	* A little check to make it more difficult to dance forward and back
782	* to avoid ever being hit by monsters.	758	* to avoid ever being hit by monsters.
783	*/	759	*/
784	if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3)	760	if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
785	{	761	{
786	/* Decrease speed BEFORE calling process_object. Otherwise, an	762	/* Decrease speed BEFORE calling process_object. Otherwise, an
787	* infinite loop occurs, with process_object calling move_monster,	763	* infinite loop occurs, with process_object calling move_monster,
788	* which then gets here again. By decreasing the speed before	764	* which then gets here again. By decreasing the speed before
789	* we call process_object, the 'if' statement above will fail.	765	* we call process_object, the 'if' statement above will fail.
790	*/	766	*/
791	op->speed_left--;	767	--op->speed_left;
792	process_object (op);	768	process_object (op);
		769
793	if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))	770	if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
794	goto error;	771	goto error;
795	}	772	}
796		773
797	op_name = op->name;	774	op_name = op->name;
798		775
…		…
805	/* See if we hit the creature */	782	/* See if we hit the creature */
806	if (roll == 20 || op->stats.ac >= base_wc - roll)	783	if (roll == 20 || op->stats.ac >= base_wc - roll)
807	{	784	{
808	int hitdam = base_dam;	785	int hitdam = base_dam;
809		786
810	if (settings.casting_time == TRUE)
811	{
812	if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
813	{
814	hitter->casting_time = -1;
815	new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
816	}
817	if ((op->casting_time > -1) && (hitdam > 0))
818	{
819	op->casting_time = -1;
820	if (op->type == PLAYER)
821	{
822	new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
823	new_draw_info_format (NDI_ALL | NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
824	}
825	}
826	}
827	if (!simple_attack)	787	if (!simple_attack)
828	{	788	{
829	/* If you hit something, the victim should *always* wake up.	789	/* If you hit something, the victim should *always* wake up.
830	* Before, invisible hitters could avoid doing this.	790	* Before, invisible hitters could avoid doing this.
831	* -b.t. */	791	* -b.t. */
832	if (QUERY_FLAG (op, FLAG_SLEEP))	792	if (QUERY_FLAG (op, FLAG_SLEEP))
833	CLEAR_FLAG (op, FLAG_SLEEP);	793	CLEAR_FLAG (op, FLAG_SLEEP);
834		794
835	/* If the victim can't see the attacker, it may alert others	795	/* If the victim can't see the attacker, it may alert others
836	* for help. */	796	* for help. */
837	if (op->type != PLAYER && !can_see_enemy (op, hitter) && !get_owner (op) && rndm (0, op->stats.Int))	797	if (op->type != PLAYER && !can_see_enemy (op, hitter) && !op->owner && rndm (0, op->stats.Int))
838	npc_call_help (op);	798	npc_call_help (op);
839		799
840	/* if you were hidden and hit by a creature, you are discovered */	800	/* if you were hidden and hit by a creature, you are discovered */
841	if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))	801	if (op->flag [FLAG_HIDDEN] && hitter->flag [FLAG_ALIVE])
842	{	802	{
843	make_visible (op);	803	make_visible (op);
		804
844	if (op->type == PLAYER)	805	if (op->type == PLAYER)
845	new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");	806	new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. You are no longer hidden!");
846	}	807	}
847		808
848	/* thrown items (hitter) will have various effects	809	/* thrown items (hitter) will have various effects
849	* when they hit the victim. For things like thrown daggers,	810	* when they hit the victim. For things like thrown daggers,
850	* this sets 'hitter' to the actual dagger, and not the	811	* this sets 'hitter' to the actual dagger, and not the
851	* wrapper object.	812	* wrapper object.
852	*/	813	*/
853	thrown_item_effect (hitter, op);	814	thrown_item_effect (hitter, op);
		815
854	if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))	816	if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
855	goto leave;	817	goto leave;
856	}	818	}
857		819
858	/* Need to do at least 1 damage, otherwise there is no point	820	/* Need to do at least 1 damage, otherwise there is no point
859	* to go further and it will cause FPE's below.	821	* to go further and it will cause FPE's below.
860	*/	822	*/
861	if (hitdam <= 0)	823	if (hitdam <= 0)
862	hitdam = 1;	824	hitdam = 1;
863		825
864	type = hitter->attacktype;	826	type = hitter->attacktype;
		827
		828	/* Ok, because some of the brainfucks of the good *sigh* old *sigh*
		829	* Crossfire we have to default the attacktype here to AT_PHYSICAL.
		830	* This check is important for the most simple monsters out there in the
		831	* game content (maps, archs). For example orcs: They would have
		832	* no attacktype at all.
		833	*
		834	* Some time in the future someone should just go into the game data
		835	* and fix every monster out there ;-/ Until then we will kill some
		836	* more trees in the african rain forests with this check.
		837	*/
865	if (!type)	838	if (!type)
866	type = AT_PHYSICAL;	839	type = AT_PHYSICAL;
		840
867	/* Handle monsters that hit back */	841	/* Handle monsters that hit back */
868	if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))	842	if (!simple_attack && QUERY_FLAG (op, FLAG_HITBACK) && QUERY_FLAG (hitter, FLAG_ALIVE))
869	{	843	{
870	if (op->attacktype & AT_ACID && hitter->type == PLAYER)	844	if (op->attacktype & AT_ACID && hitter->type == PLAYER)
871	new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");	845	new_draw_info (NDI_UNIQUE, 0, hitter, "You are splashed by acid!\n");
		846
872	hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);	847	hit_player (hitter, random_roll (0, (op->stats.dam), hitter, PREFER_LOW), op, op->attacktype, 1);
		848
873	if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))	849	if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
874	goto leave;	850	goto leave;
875	}	851	}
876		852
877	/* In the new attack code, it should handle multiple attack	853	/* In the new attack code, it should handle multiple attack
878	* types in its area, so remove it from here.	854	* types in its area, so remove it from here.
879	*/	855	*/
880	dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);	856	dam = hit_player (op, random_roll (1, hitdam, hitter, PREFER_HIGH), hitter, type, 1);
		857
881	if (was_destroyed (op, op_tag) || was_destroyed (hitter, hitter_tag) || abort_attack (op, hitter, simple_attack))	858	if (op->destroyed () || hitter->destroyed () || abort_attack (op, hitter, simple_attack))
882	goto leave;	859	goto leave;
883	} /* end of if hitter hit op */	860	} /* end of if hitter hit op */
884	/* if we missed, dam=0 */	861	/* if we missed, dam=0 */
885		862
886	/*attack_message(dam, type, op, hitter); */	863	/*attack_message(dam, type, op, hitter); */
…		…
896	}	873	}
897		874
898	int	875	int
899	attack_ob (object *op, object *hitter)	876	attack_ob (object *op, object *hitter)
900	{	877	{
901
902	if (hitter->head)
903	hitter = hitter->head;	878	hitter = hitter->head_ ();
		879
904	return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);	880	return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
905	}	881	}
906		882
907	/* op is the arrow, tmp is what is stopping the arrow.	883	/* op is the arrow, tmp is what is stopping the arrow.
908	*	884	*
…		…
917	* debate - 5000 is 5 kg, so arrows, knives, and other light weapons	893	* debate - 5000 is 5 kg, so arrows, knives, and other light weapons
918	* stick around.	894	* stick around.
919	*/	895	*/
920	if (op->weight <= 5000 && tmp->stats.hp >= 0)	896	if (op->weight <= 5000 && tmp->stats.hp >= 0)
921	{	897	{
922	if (tmp->head != NULL)	898	tmp->head_ ()->insert (op);
923	tmp = tmp->head;
924
925	remove_ob (op);
926	op = insert_ob_in_ob (op, tmp);
927
928	if (tmp->type == PLAYER)
929	esrv_send_item (tmp, op);
930
931	return 1;	899	return 1;
932	}	900	}
933	else	901	else
934	return 0;	902	return 0;
935	}	903	}
…		…
943	object *	911	object *
944	hit_with_arrow (object *op, object *victim)	912	hit_with_arrow (object *op, object *victim)
945	{	913	{
946	object *container, *hitter;	914	object *container, *hitter;
947	int hit_something = 0;	915	int hit_something = 0;
948	tag_t victim_tag, hitter_tag;
949	sint16 victim_x, victim_y;
950		916
951	/* Disassemble missile */	917	/* Disassemble missile */
952	if (op->inv)	918	if (op->inv)
953	{	919	{
954	container = op;	920	container = op;
955	hitter = op->inv;	921	hitter = op->inv;
956	remove_ob (hitter);
957	insert_ob_in_map (hitter, container->map, hitter, INS_NO_MERGE | INS_NO_WALK_ON);	922	hitter->insert_at (container, hitter, INS_NO_MERGE | INS_NO_WALK_ON);
958	/* Note that we now have an empty THROWN_OBJ on the map. Code that	923	/* Note that we now have an empty THROWN_OBJ on the map. Code that
959	* might be called until this THROWN_OBJ is either reassembled or	924	* might be called until this THROWN_OBJ is either reassembled or
960	* removed at the end of this function must be able to deal with empty	925	* removed at the end of this function must be able to deal with empty
961	* THROWN_OBJs. */	926	* THROWN_OBJs. */
962	}	927	}
963	else	928	else
964	{	929	{
965	container = NULL;	930	container = 0;
966	hitter = op;	931	hitter = op;
967	}	932	}
968		933
969	/* Try to hit victim */	934	/* Try to hit victim */
970	victim_x = victim->x;
971	victim_y = victim->y;
972	victim_tag = victim->count;
973	hitter_tag = hitter->count;
974
975	hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);	935	hit_something = attack_ob_simple (victim, hitter, op->stats.dam, op->stats.wc);
976		936
977	/* Arrow attacks door, rune of summoning is triggered, demon is put on	937	/* Arrow attacks door, rune of summoning is triggered, demon is put on
978	* arrow, move_apply() calls this function, arrow sticks in demon,	938	* arrow, move_apply() calls this function, arrow sticks in demon,
979	* attack_ob_simple() returns, and we've got an arrow that still exists	939	* attack_ob_simple() returns, and we've got an arrow that still exists
980	* but is no longer on the map. Ugh. (Beware: Such things can happen at	940	* but is no longer on the map. Ugh. (Beware: Such things can happen at
981	* other places as well!)	941	* other places as well!)
982	*/	942	*/
983	if (was_destroyed (hitter, hitter_tag) || hitter->env != NULL)	943	if (hitter->destroyed () || hitter->env != NULL)
984	{	944	{
985	if (container)	945	if (container)
986	{	946	container->destroy ();
987	remove_ob (container);	947
988	free_object (container);
989	}
990	return NULL;	948	return 0;
991	}	949	}
992		950
993	/* Missile hit victim */	951	/* Missile hit victim */
994	/* if the speed is > 10, then this is a fast moving arrow, we go straight	952	/* if the speed is > 10, then this is a fast moving arrow, we go straight
995	* through the target	953	* through the target
996	*/	954	*/
997	if (hit_something && op->speed <= 10.0)	955	if (hit_something && op->speed <= 10.0)
998	{	956	{
999	/* Stop arrow */	957	/* Stop arrow */
1000	if (container == NULL)	958	if (!container)
1001	{	959	{
1002	hitter = fix_stopped_arrow (hitter);	960	hitter = fix_stopped_arrow (hitter);
1003	if (hitter == NULL)	961	if (!hitter)
1004	return NULL;	962	return 0;
1005	}	963	}
1006	else	964	else
1007	{	965	container->destroy ();
1008	remove_ob (container);
1009	free_object (container);
1010	}
1011		966
1012	/* Try to stick arrow into victim */	967	/* Try to stick arrow into victim */
1013	if (!was_destroyed (victim, victim_tag) && stick_arrow (hitter, victim))	968	if (!victim->destroyed () && stick_arrow (hitter, victim))
1014	return NULL;	969	return 0;
1015		970
1016	/* Else try to put arrow on victim's map square	971	/* Else try to put arrow on victim's map square
1017	* remove check for P_WALL here. If the arrow got to this	972	* remove check for P_WALL here. If the arrow got to this
1018	* space, that is good enough - with the new movement code,	973	* space, that is good enough - with the new movement code,
1019	* there is now the potential for lots of spaces where something	974	* there is now the potential for lots of spaces where something
1020	* can fly over but not otherwise move over. What is the correct	975	* can fly over but not otherwise move over. What is the correct
1021	* way to handle those otherwise?	976	* way to handle those otherwise?
1022	*/	977	*/
1023	if (victim_x != hitter->x || victim_y != hitter->y)	978	if (victim->x != hitter->x || victim->y != hitter->y)
		979	{
		980	if (victim->destroyed ())
		981	hitter->destroy ();
		982	else
1024	{	983	{
1025	remove_ob (hitter);	984	hitter->remove ();
1026	hitter->x = victim_x;	985	hitter->x = victim->x;
1027	hitter->y = victim_y;	986	hitter->y = victim->y;
1028	insert_ob_in_map (hitter, victim->map, hitter, 0);	987	insert_ob_in_map (hitter, victim->map, hitter, 0);
		988	}
1029	}	989	}
1030	else	990	else
1031	{
1032	/* Else leave arrow where it is */	991	/* Else leave arrow where it is */
1033	merge_ob (hitter, NULL);	992	merge_ob (hitter, NULL);
1034	}	993
1035	return NULL;	994	return 0;
1036	}	995	}
1037		996
1038	if (hit_something && op->speed >= 10.0)	997	if (hit_something && op->speed >= 10.0)
1039	op->speed -= 1.0;	998	op->speed -= 1.0;
1040		999
1041	/* Missile missed victim - reassemble missile */	1000	/* Missile missed victim - reassemble missile */
1042	if (container)	1001	if (container)
1043	{	1002	{
1044	remove_ob (hitter);	1003	hitter->remove ();
1045	insert_ob_in_ob (hitter, container);	1004	insert_ob_in_ob (hitter, container);
1046	}	1005	}
		1006
1047	return op;	1007	return op;
1048	}	1008	}
1049
1050		1009
1051	void	1010	void
1052	tear_down_wall (object *op)	1011	tear_down_wall (object *op)
1053	{	1012	{
1054	int perc = 0;
1055
1056	if (!op->stats.maxhp)	1013	if (!op->stats.maxhp)
1057	{
1058	LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name);	1014	LOG (llevError, "TEAR_DOWN wall %s had no maxhp.\n", &op->name);
1059	perc = 1;	1015	else if (!op->has_anim ())
1060	}
1061	else if (!GET_ANIM_ID (op))
1062	{	1016	{
1063	/* Object has been called - no animations, so remove it */	1017	/* Object has been called - no animations, so remove it */
1064	if (op->stats.hp < 0)	1018	if (op->stats.hp < 0)
		1019	op->destroy ();
1065	{	1020
1066	remove_ob (op); /* Should update LOS */
1067	free_object (op);
1068	/* Don't know why this is here - remove_ob should do it for us */
1069	/*update_position(m, x, y); */
1070	}
1071	return; /* no animations, so nothing more to do */	1021	return; /* no animations, so nothing more to do */
1072	}	1022	}
1073	perc = NUM_ANIMATIONS (op) - ((int) NUM_ANIMATIONS (op) * op->stats.hp) / op->stats.maxhp;	1023
1074	if (perc >= (int) NUM_ANIMATIONS (op))	1024	// we use frames 1..num-2 as intermediate frames, so
1075	perc = NUM_ANIMATIONS (op) - 1;	1025	// the last frame is used only when hp < 0.
1076	else if (perc < 1)	1026	int perc = clamp (
1077	perc = 1;	1027	lerp_ru<int> (op->stats.hp, 0, op->stats.maxhp, op->anim_frames () - 2, 0),
1078	SET_ANIMATION (op, perc);	1028	0, op->anim_frames () - 1
		1029	);
		1030
		1031	op->set_anim_frame (perc);
1079	update_object (op, UP_OBJ_FACE);	1032	update_object (op, UP_OBJ_FACE);
1080	if (perc == NUM_ANIMATIONS (op) - 1)	1033
		1034	if (op->stats.hp < 0)
1081	{ /* Reached the last animation */	1035	{ /* Reached the last animation */
1082	if (op->face == blank_face)	1036	if (op->face == blank_face)
1083	{
1084	/* If the last face is blank, remove the ob */	1037	/* If the last face is blank, remove the ob */
1085	remove_ob (op); /* Should update LOS */	1038	op->destroy ();
1086	free_object (op);
1087
1088	/* remove_ob should call update_position for us */
1089	/*update_position(m, x, y); */
1090
1091	}
1092	else	1039	else
1093	{ /* The last face was not blank, leave an image */	1040	{ /* The last face was not blank, leave an image */
1094	CLEAR_FLAG (op, FLAG_BLOCKSVIEW);	1041	op->flag [FLAG_BLOCKSVIEW] = false;
1095	update_all_los (op->map, op->x, op->y);	1042	update_all_los (op->map, op->x, op->y);
1096	op->move_block = 0;	1043	op->move_block = 0;
1097	CLEAR_FLAG (op, FLAG_ALIVE);	1044	op->flag [FLAG_ALIVE] = false;
1098	}	1045	}
1099	}	1046	}
1100	}	1047	}
1101		1048
1102	void	1049	void
1103	scare_creature (object *target, object *hitter)	1050	scare_creature (object *target, object *hitter)
1104	{	1051	{
1105	object *owner = get_owner (hitter);	1052	target->flag [FLAG_SCARED] = true;
1106		1053
1107	if (!owner)
1108	owner = hitter;
1109
1110	SET_FLAG (target, FLAG_SCARED);
1111	if (!target->enemy)	1054	if (!target->enemy)
1112	target->enemy = owner;	1055	target->enemy = hitter->outer_owner ();
1113	}	1056	}
1114
1115		1057
1116	/* This returns the amount of damage hitter does to op with the	1058	/* This returns the amount of damage hitter does to op with the
1117	* appropriate attacktype. Only 1 attacktype should be set at a time.	1059	* appropriate attacktype. Only 1 attacktype should be set at a time.
1118	* This doesn't damage the player, but returns how much it should	1060	* This doesn't damage the player, but returns how much it should
1119	* take. However, it will do other effects (paralyzation, slow, etc.)	1061	* take. However, it will do other effects (paralyzation, slow, etc.)
1120	* Note - changed for PR code - we now pass the attack number and not	1062	* Note - changed for PR code - we now pass the attack number and not
1121	* the attacktype. Makes it easier for the PR code. */	1063	* the attacktype. Makes it easier for the PR code. */
1122
1123	int	1064	int
1124	hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)	1065	hit_player_attacktype (object *op, object *hitter, int dam, uint32 attacknum, int magic)
1125	{	1066	{
1126
1127	int doesnt_slay = 1;	1067	int doesnt_slay = 1;
1128		1068
1129	/* Catch anyone that may be trying to send us a bitmask instead of the number */	1069	/* Catch anyone that may be trying to send us a bitmask instead of the number */
1130	if (attacknum >= NROFATTACKS)	1070	if (attacknum >= NROFATTACKS)
1131	{	1071	{
…		…
1133	return 0;	1073	return 0;
1134	}	1074	}
1135		1075
1136	if (dam < 0)	1076	if (dam < 0)
1137	{	1077	{
1138	LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam);	1078	LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
		1079	dam, hitter->debug_desc (), op->debug_desc ());
1139	return 0;	1080	return 0;
1140	}	1081	}
1141		1082
1142	/* AT_INTERNAL is supposed to do exactly dam. Put a case here so	1083	/* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1143	* people can't mess with that or it otherwise get confused. */	1084	* people can't mess with that or it otherwise get confused. */
1144	if (attacknum == ATNR_INTERNAL)	1085	if (attacknum == ATNR_INTERNAL)
1145	return dam;	1086	return dam;
1146		1087
1147	if (hitter->slaying)	1088	if (hitter->slaying)
1148	{	1089	{
1149	if (((op->race != NULL) && strstr (hitter->slaying, op->race)) ||	1090	if ((op->race && hitter->slaying.contains (op->race))
1150	(op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying)))	1091	|| (op->arch && op->arch->archname.contains (hitter->slaying)))
1151	{	1092	{
1152	doesnt_slay = 0;	1093	doesnt_slay = 0;
1153	dam *= 3;	1094	dam *= 3;
1154	}	1095	}
1155	}	1096	}
…		…
1169	/* Special hack. By default, if immune to something, you	1110	/* Special hack. By default, if immune to something, you
1170	* shouldn't need to worry. However, acid is an exception, since	1111	* shouldn't need to worry. However, acid is an exception, since
1171	* it can still damage your items. Only include attacktypes if	1112	* it can still damage your items. Only include attacktypes if
1172	* special processing is needed */	1113	* special processing is needed */
1173		1114
1174	if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID))	1115	if (op->resist[attacknum] >= 100
		1116	&& doesnt_slay
		1117	&& attacknum != ATNR_ACID)
1175	return 0;	1118	return 0;
1176		1119
1177	/* Keep this in order - makes things easier to find */	1120	/* Keep this in order - makes things easier to find */
1178		1121
1179	switch (attacknum)	1122	switch (attacknum)
1180	{	1123	{
1181	case ATNR_PHYSICAL:	1124	case ATNR_PHYSICAL:
1182	/* here also check for diseases */	1125	/* here also check for diseases */
1183	check_physically_infect (op, hitter);	1126	check_physically_infect (op, hitter);
1184	break;	1127	break;
1185		1128
1186	/* Don't need to do anything for:	1129	/* Don't need to do anything for:
1187	magic,	1130	magic,
1188	fire,	1131	fire,
1189	electricity,	1132	electricity,
1190	cold */	1133	cold */
1191		1134
1192	case ATNR_CONFUSION:	1135	case ATNR_CONFUSION:
1193	case ATNR_POISON:	1136	case ATNR_POISON:
1194	case ATNR_SLOW:	1137	case ATNR_SLOW:
1195	case ATNR_PARALYZE:	1138	case ATNR_PARALYZE:
1196	case ATNR_FEAR:	1139	case ATNR_FEAR:
1197	case ATNR_CANCELLATION:	1140	case ATNR_CANCELLATION:
1198	case ATNR_DEPLETE:	1141	case ATNR_DEPLETE:
1199	case ATNR_BLIND:	1142	case ATNR_BLIND:
1200	{	1143	{
1201	/* chance for inflicting a special attack depends on the	1144	/* chance for inflicting a special attack depends on the
1202	* difference between attacker's and defender's level	1145	* difference between attacker's and defender's level
1203	*/	1146	*/
1204	int level_diff = MIN (110, MAX (0, op->level - hitter->level));	1147	int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1205		1148
1206	/* First, only creatures/players with speed can be affected.	1149	/* First, only creatures/players with speed can be affected.
1207	* Second, just getting hit doesn't mean it always affects	1150	* Second, just getting hit doesn't mean it always affects
1208	* you. Third, you still get a saving through against the	1151	* you. Third, you still get a saving through against the
1209	* effect.	1152	* effect.
1210	*/	1153	*/
1211	if (op->speed &&	1154	if (op->speed &&
1212	(QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&	1155	(QUERY_FLAG (op, FLAG_MONSTER) || op->type == PLAYER) &&
1213	!(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))	1156	!(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1214	{	1157	{
1215		1158
1216	/* Player has been hit by something */	1159	/* Player has been hit by something */
1217	if (attacknum == ATNR_CONFUSION)	1160	if (attacknum == ATNR_CONFUSION)
1218	confuse_player (op, hitter, dam);	1161	confuse_player (op, hitter, dam);
1219	else if (attacknum == ATNR_POISON)	1162	else if (attacknum == ATNR_POISON)
1220	poison_player (op, hitter, dam);	1163	poison_player (op, hitter, dam);
1221	else if (attacknum == ATNR_SLOW)	1164	else if (attacknum == ATNR_SLOW)
1222	slow_player (op, hitter, dam);	1165	slow_player (op, hitter, dam);
1223	else if (attacknum == ATNR_PARALYZE)	1166	else if (attacknum == ATNR_PARALYZE)
1224	paralyze_player (op, hitter, dam);	1167	paralyze_player (op, hitter, dam);
1225	else if (attacknum == ATNR_FEAR)	1168	else if (attacknum == ATNR_FEAR)
1226	scare_creature (op, hitter);	1169	scare_creature (op, hitter);
1227	else if (attacknum == ATNR_CANCELLATION)	1170	else if (attacknum == ATNR_CANCELLATION)
1228	cancellation (op);	1171	cancellation (op);
1229	else if (attacknum == ATNR_DEPLETE)	1172	else if (attacknum == ATNR_DEPLETE)
1230	drain_stat (op);	1173	op->drain_stat ();
1231	else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))	1174	else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1232	blind_player (op, hitter, dam);	1175	blind_player (op, hitter, dam);
1233	}	1176	}
		1177
1234	dam = 0; /* These are all effects and don't do real damage */	1178	dam = 0; /* These are all effects and don't do real damage */
1235	}	1179	}
1236	break;	1180	break;
		1181
1237	case ATNR_ACID:	1182	case ATNR_ACID:
1238	{	1183	{
1239	int flag = 0;	1184	int flag = 0;
1240		1185
1241	/* Items only get corroded if you're not on a battleground and	1186	/* Items only get corroded if you're not on a battleground and
1242	* if your acid resistance is below 50%. */	1187	* if your acid resistance is below 50%. */
1243	if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))	1188	if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1244	{	1189	{
1245	object *tmp;
1246
1247	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1190	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1248	{	1191	{
1249	if (tmp->invisible)	1192	if (tmp->invisible)
1250	continue;	1193	continue;
1251	if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))	1194	if (!QUERY_FLAG (tmp, FLAG_APPLIED) || (tmp->resist[ATNR_ACID] >= 10))
1252	/* >= 10% acid res. on itmes will protect these */	1195	/* >= 10% acid res. on items will protect these */
1253	continue;	1196	continue;
1254	if (!(tmp->material & M_IRON))	1197	if (!(tmp->materials & M_IRON))
1255	continue;	1198	continue;
1256	if (tmp->magic < -4) /* Let's stop at -5 */	1199	if (tmp->magic < -4) /* Let's stop at -5 */
1257	continue;	1200	continue;
1258	if (tmp->type == RING ||	1201	if (tmp->type == RING
1259	/* removed boots and gloves from exclusion list in	1202	/* removed boots and gloves from exclusion list in PR */
1260	PR */	1203	|| tmp->type == GIRDLE
1261	tmp->type == GIRDLE || tmp->type == AMULET || tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	1204	|| tmp->type == AMULET
		1205	|| tmp->type == WAND
		1206	|| tmp->type == ROD
		1207	|| tmp->type == HORN)
1262	continue; /* To avoid some strange effects */	1208	continue; /* To avoid some strange effects */
1263		1209
1264	/* High damage acid has better chance of corroding	1210	/* High damage acid has better chance of corroding
1265	objects */	1211	objects */
1266	if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)	1212	if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
		1213	{
		1214	flag = 1;
		1215	tmp->magic--;
		1216
		1217	if (object *pl = tmp->visible_to ())
1267	{	1218	{
1268	if (op->type == PLAYER)
1269	/* Make this more visible */	1219	/* Make this more visible */
1270	new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op,	1220	new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, pl,
1271	"The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));	1221	"The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1272	flag = 1;	1222
1273	tmp->magic--;	1223	esrv_send_item (op, tmp); //TODO: UPD_NAME should be enough (it's enough in other cases)
1274	if (op->type == PLAYER)
1275	esrv_send_item (op, tmp);
1276	}	1224	}
1277	}	1225	}
1278	if (flag)	1226	}
1279	fix_player (op); /* Something was corroded */
1280	}	1227
		1228	if (flag)
		1229	op->update_stats (); /* Something was corroded */
1281	}	1230	}
		1231	}
1282	break;	1232	break;
		1233
1283	case ATNR_DRAIN:	1234	case ATNR_DRAIN:
1284	{	1235	{
1285	/* rate is the proportion of exp drained. High rate means	1236	/* rate is the proportion of exp drained. High rate means
1286	* not much is drained, low rate means a lot is drained.	1237	* not much is drained, low rate means a lot is drained.
1287	*/	1238	*/
1288	int rate;	1239	int rate;
1289		1240
1290	if (op->resist[ATNR_DRAIN] >= 0)	1241	if (op->resist[ATNR_DRAIN] >= 0)
1291	rate = 400 + op->resist[ATNR_DRAIN] * 3;	1242	rate = 400 + op->resist[ATNR_DRAIN] * 3;
1292	else	1243	else
1293	rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);	1244	rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1294		1245
1295	if (op->stats.exp <= rate)	1246	if (op->stats.exp <= rate)
1296	{	1247	{
1297	if (op->type == GOLEM)	1248	if (op->type == GOLEM)
1298	dam = 999; /* Its force is "sucked" away. 8) */	1249	dam = 999; /* Its force is "sucked" away. 8) */
1299	else	1250	else
1300	/* If we can't drain, lets try to do physical damage */	1251	/* If we can't drain, lets try to do physical damage */
1301	dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);	1252	dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1302	}	1253	}
1303	else	1254	else
1304	{	1255	{
1305	/* Randomly give the hitter some hp */	1256	/* Randomly give the hitter some hp */
1306	if (hitter->stats.hp < hitter->stats.maxhp &&	1257	if (hitter->stats.hp < hitter->stats.maxhp &&
1307	(op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)	1258	(op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1308	hitter->stats.hp++;	1259	hitter->stats.hp++;
1309		1260
1310	/* Can't do drains on battleground spaces.	1261	/* Can't do drains on battleground spaces.
1311	* Move the wiz check up here - before, the hitter wouldn't gain exp	1262	* Move the wiz check up here - before, the hitter wouldn't gain exp
1312	* exp, but the wiz would still lose exp! If drainee is a wiz,	1263	* exp, but the wiz would still lose exp! If drainee is a wiz,
1313	* nothing happens.	1264	* nothing happens.
1314	* Try to credit the owner. We try to display player -> player drain	1265	* Try to credit the owner. We try to display player -> player drain
1315	* attacks, hence all the != PLAYER checks.	1266	* attacks, hence all the != PLAYER checks.
1316	*/	1267	*/
1317	if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))	1268	if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1318	{	1269	{
1319	object *owner = get_owner (hitter);	1270	object *owner = hitter->owner;
1320		1271
1321	if (owner && owner != hitter)	1272	if (owner && owner != hitter)
1322	{	1273	{
1323	if (op->type != PLAYER || owner->type != PLAYER)	1274	if (op->type != PLAYER || owner->type != PLAYER)
1324	change_exp (owner, op->stats.exp / (rate * 2),	1275	change_exp (owner, op->stats.exp / (rate * 2),
1325	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);	1276	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1326	}	1277	}
1327	else if (op->type != PLAYER || hitter->type != PLAYER)	1278	else if (op->type != PLAYER || hitter->type != PLAYER)
1328	{
1329	change_exp (hitter, op->stats.exp / (rate * 2),	1279	change_exp (hitter, op->stats.exp / (rate * 2),
1330	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);	1280	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1331	}	1281
1332	change_exp (op, -op->stats.exp / rate, NULL, 0);	1282	change_exp (op, -op->stats.exp / rate, NULL, 0);
1333	}	1283	}
		1284
1334	dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure	1285	dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1335	* drain attack, you won't know that you are actually sucking out EXP,	1286	* drain attack, you won't know that you are actually sucking out EXP,
1336	* as the messages will say you missed	1287	* as the messages will say you missed
1337	*/	1288	*/
1338	}	1289	}
1339	}	1290	}
1340	break;	1291	break;
		1292
1341	case ATNR_TURN_UNDEAD:	1293	case ATNR_TURN_UNDEAD:
1342	{	1294	{
1343	if (QUERY_FLAG (op, FLAG_UNDEAD))	1295	if (QUERY_FLAG (op, FLAG_UNDEAD))
1344	{	1296	{
1345	object *owner = hitter->owner ? (object *)hitter->owner : hitter;	1297	object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1346	object *god = find_god (determine_god (owner));	1298	object *god = find_god (determine_god (owner));
1347	int div = 1;	1299	int div = 1;
1348		1300
1349	/* if undead are not an enemy of your god, you turn them	1301	/* if undead are not an enemy of your god, you turn them
1350	* at half strength */	1302	* at half strength */
1351	if (!god || !god->slaying || strstr (god->slaying, undead_name) == NULL)	1303	if (!god || !god->slaying.contains (shstr_undead))
1352	div = 2;	1304	div = 2;
		1305
1353	/* Give a bonus if you resist turn undead */	1306	/* Give a bonus if you resist turn undead */
1354	if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))	1307	if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1355	scare_creature (op, owner);	1308	scare_creature (op, owner);
1356	}	1309	}
1357	else	1310	else
1358	dam = 0; /* don't damage non undead - should we damage	1311	dam = 0; /* don't damage non undead - should we damage
1359	undead? */	1312	undead? */
1360	}	1313	}
1361	break;	1314	break;
		1315
1362	case ATNR_DEATH:	1316	case ATNR_DEATH:
1363	deathstrike_player (op, hitter, &dam);	1317	deathstrike_player (op, hitter, &dam);
1364	break;	1318	break;
		1319
1365	case ATNR_CHAOS:	1320	case ATNR_CHAOS:
1366	LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter));	1321	LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1367	dam = 0;	1322	dam = 0;
1368	break;	1323	break;
		1324
1369	case ATNR_COUNTERSPELL:	1325	case ATNR_COUNTERSPELL:
1370	LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter));	1326	LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1371	dam = 0;	1327	dam = 0;
1372	/* This should never happen. Counterspell is handled	1328	/* This should never happen. Counterspell is handled
1373	* seperately and filtered out. If this does happen,	1329	* seperately and filtered out. If this does happen,
1374	* Counterspell has no effect on anything but spells, so it	1330	* Counterspell has no effect on anything but spells, so it
1375	* does no damage. */	1331	* does no damage. */
1376	break;	1332	break;
		1333
1377	case ATNR_HOLYWORD:	1334	case ATNR_HOLYWORD:
1378	{	1335	{
1379	/* This has already been handled by hit_player,	1336	/* This has already been handled by hit_player,
1380	* no need to check twice -- DAMN */	1337	* no need to check twice -- DAMN */
1381	object *owner = hitter->owner ? (object *)hitter->owner : hitter;	1338	object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1382		1339
1383	/* As with turn undead above, give a bonus on the saving throw */	1340	/* As with turn undead above, give a bonus on the saving throw */
1384	if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])	1341	if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1385	scare_creature (op, owner);	1342	scare_creature (op, owner);
1386	}	1343	}
1387	break;	1344	break;
		1345
1388	case ATNR_LIFE_STEALING:	1346	case ATNR_LIFE_STEALING:
1389	{	1347	{
1390	int new_hp;	1348	int new_hp;
1391		1349
1392	/* this is replacement to drain for players, instead of taking	1350	/* this is replacement to drain for players, instead of taking
1393	* exp it takes hp. It is geared for players, probably not	1351	* exp it takes hp. It is geared for players, probably not
1394	* much use giving it to monsters	1352	* much use giving it to monsters
1395	*	1353	*
1396	* life stealing doesn't do a lot of damage, but it gives the	1354	* life stealing doesn't do a lot of damage, but it gives the
1397	* damage it does do to the player. Given that,	1355	* damage it does do to the player. Given that,
1398	* it only does 1/10'th normal damage (hence the divide by	1356	* it only does 1/10'th normal damage (hence the divide by
1399	* 1000).	1357	* 1000).
1400	*/	1358	*/
1401	/* You can't steal life from something undead */	1359	/* You can't steal life from something undead */
1402	if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))	1360	if ((op->type == GOLEM) || (QUERY_FLAG (op, FLAG_UNDEAD)))
1403	return 0;	1361	return 0;
		1362
1404	/* If drain protection is higher than life stealing, use that */	1363	/* If drain protection is higher than life stealing, use that */
1405	if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])	1364	if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1406	dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;	1365	dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1407	else	1366	else
1408	dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;	1367	dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
		1368
1409	/* You die at -1 hp, not zero. */	1369	/* You die at -1 hp, not zero. */
1410	if (dam > (op->stats.hp + 1))	1370	if (dam > (op->stats.hp + 1))
1411	dam = op->stats.hp + 1;	1371	dam = op->stats.hp + 1;
		1372
1412	new_hp = hitter->stats.hp + dam;	1373	new_hp = hitter->stats.hp + dam;
1413	if (new_hp > hitter->stats.maxhp)	1374	if (new_hp > hitter->stats.maxhp)
1414	new_hp = hitter->stats.maxhp;	1375	new_hp = hitter->stats.maxhp;
		1376
1415	if (new_hp > hitter->stats.hp)	1377	if (new_hp > hitter->stats.hp)
1416	hitter->stats.hp = new_hp;	1378	hitter->stats.hp = new_hp;
1417	}	1379	}
1418	}	1380	}
		1381
1419	return dam;	1382	return dam;
1420	}	1383	}
1421
1422		1384
1423	/* GROS: This code comes from hit_player. It has been made external to	1385	/* GROS: This code comes from hit_player. It has been made external to
1424	* allow script procedures to "kill" objects in a combat-like fashion.	1386	* allow script procedures to "kill" objects in a combat-like fashion.
1425	* It was initially used by (kill-object) developed for the Collector's	1387	* It was initially used by (kill-object) developed for the Collector's
1426	* Sword. Note that nothing has been changed from the original version	1388	* Sword. Note that nothing has been changed from the original version
…		…
1437	*/	1399	*/
1438	int	1400	int
1439	kill_object (object *op, int dam, object *hitter, int type)	1401	kill_object (object *op, int dam, object *hitter, int type)
1440	{	1402	{
1441	char buf[MAX_BUF];	1403	char buf[MAX_BUF];
1442	const char *skill;	1404	shstr skill;
1443	int maxdam = 0;	1405	int maxdam = 0;
1444	int battleg = 0; /* true if op standing on battleground */	1406	int battleg = 0; /* true if op standing on battleground */
1445	int pk = 0; /* true if op and what controls hitter are both players */	1407	int pk = 0; /* true if op and what controls hitter are both players */
1446	object *owner = NULL;	1408	object *owner = 0;
1447	object *skop = NULL;	1409	object *skop = 0;
1448		1410
1449	if (op->stats.hp >= 0)	1411	if (op->stats.hp >= 0)
1450	return -1;	1412	return -1;
1451		1413
1452	if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))	1414	if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
…		…
1461	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))	1423	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1462	update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */	1424	update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1463		1425
1464	if (op->type == DOOR)	1426	if (op->type == DOOR)
1465	{	1427	{
1466	op->speed = 0.1;	1428	op->set_speed (0.1f);
1467	update_ob_speed (op);
1468	op->speed_left = -0.05;	1429	op->speed_left = -0.05f;
1469	return maxdam;	1430	return maxdam;
1470	}	1431	}
		1432
1471	if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)	1433	if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1472	{	1434	{
1473	remove_friendly_object (op);	1435	op->drop_and_destroy ();
1474	if (get_owner (op) != NULL && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1475	{
1476	op->owner->contr->ranges[range_golem] = NULL;
1477	op->owner->contr->golem_count = 0;
1478	}
1479
1480	remove_ob (op);
1481	free_object (op);
1482	return maxdam;	1436	return maxdam;
1483	}	1437	}
1484		1438
1485	/* Now lets start dealing with experience we get for killing something */	1439	/* Now lets start dealing with experience we get for killing something */
1486		1440
1487	owner = get_owner (hitter);	1441	owner = hitter->outer_owner ();
1488	if (owner == NULL)	1442	if (!owner)
1489	owner = hitter;	1443	owner = hitter;
1490		1444
1491	/* is the victim (op) standing on battleground? */	1445	/* is the victim (op) standing on battleground? */
1492	if (op_on_battleground (op, NULL, NULL))	1446	if (op_on_battleground (op, NULL, NULL))
1493	battleg = 1;	1447	battleg = 1;
…		…
1497	pk = 1;	1451	pk = 1;
1498		1452
1499	/* Player killed something */	1453	/* Player killed something */
1500	if (owner->type == PLAYER)	1454	if (owner->type == PLAYER)
1501	{	1455	{
1502	Log_Kill (owner->name,
1503	query_name (op), op->type, (owner != hitter) ? query_name (hitter) : NULL, (owner != hitter) ? hitter->type : 0);
1504
1505	/* Log players killing other players - makes it easier to detect	1456	/* Log players killing other players - makes it easier to detect
1506	* and filter out malicious player killers - that is why the	1457	* and filter out malicious player killers - that is why the
1507	* ip address is included.	1458	* ip address is included.
1508	*/	1459	*/
1509	if (op->type == PLAYER && !battleg)	1460	if (op->type == PLAYER && !battleg)
…		…
1513	char buf[256];	1464	char buf[256];
1514		1465
1515	tmv = localtime (&t);	1466	tmv = localtime (&t);
1516	strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);	1467	strftime (buf, 256, "%a %b %d %H:%M:%S %Y", tmv);
1517		1468
1518	LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->socket.host, query_name (op));	1469	LOG (llevInfo, "%s PLAYER_KILL_PLAYER: %s (%s) killed %s\n", buf, &owner->name, owner->contr->ns->host, query_name (op));
1519	}	1470	}
1520		1471
1521	/* try to filter some things out - basically, if you are	1472	/* try to filter some things out - basically, if you are
1522	* killing a level 1 creature and your level 20, you	1473	* killing a level 1 creature and your level 20, you
1523	* probably don't want to see that.	1474	* probably don't want to see that.
1524	*/	1475	*/
1525	if (owner->level < op->level * 2 || op->stats.exp > 1000)	1476	if (owner->level < op->level * 2 || op->stats.exp > 1000)
1526	{	1477	{
1527	if (owner != hitter)	1478	if (owner != hitter)
1528	{
1529	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));	1479	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s with %s.", query_name (op), query_name (hitter));
1530	}
1531	else	1480	else
1532	{
1533	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));	1481	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1534	}	1482
1535	/* Only play sounds for melee kills */	1483	/* Only play sounds for melee kills */
1536	if (hitter->type == PLAYER)	1484	if (hitter->type == PLAYER)
1537	play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS);	1485	owner->play_sound (sound_find ("player_kills"));
1538	}	1486	}
1539		1487
1540	/* If a player kills another player, not on	1488	/* If a player kills another player, not on
1541	* battleground, the "killer" looses 1 luck. Since this is	1489	* battleground, the "killer" looses 1 luck. Since this is
1542	* not reversible, it's actually quite a pain IMHO. -AV	1490	* not reversible, it's actually quite a pain IMHO. -AV
…		…
1544	* player that the object belonged to - so if you killed another player	1492	* player that the object belonged to - so if you killed another player
1545	* with spells, pets, whatever, there was no penalty.	1493	* with spells, pets, whatever, there was no penalty.
1546	* Changed to make luck penalty configurable in settings.	1494	* Changed to make luck penalty configurable in settings.
1547	*/	1495	*/
1548	if (op->type == PLAYER && owner != op && !battleg)	1496	if (op->type == PLAYER && owner != op && !battleg)
1549	change_luck (owner, -settings.pk_luck_penalty);	1497	owner->change_luck (-settings.pk_luck_penalty);
1550		1498
1551	/* This code below deals with finding the appropriate skill	1499	/* This code below deals with finding the appropriate skill
1552	* to credit exp to. This is a bit problematic - we should	1500	* to credit exp to. This is a bit problematic - we should
1553	* probably never really have to look at current_weapon->skill	1501	* probably never really have to look at current_weapon->skill
1554	*/	1502	*/
1555	skill = NULL;
1556	if (hitter->skill && hitter->type != PLAYER)	1503	if (hitter->skill && hitter->type != PLAYER)
1557	skill = hitter->skill;	1504	skill = hitter->skill;
1558	else if (owner->chosen_skill)	1505	else if (owner->chosen_skill)
1559	{	1506	{
1560	skill = owner->chosen_skill->skill;
1561	skop = owner->chosen_skill;	1507	skop = owner->chosen_skill;
		1508	skill = skop->skill;
1562	}	1509	}
1563	else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))	1510	else if (QUERY_FLAG (owner, FLAG_READY_WEAPON) && owner->current_weapon)
1564	skill = owner->current_weapon->skill;	1511	skill = owner->current_weapon->skill;
1565	else	1512	else
		1513	{
1566	LOG (llevError, "kill_object - unable to find skill that killed monster\n");	1514	LOG (llevError, "BUG: kill_object - unable to find skill that killed monster\n"
		1515	"op: %s\n" "hitter: %s\n" "owner: %s\n",
		1516	owner->debug_desc (), hitter->debug_desc (), op->debug_desc ());
		1517	skill = 0;
		1518	}
1567		1519
1568	/* We have the skill we want to credit to - now find the object this goes	1520	/* We have the skill we want to credit to - now find the object this goes
1569	* to. Make sure skop is an actual skill, and not a skill tool!	1521	* to. Make sure skop is an actual skill, and not a skill tool!
1570	*/	1522	*/
1571	if ((!skop || skop->type != SKILL) && skill)	1523	skop = owner->contr->find_skill (skill);
1572	{
1573	int i;
1574
1575	for (i = 0; i < NUM_SKILLS; i++)
1576	if (owner->contr->last_skill_ob[i] && !strcmp (owner->contr->last_skill_ob[i]->skill, skill))
1577	{
1578	skop = owner->contr->last_skill_ob[i];
1579	break;
1580	}
1581	}
1582	} /* Was it a player that hit somethign */	1524	} /* Was it a player that hit somethign */
1583	else	1525	else
1584	{
1585	skill = NULL;	1526	skill = 0;
1586	}
1587		1527
1588	/* Pet (or spell) killed something. */
1589	if (owner != hitter)
1590	{
1591	(void) sprintf (buf, "%s killed %s with %s%s%s.", &owner->name,
1592	query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : "");
1593	}
1594	else
1595	{
1596	(void) sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name,
1597	(QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ?
1598	" in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : "");
1599	}
1600	/* These may have been set in the player code section above */	1528	/* These may have been set in the player code section above */
1601	if (!skop)	1529	if (!skop)
1602	skop = hitter->chosen_skill;	1530	skop = hitter->chosen_skill;
		1531
1603	if (!skill && skop)	1532	if (!skill && skop)
1604	skill = skop->skill;	1533	skill = skop->skill;
1605		1534
1606	new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1607
1608
1609	/* If you didn't kill yourself, and your not the wizard */	1535	/* If you didn't kill yourself, and your not the wizard */
1610	if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ))	1536	if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1611	{	1537	{
1612	int exp;	1538	int exp;
1613		1539
1614	/* Really don't give much experience for killing other players */	1540	/* Really don't give much experience for killing other players */
1615	// schmorp: temporary? reduce the amount of exp gained for pking enourmously	1541	// schmorp: temporarily? reduce the amount of exp gained for pking enourmously
1616	if (op->type == PLAYER)	1542	if (op->type == PLAYER)
1617	{	1543	{
1618	if (battleg)	1544	if (battleg)
1619	{	1545	{
1620	new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");	1546	new_draw_info (NDI_UNIQUE, 0, owner, "Your foe has fallen!");
…		…
1638		1564
1639	if (!settings.simple_exp)	1565	if (!settings.simple_exp)
1640	exp = exp / 2;	1566	exp = exp / 2;
1641		1567
1642	if (owner->type != PLAYER || owner->contr->party == NULL)	1568	if (owner->type != PLAYER || owner->contr->party == NULL)
1643	{
1644	change_exp (owner, exp, skill, 0);	1569	change_exp (owner, exp, skill, 0);
1645	}
1646	else	1570	else
1647	{	1571	{
1648	int shares = 0, count = 0;	1572	int shares = 0, count = 0;
1649
1650	player *pl;
1651
1652	partylist *party = owner->contr->party;	1573	partylist *party = owner->contr->party;
1653		1574
1654	#ifdef PARTY_KILL_LOG
1655	add_kill_to_party (party, query_name (owner), query_name (op), exp);	1575	add_kill_to_party (party, query_name (owner), query_name (op), exp);
1656	#endif	1576
1657	for (pl = first_player; pl != NULL; pl = pl->next)	1577	for_all_players (pl)
1658	{
1659	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))	1578	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1660	{	1579	{
1661	count++;	1580	count++;
1662	shares += (pl->ob->level + 4);	1581	shares += (pl->ob->level + 4);
1663	}	1582	}
1664	}	1583
1665	if (count == 1 || shares > exp)	1584	if (count == 1 || shares > exp || !shares)
1666	change_exp (owner, exp, skill, SK_EXP_TOTAL);	1585	change_exp (owner, exp, skill, SK_EXP_TOTAL);
1667	else	1586	else
1668	{	1587	{
1669	int share = exp / shares, given = 0, nexp;	1588	int share = exp / shares, given = 0, nexp;
1670		1589
1671	for (pl = first_player; pl != NULL; pl = pl->next)	1590	for_all_players (pl)
1672	{
1673	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))	1591	if (party && pl->ob->contr->party == party && on_same_map (pl->ob, owner))
1674	{	1592	{
1675	nexp = (pl->ob->level + 4) * share;	1593	nexp = (pl->ob->level + 4) * share;
1676	change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);	1594	change_exp (pl->ob, nexp, skill, SK_EXP_TOTAL);
1677	given += nexp;	1595	given += nexp;
1678	}	1596	}
1679	}	1597
1680	exp -= given;	1598	exp -= given;
1681	/* give any remainder to the player */	1599	/* give any remainder to the player */
1682	change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);	1600	change_exp (owner, exp, skill, SK_EXP_ADD_SKILL);
1683	}	1601	}
1684	} /* else part of a party */	1602	} /* else part of a party */
1685
1686	} /* end if person didn't kill himself */	1603	} /* end if person didn't kill himself */
1687		1604
1688	if (op->type != PLAYER)	1605	if (op->type != PLAYER)
1689	{	1606	{
1690	if (QUERY_FLAG (op, FLAG_FRIENDLY))	1607	if (QUERY_FLAG (op, FLAG_FRIENDLY))
1691	{	1608	{
1692	object *owner1 = get_owner (op);	1609	object *owner1 = op->owner;
1693		1610
1694	if (owner1 != NULL && owner1->type == PLAYER)	1611	if (owner1 && owner1->type == PLAYER)
1695	{	1612	{
1696	play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0);	1613	owner1->contr->play_sound (sound_find ("pet_is_killed"));
1697	/* Maybe we should include the owner that killed this, maybe not */	1614	/* Maybe we should include the owner that killed this, maybe not */
1698	new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);	1615	new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, was killed by %s.", &op->name, &hitter->name);
1699	}	1616	}
1700		1617
1701	remove_friendly_object (op);	1618	remove_friendly_object (op);
1702	}	1619	}
1703		1620
1704	remove_ob (op);	1621	op->drop_and_destroy ();
1705	free_object (op);
1706	}	1622	}
1707	/* Player has been killed! */
1708	else	1623	else
1709	{	1624	/* Player has been killed! */
1710	if (owner->type == PLAYER)	1625	op->contr->killer = owner->type == PLAYER ? owner : hitter;
1711	{
1712	snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title);
1713	}
1714	else
1715	assign (op->contr->killer, hitter->name);
1716	}
1717		1626
1718	/* This was return -1 - that doesn't seem correct - if we return -1, process	1627	/* This was return -1 - that doesn't seem correct - if we return -1, process
1719	* continues in the calling function.	1628	* continues in the calling function.
1720	*/	1629	*/
1721	return maxdam;	1630	return maxdam;
1722	}	1631	}
1723		1632
1724	/* Find out if this is friendly fire (PVP and attacker is peaceful) or not	1633	/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1725	* Returns 0 this is not friendly fire	1634	* Returns 0 this is not friendly fire
1726	*/	1635	*/
1727
1728	int	1636	int
1729	friendly_fire (object *op, object *hitter)	1637	friendly_fire (object *op, object *hitter)
1730	{	1638	{
1731	object *owner;	1639	object *owner;
1732	int friendlyfire;	1640	int friendlyfire;
…		…
1742	return 0;	1650	return 0;
1743		1651
1744	if (hitter->type == PLAYER && hitter->contr->peaceful == 1)	1652	if (hitter->type == PLAYER && hitter->contr->peaceful == 1)
1745	return 1;	1653	return 1;
1746		1654
1747	if ((owner = get_owner (hitter)) != NULL)	1655	if ((owner = hitter->owner) != NULL)
1748	{	1656	{
1749	if (owner->type == PLAYER && owner->contr->peaceful == 1)	1657	if (owner->type == PLAYER && owner->contr->peaceful == 1)
1750	friendlyfire = 2;	1658	friendlyfire = 2;
1751	}	1659	}
1752		1660
1753	if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)	1661	if (hitter->type == SPELL || hitter->type == POISONING || hitter->type == DISEASE || hitter->type == RUNE)
1754	friendlyfire = 0;	1662	friendlyfire = 0;
1755	}	1663	}
		1664
1756	return friendlyfire;	1665	return friendlyfire;
1757	}	1666	}
1758
1759		1667
1760	/* This isn't used just for players, but in fact most objects.	1668	/* This isn't used just for players, but in fact most objects.
1761	* op is the object to be hit, dam is the amount of damage, hitter	1669	* op is the object to be hit, dam is the amount of damage, hitter
1762	* is what is hitting the object, type is the attacktype, and	1670	* is what is hitting the object, type is the attacktype, and
1763	* full_hit is set if monster area does not matter.	1671	* full_hit is set if monster area does not matter.
1764	* dam is base damage - protections/vulnerabilities/slaying matches can	1672	* dam is base damage - protections/vulnerabilities/slaying matches can
1765	* modify it.	1673	* modify it.
1766	*/	1674	*/
1767
1768	/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack	1675	/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1769	* which needs new attacktype AT_HOLYWORD to work . b.t. */	1676	* which needs new attacktype AT_HOLYWORD to work . b.t. */
1770
1771	int	1677	int
1772	hit_player (object *op, int dam, object *hitter, int type, int full_hit)	1678	hit_player (object *op, int dam, object *hitter, int type, int full_hit)
1773	{	1679	{
1774	int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);	1680	int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1775	int maxattacktype, attacknum;	1681	int maxattacktype, attacknum;
1776	int body_attack = op && op->head; /* Did we hit op's head? */	1682	int body_attack = op && op->head; /* Did we hit op's head? */
1777	int simple_attack;	1683	int simple_attack;
1778	tag_t op_tag, hitter_tag;
1779	int rtn_kill = 0;	1684	int rtn_kill = 0;
1780	int friendlyfire;	1685	int friendlyfire;
1781		1686
1782	if (get_attack_mode (&op, &hitter, &simple_attack))	1687	if (get_attack_mode (&op, &hitter, &simple_attack))
1783	return 0;	1688	return 0;
1784		1689
1785	/* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */	1690	/* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1786	if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))	1691	if (QUERY_FLAG (op, FLAG_WIZ) || QUERY_FLAG (op, FLAG_NO_DAMAGE))
1787	return 0;	1692	return 0;
1788		1693
1789	#ifdef PROHIBIT_PLAYERKILL	1694	// only allow pk for hostile players
1790	if (op->type == PLAYER)	1695	if (op->type == PLAYER)
1791	{	1696	{
1792	object *owner = get_owner (hitter);	1697	object *owner = hitter->owner;
1793		1698
1794	if (!owner)	1699	if (!owner)
1795	owner = hitter;	1700	owner = hitter;
1796	if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) && op != owner)	1701
1797	{	1702	if (owner->type == PLAYER
		1703	&& (!op_on_battleground (op, 0, 0)
		1704	&& (op->contr->peaceful || owner->contr->peaceful))
		1705	&& op != owner)
1798	return 0;	1706	return 0;
1799	}
1800	}	1707	}
1801	#endif
1802
1803	op_tag = op->count;
1804	hitter_tag = hitter->count;
1805		1708
1806	if (body_attack)	1709	if (body_attack)
1807	{	1710	{
1808	/* slow and paralyze must hit the head. But we don't want to just	1711	/* slow and paralyze must hit the head. But we don't want to just
1809	* return - we still need to process other attacks the spell still	1712	* return - we still need to process other attacks the spell still
…		…
1815	* attack so we don't cancel out things like magic bullet.	1718	* attack so we don't cancel out things like magic bullet.
1816	*/	1719	*/
1817	if (type & (AT_PARALYZE | AT_SLOW))	1720	if (type & (AT_PARALYZE | AT_SLOW))
1818	{	1721	{
1819	type &= ~(AT_PARALYZE | AT_SLOW);	1722	type &= ~(AT_PARALYZE | AT_SLOW);
		1723
1820	if (!type || type == AT_MAGIC)	1724	if (!type || type == AT_MAGIC)
1821	return 0;	1725	return 0;
1822	}	1726	}
1823	}	1727	}
1824		1728
1825	if (!simple_attack && op->type == DOOR)	1729	if (!simple_attack && op->type == DOOR)
1826	{	1730	{
1827	object *tmp;
1828
1829	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1731	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1830	if (tmp->type == RUNE || tmp->type == TRAP)	1732	if (tmp->type == RUNE || tmp->type == TRAP)
1831	{	1733	{
1832	spring_trap (tmp, hitter);	1734	spring_trap (tmp, hitter);
		1735
1833	if (was_destroyed (hitter, hitter_tag) || was_destroyed (op, op_tag) || abort_attack (op, hitter, simple_attack))	1736	if (hitter->destroyed () || op->destroyed () || abort_attack (op, hitter, simple_attack))
1834	return 0;	1737	return 0;
		1738
1835	break;	1739	break;
1836	}	1740	}
1837	}	1741	}
1838		1742
1839	if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)	1743	if (!QUERY_FLAG (op, FLAG_ALIVE) || op->stats.hp < 0)
1840	{	1744	{
1841	/* FIXME: If a player is killed by a rune in a door, the	1745	/* FIXME: If a player is killed by a rune in a door, the
1842	* was_destroyed() check above doesn't return, and might get here.	1746	* destroyed() check above doesn't return, and might get here.
1843	*/	1747	*/
		1748
		1749	/* FIXME: This for example happens when a dead door is on a mover and
		1750	gets it's speed_left raised on each mover-tick.
		1751	Doors are removed in a kinda funny way by giving them speed and speed_left
		1752	and waiting for that to run out.
		1753	*/
1844	LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name);	1754	LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1845	return 0;	1755	return 0;
1846	}	1756	}
1847		1757
1848	#ifdef ATTACK_DEBUG	1758	#ifdef ATTACK_DEBUG
1849	LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);	1759	LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
…		…
1855	* in case 0>dam>1, we try to "simulate" a float value-effect */	1765	* in case 0>dam>1, we try to "simulate" a float value-effect */
1856	dam = dam * (100 - op->resist[ATNR_MAGIC]);	1766	dam = dam * (100 - op->resist[ATNR_MAGIC]);
1857	if (dam >= 100)	1767	if (dam >= 100)
1858	dam /= 100;	1768	dam /= 100;
1859	else	1769	else
1860	dam = (dam > (rndm (0, 99))) ? 1 : 0;	1770	dam = (dam > rndm (0, 99)) ? 1 : 0;
1861	}	1771	}
1862		1772
1863	/* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map	1773	/* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1864	* If the attacktype still has chaos, shuffle it, then clear the Chaos bit	1774	* If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1865	*/	1775	*/
…		…
1876	*/	1786	*/
1877	if (type & AT_HOLYWORD)	1787	if (type & AT_HOLYWORD)
1878	{	1788	{
1879	object *god;	1789	object *god;
1880		1790
1881	if ((!hitter->slaying ||	1791	if ((!hitter->slaying
1882	(!(op->race && strstr (hitter->slaying, op->race)) &&	1792	|| (!(op->race && hitter->slaying.contains (op->race))
1883	!(op->name && strstr (hitter->slaying, op->name)))) &&	1793	&& !(op->name && hitter->slaying.contains (op->name))))
1884	(!QUERY_FLAG (op, FLAG_UNDEAD) ||	1794	&& (!QUERY_FLAG (op, FLAG_UNDEAD)
1885	(hitter->title != NULL	1795	|| (hitter->title
1886	&& (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL)))	1796	&& (god = find_god (determine_god (hitter))) != NULL
		1797	&& god->race.contains (shstr_undead))))
1887	return 0;	1798	return 0;
1888	}	1799	}
1889		1800
1890	maxattacktype = type; /* initialize this to something */	1801	maxattacktype = type; /* initialise this to something */
1891	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)	1802	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
1892	{	1803	{
1893	/* Magic isn't really a true attack type - it gets combined with other	1804	/* Magic isn't really a true attack type - it gets combined with other
1894	* attack types. As such, skip it over. However, if magic is	1805	* attack types. As such, skip it over. However, if magic is
1895	* the only attacktype in the group, then still attack with it	1806	* the only attacktype in the group, then still attack with it
…		…
1923	*/	1834	*/
1924	friendlyfire = friendly_fire (op, hitter);	1835	friendlyfire = friendly_fire (op, hitter);
1925	if (friendlyfire && maxdam)	1836	if (friendlyfire && maxdam)
1926	{	1837	{
1927	maxdam = ((dam * settings.set_friendly_fire) / 100);	1838	maxdam = ((dam * settings.set_friendly_fire) / 100);
1928	#ifndef COZY_SERVER
1929	maxdam++;
1930	#endif
1931		1839
1932	#ifdef ATTACK_DEBUG	1840	#ifdef ATTACK_DEBUG
1933	LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",	1841	LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1934	friendlyfire, settings.set_friendly_fire, dam, maxdam);	1842	friendlyfire, settings.set_friendly_fire, dam, maxdam);
1935	#endif	1843	#endif
1936	}	1844	}
1937		1845
1938	if (!full_hit)	1846	if (!full_hit)
1939	{	1847	{
1940	archetype *at;
1941	int area;	1848	int area;
1942	int remainder;	1849	int remainder;
1943		1850
1944	area = 0;	1851	area = 0;
1945	for (at = op->arch; at != NULL; at = at->more)	1852
		1853	for (archetype *at = op->arch; at; at = (archetype *)at->more)
1946	area++;	1854	area++;
		1855
1947	assert (area > 0);	1856	assert (area > 0);
1948		1857
1949	/* basically: maxdam /= area; we try to "simulate" a float	1858	/* basically: maxdam /= area; we try to "simulate" a float
1950	value-effect */	1859	value-effect */
1951	remainder = 100 * (maxdam % area) / area;	1860	remainder = 100 * (maxdam % area) / area;
1952	maxdam /= area;	1861	maxdam /= area;
1953	if (RANDOM () % 100 < remainder)	1862	if (rndm (100) < remainder)
1954	maxdam++;	1863	maxdam++;
1955	}	1864	}
1956		1865
1957	#ifdef ATTACK_DEBUG	1866	#ifdef ATTACK_DEBUG
1958	LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);	1867	LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1959	#endif	1868	#endif
1960		1869
1961	if (get_owner (hitter))	1870	// for now, only do this for active objects, otherwise they
		1871	// keep a refcount for a long time and I see no usefulness
		1872	// for an non-active objetc to know its enemy.
		1873	if (op->active)
		1874	if (hitter->owner)
1962	op->enemy = hitter->owner;	1875	op->enemy = hitter->owner;
1963	else if (QUERY_FLAG (hitter, FLAG_ALIVE))	1876	else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1964	op->enemy = hitter;	1877	op->enemy = hitter;
1965		1878
1966	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)	1879	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1967	{	1880	{
1968	/* The unaggressives look after themselves 8) */	1881	/* The unaggressives look after themselves 8) */
1969	CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);	1882	CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
…		…
1991		1904
1992	if (QUERY_FLAG (op, FLAG_TEAR_DOWN))	1905	if (QUERY_FLAG (op, FLAG_TEAR_DOWN))
1993	{	1906	{
1994	if (maxdam)	1907	if (maxdam)
1995	tear_down_wall (op);	1908	tear_down_wall (op);
		1909
1996	return maxdam; /* nothing more to do for wall */	1910	return maxdam; /* nothing more to do for wall */
1997	}	1911	}
1998		1912
1999	/* See if the creature has been killed */	1913	/* See if the creature has been killed */
2000	rtn_kill = kill_object (op, maxdam, hitter, type);	1914	rtn_kill = kill_object (op, maxdam, hitter, type);
2001	if (rtn_kill != -1)	1915	if (rtn_kill != -1)
2002	return rtn_kill;	1916	return rtn_kill;
2003
2004		1917
2005	/* Used to be ghosthit removal - we now use the ONE_HIT flag. Note	1918	/* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
2006	* that before if the player was immune to ghosthit, the monster	1919	* that before if the player was immune to ghosthit, the monster
2007	* remained - that is no longer the case.	1920	* remained - that is no longer the case.
2008	*/	1921	*/
2009	if (QUERY_FLAG (hitter, FLAG_ONE_HIT))	1922	if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
2010	{	1923	hitter->drop_and_destroy ();
2011	if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
2012	remove_friendly_object (hitter);
2013	remove_ob (hitter);
2014	free_object (hitter);
2015	}
2016	/* Lets handle creatures that are splitting now */	1924	/* Lets handle creatures that are splitting now */
2017	else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))	1925	else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
2018	{	1926	{
2019	int i;	1927	int i;
2020	int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);	1928	int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
2021	int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);	1929	int unaggressive = QUERY_FLAG (op, FLAG_UNAGGRESSIVE);
2022	object *owner = get_owner (op);	1930	object *owner = op->owner;
2023		1931
2024	if (!op->other_arch)	1932	if (!op->other_arch)
2025	{	1933	{
2026	LOG (llevError, "SPLITTING without other_arch error.\n");	1934	LOG (llevError, "SPLITTING without other_arch error.\n");
2027	return maxdam;	1935	return maxdam;
2028	}	1936	}
		1937
2029	remove_ob (op);	1938	op->remove ();
2030	for (i = 0; i < NROFNEWOBJS (op); i++)	1939
		1940	for (i = 0; i < op->stats.food; i++)
2031	{ /* This doesn't handle op->more yet */	1941	{ /* This doesn't handle op->more yet */
2032	object *tmp = arch_to_object (op->other_arch);	1942	object *tmp = arch_to_object (op->other_arch);
2033	int j;	1943	int j;
2034		1944
2035	tmp->stats.hp = op->stats.hp;	1945	tmp->stats.hp = op->stats.hp;
		1946
2036	if (friendly)	1947	if (friendly)
2037	{	1948	{
2038	SET_FLAG (tmp, FLAG_FRIENDLY);
2039	add_friendly_object (tmp);	1949	add_friendly_object (tmp);
2040	tmp->attack_movement = PETMOVE;	1950	tmp->attack_movement = PETMOVE;
		1951
2041	if (owner != NULL)	1952	if (owner)
2042	set_owner (tmp, owner);	1953	tmp->set_owner (owner);
2043	}	1954	}
		1955
2044	if (unaggressive)	1956	if (unaggressive)
2045	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);	1957	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
		1958
2046	j = find_first_free_spot (tmp, op->map, op->x, op->y);	1959	j = find_first_free_spot (tmp, op->map, op->x, op->y);
		1960
2047	if (j == -1) /* No spot to put this monster */	1961	if (j == -1) /* No spot to put this monster */
2048	free_object (tmp);	1962	tmp->destroy ();
2049	else	1963	else
2050	{	1964	{
2051	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];	1965	tmp->x = op->x + freearr_x[j], tmp->y = op->y + freearr_y[j];
2052	insert_ob_in_map (tmp, op->map, NULL, 0);	1966	insert_ob_in_map (tmp, op->map, NULL, 0);
2053	}	1967	}
2054	}	1968	}
2055	if (friendly)	1969
2056	remove_friendly_object (op);	1970	op->destroy ();
2057	free_object (op);
2058	}	1971	}
2059	else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)	1972	else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2060	{	1973	hitter->drop_and_destroy ();
2061	remove_ob (hitter);	1974
2062	free_object (hitter);
2063	}
2064	return maxdam;	1975	return maxdam;
2065	}	1976	}
2066
2067		1977
2068	void	1978	void
2069	poison_player (object *op, object *hitter, int dam)	1979	poison_player (object *op, object *hitter, int dam)
2070	{	1980	{
2071	archetype *at = find_archetype ("poisoning");	1981	archetype *at = archetype::find ("poisoning");
2072	object *tmp = present_arch_in_ob (at, op);	1982	object *tmp = present_arch_in_ob (at, op);
2073		1983
2074	if (tmp == NULL)	1984	if (tmp == NULL)
2075	{	1985	{
2076	if ((tmp = arch_to_object (at)) == NULL)	1986	if ((tmp = arch_to_object (at)) == NULL)
…		…
2089	if (QUERY_FLAG (hitter, FLAG_ALIVE))	1999	if (QUERY_FLAG (hitter, FLAG_ALIVE))
2090	tmp->stats.dam += hitter->level / 2;	2000	tmp->stats.dam += hitter->level / 2;
2091	else	2001	else
2092	tmp->stats.dam = dam;	2002	tmp->stats.dam = dam;
2093		2003
2094	copy_owner (tmp, hitter); /* so we get credit for poisoning kills */	2004	tmp->set_owner (hitter); /* so we get credit for poisoning kills */
2095	if (hitter->skill && hitter->skill != tmp->skill)	2005	if (hitter->skill && hitter->skill != tmp->skill)
2096	{	2006	{
2097	tmp->skill = hitter->skill;	2007	tmp->skill = hitter->skill;
2098	}	2008	}
2099		2009
…		…
2105	tmp->stats.Con = MAX (-(dam / 4 + 1), -10);	2015	tmp->stats.Con = MAX (-(dam / 4 + 1), -10);
2106	tmp->stats.Str = MAX (-(dam / 3 + 2), -10);	2016	tmp->stats.Str = MAX (-(dam / 3 + 2), -10);
2107	tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);	2017	tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2108	tmp->stats.Int = MAX (-dam / 7, -10);	2018	tmp->stats.Int = MAX (-dam / 7, -10);
2109	SET_FLAG (tmp, FLAG_APPLIED);	2019	SET_FLAG (tmp, FLAG_APPLIED);
2110	fix_player (op);	2020	op->update_stats ();
2111	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");	2021	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
		2022	op->play_sound (tmp->sound);
2112	}	2023	}
		2024
2113	if (hitter->type == PLAYER)	2025	if (hitter->type == PLAYER)
2114	new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);	2026	new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2115	else if (get_owner (hitter) != NULL && hitter->owner->type == PLAYER)	2027	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2116	new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);	2028	new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2117	}	2029	}
		2030
2118	tmp->speed_left = 0;	2031	tmp->speed_left = 0;
2119	}	2032	}
2120	else	2033	else
2121	tmp->stats.food++;	2034	tmp->stats.food++;
2122	}	2035	}
2123		2036
2124	void	2037	void
2125	slow_player (object *op, object *hitter, int dam)	2038	slow_player (object *op, object *hitter, int dam)
2126	{	2039	{
2127	archetype *at = find_archetype ("slowness");	2040	archetype *at = archetype::find ("slowness");
2128	object *tmp;	2041	object *tmp;
2129		2042
2130	if (at == NULL)	2043	if (at == NULL)
2131	{
2132	LOG (llevError, "Can't find slowness archetype.\n");	2044	LOG (llevError, "Can't find slowness archetype.\n");
2133	}	2045
2134	if ((tmp = present_arch_in_ob (at, op)) == NULL)	2046	if ((tmp = present_arch_in_ob (at, op)) == NULL)
2135	{	2047	{
2136	tmp = arch_to_object (at);	2048	tmp = arch_to_object (at);
2137	tmp = insert_ob_in_ob (tmp, op);	2049	tmp = insert_ob_in_ob (tmp, op);
2138	new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");	2050	new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2139	}	2051	}
2140	else	2052	else
2141	tmp->stats.food++;	2053	tmp->stats.food++;
		2054
2142	SET_FLAG (tmp, FLAG_APPLIED);	2055	SET_FLAG (tmp, FLAG_APPLIED);
2143	tmp->speed_left = 0;	2056	tmp->speed_left = 0;
2144	fix_player (op);	2057	op->update_stats ();
2145	}	2058	}
2146		2059
2147	void	2060	void
2148	confuse_player (object *op, object *hitter, int dam)	2061	confuse_player (object *op, object *hitter, int dam)
2149	{	2062	{
…		…
2163	tmp->speed = 0.05;	2076	tmp->speed = 0.05;
2164	tmp->subtype = FORCE_CONFUSION;	2077	tmp->subtype = FORCE_CONFUSION;
2165	tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);	2078	tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2166	tmp->name = "confusion";	2079	tmp->name = "confusion";
2167	maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);	2080	maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
		2081
2168	if (tmp->duration > maxduration)	2082	if (tmp->duration > maxduration)
2169	tmp->duration = maxduration;	2083	tmp->duration = maxduration;
2170		2084
2171	if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))	2085	if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2172	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");	2086	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
		2087
2173	SET_FLAG (op, FLAG_CONFUSED);	2088	SET_FLAG (op, FLAG_CONFUSED);
2174	}	2089	}
2175		2090
2176	void	2091	void
2177	blind_player (object *op, object *hitter, int dam)	2092	blind_player (object *op, object *hitter, int dam)
…		…
2193	*/	2108	*/
2194	tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;	2109	tmp->speed = tmp->speed * (100.0 - (float) op->resist[ATNR_BLIND]) / 100;
2195		2110
2196	tmp = insert_ob_in_ob (tmp, op);	2111	tmp = insert_ob_in_ob (tmp, op);
2197	change_abil (op, tmp); /* Mostly to display any messages */	2112	change_abil (op, tmp); /* Mostly to display any messages */
2198	fix_player (op); /* This takes care of some other stuff */	2113	op->update_stats (); /* This takes care of some other stuff */
2199		2114
2200	if (hitter->owner)	2115	if (hitter->owner)
2201	owner = get_owner (hitter);	2116	owner = hitter->owner;
2202	else	2117	else
2203	owner = hitter;	2118	owner = hitter;
2204		2119
2205	new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));	2120	new_draw_info_format (NDI_UNIQUE, 0, owner, "Your attack blinds %s!", query_name (op));
2206	}	2121	}
…		…
2243	op->speed_left = (float) -(FABS (op->speed) * max);	2158	op->speed_left = (float) -(FABS (op->speed) * max);
2244		2159
2245	/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */	2160	/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2246	}	2161	}
2247		2162
2248
2249	/* Attempts to kill 'op'. hitter is the attack object, dam is	2163	/* Attempts to kill 'op'. hitter is the attack object, dam is
2250	* the computed damaged.	2164	* the computed damaged.
2251	*/	2165	*/
2252	void	2166	void
2253	deathstrike_player (object *op, object *hitter, int *dam)	2167	deathstrike_player (object *op, object *hitter, int *dam)
…		…
2261	** field of the deathstriking object */	2175	** field of the deathstriking object */
2262		2176
2263	int atk_lev, def_lev, kill_lev;	2177	int atk_lev, def_lev, kill_lev;
2264		2178
2265	if (hitter->slaying)	2179	if (hitter->slaying)
2266	if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) || (op->race && strstr (hitter->slaying, op->race))))	2180	if (!((QUERY_FLAG (op, FLAG_UNDEAD) && hitter->slaying.contains (shstr_undead))
		2181	|| (op->race && hitter->slaying.contains (op->race))))
2267	return;	2182	return;
2268		2183
2269	def_lev = op->level;	2184	def_lev = op->level;
2270	if (def_lev < 1)	2185	if (def_lev < 1)
2271	{	2186	{
2272	LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);	2187	LOG (llevError, "BUG: arch %s with level < 1 (%s)\n", &op->arch->archname, op->debug_desc ());
2273	def_lev = 1;	2188	def_lev = 1;
2274	}	2189	}
		2190
2275	atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;	2191	atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2276	/* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",	2192	/* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2277	atk_lev, def_lev); */	2193	atk_lev, def_lev); */
2278		2194
2279	if (atk_lev >= def_lev)	2195	if (atk_lev >= def_lev)
…		…
2294	*/	2210	*/
2295	*dam *= kill_lev / def_lev;	2211	*dam *= kill_lev / def_lev;
2296	}	2212	}
2297	}	2213	}
2298	else	2214	else
2299	{
2300	*dam = 0; /* no harm done */	2215	*dam = 0; /* no harm done */
2301	}
2302	}	2216	}
2303		2217
2304	/* thrown_item_effect() - handles any special effects of thrown	2218	/* thrown_item_effect() - handles any special effects of thrown
2305	* items (like attacking living creatures--a potion thrown at a	2219	* items (like attacking living creatures--a potion thrown at a
2306	* monster).	2220	* monster).
…		…
2335	}	2249	}
2336	}	2250	}
2337	}	2251	}
2338		2252
2339	/* adj_attackroll() - adjustments to attacks by various conditions */	2253	/* adj_attackroll() - adjustments to attacks by various conditions */
2340
2341	int	2254	int
2342	adj_attackroll (object *hitter, object *target)	2255	adj_attackroll (object *hitter, object *target)
2343	{	2256	{
2344	object *attacker = hitter;	2257	object *attacker = hitter;
2345	int adjust = 0;	2258	int adjust = 0;
…		…
2352	}	2265	}
2353		2266
2354	/* aimed missiles use the owning object's sight */	2267	/* aimed missiles use the owning object's sight */
2355	if (is_aimed_missile (hitter))	2268	if (is_aimed_missile (hitter))
2356	{	2269	{
2357	if ((attacker = get_owner (hitter)) == NULL)	2270	if ((attacker = hitter->owner) == NULL)
2358	attacker = hitter;	2271	attacker = hitter;
2359	/* A player who saves but hasn't quit still could have objects	2272	/* A player who saves but hasn't quit still could have objects
2360	* owned by him - need to handle that case to avoid crashes.	2273	* owned by him - need to handle that case to avoid crashes.
2361	*/	2274	*/
2362	if (QUERY_FLAG (attacker, FLAG_REMOVED))	2275	if (QUERY_FLAG (attacker, FLAG_REMOVED))
…		…
2372	{	2285	{
2373	/* target is unseen */	2286	/* target is unseen */
2374	if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))	2287	if (target->invisible || QUERY_FLAG (attacker, FLAG_BLIND))
2375	adjust -= 10;	2288	adjust -= 10;
2376	/* dark map penalty for the hitter (lacks infravision if we got here). */	2289	/* dark map penalty for the hitter (lacks infravision if we got here). */
2377	else if (target->map && target->map->darkness > 0 && !stand_in_light (target))	2290	else if (!stand_in_light (target))
2378	adjust -= target->map->darkness;	2291	adjust -= target->map->darklevel ();
2379	}	2292	}
2380		2293
2381	if (QUERY_FLAG (attacker, FLAG_SCARED))	2294	if (QUERY_FLAG (attacker, FLAG_SCARED))
2382	adjust -= 3;	2295	adjust -= 3;
2383		2296
…		…
2410	#endif	2323	#endif
2411		2324
2412	return adjust;	2325	return adjust;
2413	}	2326	}
2414		2327
2415
2416	/* determine if the object is an 'aimed' missile */	2328	/* determine if the object is an 'aimed' missile */
2417	int	2329	int
2418	is_aimed_missile (object *op)	2330	is_aimed_missile (object *op)
2419	{	2331	{
2420		2332
2421	/* I broke what used to be one big if into a few nested	2333	/* I broke what used to be one big if into a few nested
2422	* ones so that figuring out the logic is at least possible.	2334	* ones so that figuring out the logic is at least possible.
2423	*/	2335	*/
2424	if (op && (op->move_type & MOVE_FLYING))	2336	if (op && (op->move_type & MOVE_FLYING))
2425	{
2426	if (op->type == ARROW || op->type == THROWN_OBJ)	2337	if (op->type == ARROW || op->type == THROWN_OBJ)
2427	return 1;	2338	return 1;
2428	else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))	2339	else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET || op->subtype == SP_EXPLOSION))
2429	return 1;	2340	return 1;
2430	}	2341
2431	return 0;	2342	return 0;
2432	}	2343	}

Diff Legend

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