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.26 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.87 by root, Mon Jul 14 18:36:43 2008 UTC

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

Diff Legend

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