[ViewVC] Diff of: cvs/deliantra/server/server/attack.C

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.36 by pippijn, Wed Jan 3 00:21:36 2007 UTC vs.
Revision 1.75 by root, Mon Aug 27 05:10:51 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT 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 <crossfire@schmorp.de>	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);
		66
70	if (op->env && op->env->type == PLAYER)	67	if (op->env && op->env->type == PLAYER)
71	{
72	esrv_send_item (op->env, op);	68	esrv_send_item (op->env, 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
…		…
85	materialtype_t *mt;	80	materialtype_t *mt;
86		81
87	if (op->materialname == NULL)	82	if (op->materialname == NULL)
88	{	83	{
89	for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next)	84	for (mt = materialt; mt != NULL && mt->next != NULL; 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
…		…
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	{
…		…
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	op = decrease_ob_nr (op, 1);
171		169
172	if (op)	170	if (op)
173	fix_stopped_item (op, m, originator);	171	fix_stopped_item (op, m, originator);
…		…
269	* op is going in direction 'dir'	267	* op is going in direction 'dir'
270	* type is the attacktype of the object.	268	* type is the attacktype of the object.
271	* full_hit is set if monster area does not matter.	269	* full_hit is set if monster area does not matter.
272	* returns 1 if it hits something, 0 otherwise.	270	* returns 1 if it hits something, 0 otherwise.
273	*/	271	*/
274
275	int	272	int
276	hit_map (object *op, int dir, int type, int full_hit)	273	hit_map (object *op, int dir, int type, int full_hit)
277	{	274	{
278	object tmp, next;
279	maptile *map;	275	maptile *map;
280	sint16 x, y;	276	sint16 x, y;
281	int retflag = 0; /* added this flag.. will return 1 if it hits a monster */	277	int retflag = 0; /* added this flag.. will return 1 if it hits a monster */
282		278
283	if (QUERY_FLAG (op, FLAG_FREED))	279	if (QUERY_FLAG (op, FLAG_FREED))
…		…
286	return 0;	282	return 0;
287	}	283	}
288		284
289	if (QUERY_FLAG (op, FLAG_REMOVED) \|\| op->env != NULL)	285	if (QUERY_FLAG (op, FLAG_REMOVED) \|\| op->env != NULL)
290	{	286	{
291	LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name);	287	LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name);
292	return 0;	288	return 0;
293	}	289	}
294		290
295	if (!op->map)	291	if (!op->map)
296	{	292	{
…		…
303		299
304	map = op->map;	300	map = op->map;
305	x = op->x + freearr_x[dir];	301	x = op->x + freearr_x[dir];
306	y = op->y + freearr_y[dir];	302	y = op->y + freearr_y[dir];
307		303
308	int mflags = get_map_flags (map, &map, x, y, &x, &y);	304	if (!xy_normalise (map, x, y))
		305	return 0;
309		306
310	// elmex: a safe map tile can't be hit!	307	// elmex: a safe map tile can't be hit!
311	// this should prevent most harmful effects on items and players there.	308	// this should prevent most harmful effects on items and players there.
312	if (mflags & (P_OUT_OF_MAP \| P_SAFE))	309	mapspace &ms = map->at (x, y);
		310
		311	if (ms.flags () & P_SAFE)
313	return 0;	312	return 0;
314		313
315	/* peterm: a few special cases for special attacktypes --counterspell	314	/* peterm: a few special cases for special attacktypes --counterspell
316	* must be out here because it strikes things which are not alive	315	* must be out here because it strikes things which are not alive
317	*/	316	*/
318		317	if (type & (AT_COUNTERSPELL \| AT_CHAOS))
		318	{
319	if (type & AT_COUNTERSPELL)	319	if (type & AT_COUNTERSPELL)
320	{	320	{
321	counterspell (op, dir); /* see spell_effect.c */	321	counterspell (op, dir); /* see spell_effect.c */
322		322
323	/* If the only attacktype is counterspell or magic, don't need	323	/* If the only attacktype is counterspell or magic, don't need
324	* to do any further processing.	324	* 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	*/	325	*/
354	/* LOG (llevDebug, "hit_map(): next object destroyed\n"); */	326	if (!(type & ~(AT_COUNTERSPELL \| AT_MAGIC)))
355	break;	327	return 0;
		328
		329	type &= ~AT_COUNTERSPELL;
		330	}
		331
		332	if (type & AT_CHAOS)
356	}	333	{
		334	shuffle_attack (op, 1); /* flag tells it to change the face */
		335	update_object (op, UP_OBJ_FACE);
		336	type &= ~AT_CHAOS;
		337	}
		338	}
357		339
		340	/* There may still be objects that were above 'next', but there is no
		341	* simple way to find out short of copying all object references and
		342	* tags into a temporary array before we start processing the first
		343	* object. That's why we just abort on destroy.
		344	*
		345	* This happens whenever attack spells (like fire) hit a pile
		346	* of objects. This is not a bug - nor an error.
		347	*/
		348	for (object *next = ms.bot; next && !next->destroyed (); )
		349	{
358	tmp = next;	350	object *tmp = next;
359	next = tmp->above;	351	next = tmp->above;
360
361	if (tmp->destroyed ())
362	{
363	LOG (llevError, "BUG: hit_map(): found freed object\n");
364	break;
365	}
366		352
367	/* Something could have happened to 'tmp' while 'tmp->below' was processed.	353	/* Something could have happened to 'tmp' while 'tmp->below' was processed.
368	* For example, 'tmp' was put in an icecube.	354	* For example, 'tmp' was put in an icecube.
369	* This is one of the few cases where on_same_map should not be used.	355	* This is one of the few cases where on_same_map should not be used.
370	*/	356	*/
…		…
373		359
374	if (QUERY_FLAG (tmp, FLAG_ALIVE))	360	if (QUERY_FLAG (tmp, FLAG_ALIVE))
375	{	361	{
376	hit_player (tmp, op->stats.dam, op, type, full_hit);	362	hit_player (tmp, op->stats.dam, op, type, full_hit);
377	retflag \|= 1;	363	retflag \|= 1;
		364
378	if (op->destroyed ())	365	if (op->destroyed ())
379	break;	366	break;
380	}	367	}
381
382	/* Here we are potentially destroying an object. If the object has	368	/* 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	369	* 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	370	* that weak walls have is_alive set, which prevent objects from
385	* passing over/through them. We don't care what type of movement	371	* 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	372	* the wall blocks - if it blocks any type of movement, can't be
387	* destroyed right now.	373	* destroyed right now.
388	*/	374	*/
389	else if ((tmp->material \|\| tmp->materialname) && op->stats.dam > 0 && !tmp->move_block)	375	else if (tmp->materialname && op->stats.dam > 0 && !tmp->move_block)
390	{	376	{
391	save_throw_object (tmp, type, op);	377	save_throw_object (tmp, type, op);
		378
392	if (op->destroyed ())	379	if (op->destroyed ())
393	break;	380	break;
394	}	381	}
395	}	382	}
396		383
…		…
626	if (hitter->owner != NULL)	613	if (hitter->owner != NULL)
627	sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);	614	sprintf (buf, "%s's %s%s you.", &hitter->owner->name, &hitter->name, buf2);
628	else	615	else
629	{	616	{
630	sprintf (buf, "%s%s you.", &hitter->name, buf2);	617	sprintf (buf, "%s%s you.", &hitter->name, buf2);
		618
631	if (dam != 0)	619	if (dam != 0)
632	{	620	{
633	if (dam < 10)	621	if (dam < 10)
634	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT1, 0, 0);	622	op->contr->play_sound (sound_find ("player_is_hit1"));
635	else if (dam < 20)	623	else if (dam < 20)
636	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT2, 0, 0);	624	op->contr->play_sound (sound_find ("player_is_hit2"));
637	else	625	else
638	play_sound_player_only (op->contr, SOUND_PLAYER_IS_HIT3, 0, 0);	626	op->contr->play_sound (sound_find ("player_is_hit3"));
639	}	627	}
640	}	628	}
		629
641	new_draw_info (NDI_BLACK, 0, op, buf);	630	new_draw_info (NDI_BLACK, 0, op, buf);
642	} /* end of player hitting player */	631	} /* end of player hitting player */
643		632
644	if (hitter->type == PLAYER)	633	if (hitter->type == PLAYER)
645	{	634	{
646	sprintf (buf, "You %s.", buf1);	635	sprintf (buf, "You %s.", buf1);
		636
647	if (dam != 0)	637	if (dam != 0)
648	{	638	{
649	if (dam < 10)	639	if (dam < 10)
650	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS1, 0, 0);	640	op->play_sound (sound_find ("player_hits1"));
651	else if (dam < 20)	641	else if (dam < 20)
652	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS2, 0, 0);	642	op->play_sound (sound_find ("player_hits2"));
653	else	643	else
654	play_sound_player_only (hitter->contr, SOUND_PLAYER_HITS3, 0, 0);	644	op->play_sound (sound_find ("player_hits3"));
655	}	645	}
		646
656	new_draw_info (NDI_BLACK, 0, hitter, buf);	647	new_draw_info (NDI_BLACK, 0, hitter, buf);
657	}	648	}
658	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)	649	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
659	{	650	{
660	/* look for stacked spells and start reducing the message chances */	651	/* look for stacked spells and start reducing the message chances */
…		…
662	{	653	{
663	i = 4;	654	i = 4;
664	map = hitter->map;	655	map = hitter->map;
665	if (out_of_map (map, hitter->x, hitter->y))	656	if (out_of_map (map, hitter->x, hitter->y))
666	return;	657	return;
		658
667	next = GET_MAP_OB (map, hitter->x, hitter->y);	659	next = GET_MAP_OB (map, hitter->x, hitter->y);
668	if (next)	660	if (next)
669	while (next)	661	while (next)
670	{	662	{
671	if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION \|\| next->subtype == SP_BULLET \|\| next->subtype == SP_CONE))	663	if (next->type == SPELL_EFFECT && (next->subtype == SP_EXPLOSION \|\| next->subtype == SP_BULLET \|\| next->subtype == SP_CONE))
672	i *= 3;	664	i *= 3;
		665
673	tmp = next;	666	tmp = next;
674	next = tmp->above;	667	next = tmp->above;
675	}	668	}
		669
676	if (i < 0)	670	if (i < 0)
677	return;	671	return;
		672
678	if (rndm (0, i) != 0)	673	if (rndm (0, i) != 0)
679	return;	674	return;
680	}	675	}
681	else if (rndm (0, 5) != 0)	676	else if (rndm (0, 5) != 0)
682	return;	677	return;
		678
683	sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);	679	sprintf (buf, "Your %s%s %s.", &hitter->name, buf2, &op->name);
684	play_sound_map (op->map, op->x, op->y, SOUND_PLAYER_HITS4);	680	op->play_sound (sound_find ("player_hits4"));
685	new_draw_info (NDI_BLACK, 0, hitter->owner, buf);	681	new_draw_info (NDI_BLACK, 0, hitter->owner, buf);
686	}	682	}
687	}	683	}
688		684
689		685
…		…
705	return 0;	701	return 0;
706	}	702	}
707	if (QUERY_FLAG (*target, FLAG_REMOVED)	703	if (QUERY_FLAG (*target, FLAG_REMOVED)
708	\|\| QUERY_FLAG (hitter, FLAG_REMOVED) \|\| (hitter)->map == NULL \|\| !on_same_map ((hitter), (target)))	704	\|\| QUERY_FLAG (hitter, FLAG_REMOVED) \|\| (hitter)->map == NULL \|\| !on_same_map ((hitter), (target)))
709	{	705	{
710	LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(hitter)->arch->name, &(hitter)->name);	706	LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(hitter)->arch->archname, &(hitter)->name);
711	return 1;	707	return 1;
712	}	708	}
713	*simple_attack = 0;	709	*simple_attack = 0;
714	return 0;	710	return 0;
715	}	711	}
…		…
753		749
754	/*	750	/*
755	* A little check to make it more difficult to dance forward and back	751	* A little check to make it more difficult to dance forward and back
756	* to avoid ever being hit by monsters.	752	* to avoid ever being hit by monsters.
757	*/	753	*/
758	if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > -(FABS (op->speed)) * 0.3)	754	if (!simple_attack && QUERY_FLAG (op, FLAG_MONSTER) && op->speed_left > abs (op->speed) * -0.3f)
759	{	755	{
760	/* Decrease speed BEFORE calling process_object. Otherwise, an	756	/* Decrease speed BEFORE calling process_object. Otherwise, an
761	* infinite loop occurs, with process_object calling move_monster,	757	* infinite loop occurs, with process_object calling move_monster,
762	* which then gets here again. By decreasing the speed before	758	* which then gets here again. By decreasing the speed before
763	* we call process_object, the 'if' statement above will fail.	759	* we call process_object, the 'if' statement above will fail.
764	*/	760	*/
765	op->speed_left--;	761	--op->speed_left;
766	process_object (op);	762	process_object (op);
767		763
768	if (op->destroyed () \|\| hitter->destroyed () \|\| abort_attack (op, hitter, simple_attack))	764	if (op->destroyed () \|\| hitter->destroyed () \|\| abort_attack (op, hitter, simple_attack))
769	goto error;	765	goto error;
770	}	766	}
…		…
780	/* See if we hit the creature */	776	/* See if we hit the creature */
781	if (roll == 20 \|\| op->stats.ac >= base_wc - roll)	777	if (roll == 20 \|\| op->stats.ac >= base_wc - roll)
782	{	778	{
783	int hitdam = base_dam;	779	int hitdam = base_dam;
784		780
785	if (settings.casting_time == TRUE)
786	{
787	if ((hitter->type == PLAYER) && (hitter->casting_time > -1))
788	{
789	hitter->casting_time = -1;
790	new_draw_info (NDI_UNIQUE, 0, hitter, "You attacked and lost " "your spell!");
791	}
792	if ((op->casting_time > -1) && (hitdam > 0))
793	{
794	op->casting_time = -1;
795	if (op->type == PLAYER)
796	{
797	new_draw_info (NDI_UNIQUE, 0, op, "You were hit and lost " "your spell!");
798	new_draw_info_format (NDI_ALL \| NDI_UNIQUE, 5, NULL, "%s was hit by %s and lost a spell.", &op_name, &hitter->name);
799	}
800	}
801	}
802	if (!simple_attack)	781	if (!simple_attack)
803	{	782	{
804	/* If you hit something, the victim should always wake up.	783	/* If you hit something, the victim should always wake up.
805	* Before, invisible hitters could avoid doing this.	784	* Before, invisible hitters could avoid doing this.
806	* -b.t. */	785	* -b.t. */
…		…
814		793
815	/* if you were hidden and hit by a creature, you are discovered */	794	/* if you were hidden and hit by a creature, you are discovered */
816	if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))	795	if (op->hide && QUERY_FLAG (hitter, FLAG_ALIVE))
817	{	796	{
818	make_visible (op);	797	make_visible (op);
		798
819	if (op->type == PLAYER)	799	if (op->type == PLAYER)
820	new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");	800	new_draw_info (NDI_UNIQUE, 0, op, "You were hit by a wild attack. " "You are no longer hidden!");
821	}	801	}
822		802
823	/* thrown items (hitter) will have various effects	803	/* thrown items (hitter) will have various effects
…		…
877	}	857	}
878		858
879	int	859	int
880	attack_ob (object op, object hitter)	860	attack_ob (object op, object hitter)
881	{	861	{
882
883	if (hitter->head)
884	hitter = hitter->head;	862	hitter = hitter->head_ ();
		863
885	return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);	864	return attack_ob_simple (op, hitter, hitter->stats.dam, hitter->stats.wc);
886	}	865	}
887		866
888	/* op is the arrow, tmp is what is stopping the arrow.	867	/* op is the arrow, tmp is what is stopping the arrow.
889	*	868	*
…		…
898	* debate - 5000 is 5 kg, so arrows, knives, and other light weapons	877	* debate - 5000 is 5 kg, so arrows, knives, and other light weapons
899	* stick around.	878	* stick around.
900	*/	879	*/
901	if (op->weight <= 5000 && tmp->stats.hp >= 0)	880	if (op->weight <= 5000 && tmp->stats.hp >= 0)
902	{	881	{
903	if (tmp->head != NULL)
904	tmp = tmp->head;	882	tmp = tmp->head_ ();
905		883
906	op->remove ();	884	op->remove ();
907	op = insert_ob_in_ob (op, tmp);	885	op = insert_ob_in_ob (op, tmp);
908		886
909	if (tmp->type == PLAYER)	887	if (tmp->type == PLAYER)
…		…
1016	insert_ob_in_ob (hitter, container);	994	insert_ob_in_ob (hitter, container);
1017	}	995	}
1018		996
1019	return op;	997	return op;
1020	}	998	}
1021
1022		999
1023	void	1000	void
1024	tear_down_wall (object *op)	1001	tear_down_wall (object *op)
1025	{	1002	{
1026	int perc = 0;	1003	int perc = 0;
…		…
1075	SET_FLAG (target, FLAG_SCARED);	1052	SET_FLAG (target, FLAG_SCARED);
1076	if (!target->enemy)	1053	if (!target->enemy)
1077	target->enemy = owner;	1054	target->enemy = owner;
1078	}	1055	}
1079		1056
1080
1081	/* This returns the amount of damage hitter does to op with the	1057	/* This returns the amount of damage hitter does to op with the
1082	* appropriate attacktype. Only 1 attacktype should be set at a time.	1058	* appropriate attacktype. Only 1 attacktype should be set at a time.
1083	* This doesn't damage the player, but returns how much it should	1059	* This doesn't damage the player, but returns how much it should
1084	* take. However, it will do other effects (paralyzation, slow, etc.)	1060	* take. However, it will do other effects (paralyzation, slow, etc.)
1085	* Note - changed for PR code - we now pass the attack number and not	1061	* Note - changed for PR code - we now pass the attack number and not
1086	* the attacktype. Makes it easier for the PR code. */	1062	* the attacktype. Makes it easier for the PR code. */
1087
1088	int	1063	int
1089	hit_player_attacktype (object op, object hitter, int dam, uint32 attacknum, int magic)	1064	hit_player_attacktype (object op, object hitter, int dam, uint32 attacknum, int magic)
1090	{	1065	{
1091
1092	int doesnt_slay = 1;	1066	int doesnt_slay = 1;
1093		1067
1094	/* Catch anyone that may be trying to send us a bitmask instead of the number */	1068	/* Catch anyone that may be trying to send us a bitmask instead of the number */
1095	if (attacknum >= NROFATTACKS)	1069	if (attacknum >= NROFATTACKS)
1096	{	1070	{
…		…
1098	return 0;	1072	return 0;
1099	}	1073	}
1100		1074
1101	if (dam < 0)	1075	if (dam < 0)
1102	{	1076	{
1103	LOG (llevError, "hit_player_attacktype called with negative damage: %d\n", dam);	1077	LOG (llevError, "hit_player_attacktype called with negative damage %d (hitter %s, target %s)\n",
		1078	dam, hitter->debug_desc (), op->debug_desc ());
1104	return 0;	1079	return 0;
1105	}	1080	}
1106		1081
1107	/* AT_INTERNAL is supposed to do exactly dam. Put a case here so	1082	/* AT_INTERNAL is supposed to do exactly dam. Put a case here so
1108	* people can't mess with that or it otherwise get confused. */	1083	* people can't mess with that or it otherwise get confused. */
1109	if (attacknum == ATNR_INTERNAL)	1084	if (attacknum == ATNR_INTERNAL)
1110	return dam;	1085	return dam;
1111		1086
1112	if (hitter->slaying)	1087	if (hitter->slaying)
1113	{	1088	{
1114	if (((op->race != NULL) && strstr (hitter->slaying, op->race)) \|\|	1089	if ((op->race && strstr (hitter->slaying, op->race))
1115	(op->arch && (op->arch->name != NULL) && strstr (op->arch->name, hitter->slaying)))	1090	\|\| (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying)))
1116	{	1091	{
1117	doesnt_slay = 0;	1092	doesnt_slay = 0;
1118	dam *= 3;	1093	dam *= 3;
1119	}	1094	}
1120	}	1095	}
…		…
1134	/* Special hack. By default, if immune to something, you	1109	/* Special hack. By default, if immune to something, you
1135	* shouldn't need to worry. However, acid is an exception, since	1110	* shouldn't need to worry. However, acid is an exception, since
1136	* it can still damage your items. Only include attacktypes if	1111	* it can still damage your items. Only include attacktypes if
1137	* special processing is needed */	1112	* special processing is needed */
1138		1113
1139	if ((op->resist[attacknum] >= 100) && doesnt_slay && (attacknum != ATNR_ACID))	1114	if (op->resist[attacknum] >= 100
		1115	&& doesnt_slay
		1116	&& attacknum != ATNR_ACID)
1140	return 0;	1117	return 0;
1141		1118
1142	/* Keep this in order - makes things easier to find */	1119	/* Keep this in order - makes things easier to find */
1143		1120
1144	switch (attacknum)	1121	switch (attacknum)
1145	{	1122	{
1146	case ATNR_PHYSICAL:	1123	case ATNR_PHYSICAL:
1147	/* here also check for diseases */	1124	/* here also check for diseases */
1148	check_physically_infect (op, hitter);	1125	check_physically_infect (op, hitter);
1149	break;	1126	break;
1150		1127
1151	/* Don't need to do anything for:	1128	/* Don't need to do anything for:
1152	magic,	1129	magic,
1153	fire,	1130	fire,
1154	electricity,	1131	electricity,
1155	cold */	1132	cold */
1156		1133
1157	case ATNR_CONFUSION:	1134	case ATNR_CONFUSION:
1158	case ATNR_POISON:	1135	case ATNR_POISON:
1159	case ATNR_SLOW:	1136	case ATNR_SLOW:
1160	case ATNR_PARALYZE:	1137	case ATNR_PARALYZE:
1161	case ATNR_FEAR:	1138	case ATNR_FEAR:
1162	case ATNR_CANCELLATION:	1139	case ATNR_CANCELLATION:
1163	case ATNR_DEPLETE:	1140	case ATNR_DEPLETE:
1164	case ATNR_BLIND:	1141	case ATNR_BLIND:
1165	{	1142	{
1166	/* chance for inflicting a special attack depends on the	1143	/* chance for inflicting a special attack depends on the
1167	* difference between attacker's and defender's level	1144	* difference between attacker's and defender's level
1168	*/	1145	*/
1169	int level_diff = MIN (110, MAX (0, op->level - hitter->level));	1146	int level_diff = MIN (110, MAX (0, op->level - hitter->level));
1170		1147
1171	/* First, only creatures/players with speed can be affected.	1148	/* First, only creatures/players with speed can be affected.
1172	* Second, just getting hit doesn't mean it always affects	1149	* Second, just getting hit doesn't mean it always affects
1173	* you. Third, you still get a saving through against the	1150	* you. Third, you still get a saving through against the
1174	* effect.	1151	* effect.
1175	*/	1152	*/
1176	if (op->speed &&	1153	if (op->speed &&
1177	(QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER) &&	1154	(QUERY_FLAG (op, FLAG_MONSTER) \|\| op->type == PLAYER) &&
1178	!(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))	1155	!(rndm (0, (attacknum == ATNR_SLOW ? 6 : 3) - 1)) && !did_make_save (op, level_diff, op->resist[attacknum] / 10))
1179	{	1156	{
1180		1157
1181	/* Player has been hit by something */	1158	/* Player has been hit by something */
1182	if (attacknum == ATNR_CONFUSION)	1159	if (attacknum == ATNR_CONFUSION)
1183	confuse_player (op, hitter, dam);	1160	confuse_player (op, hitter, dam);
1184	else if (attacknum == ATNR_POISON)	1161	else if (attacknum == ATNR_POISON)
1185	poison_player (op, hitter, dam);	1162	poison_player (op, hitter, dam);
1186	else if (attacknum == ATNR_SLOW)	1163	else if (attacknum == ATNR_SLOW)
1187	slow_player (op, hitter, dam);	1164	slow_player (op, hitter, dam);
1188	else if (attacknum == ATNR_PARALYZE)	1165	else if (attacknum == ATNR_PARALYZE)
1189	paralyze_player (op, hitter, dam);	1166	paralyze_player (op, hitter, dam);
1190	else if (attacknum == ATNR_FEAR)	1167	else if (attacknum == ATNR_FEAR)
1191	scare_creature (op, hitter);	1168	scare_creature (op, hitter);
1192	else if (attacknum == ATNR_CANCELLATION)	1169	else if (attacknum == ATNR_CANCELLATION)
1193	cancellation (op);	1170	cancellation (op);
1194	else if (attacknum == ATNR_DEPLETE)	1171	else if (attacknum == ATNR_DEPLETE)
1195	op->drain_stat ();	1172	op->drain_stat ();
1196	else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))	1173	else if (attacknum == ATNR_BLIND && !QUERY_FLAG (op, FLAG_UNDEAD) && !QUERY_FLAG (op, FLAG_GENERATOR))
1197	blind_player (op, hitter, dam);	1174	blind_player (op, hitter, dam);
1198	}	1175	}
		1176
1199	dam = 0; /* These are all effects and don't do real damage */	1177	dam = 0; /* These are all effects and don't do real damage */
1200	}	1178	}
1201	break;	1179	break;
		1180
1202	case ATNR_ACID:	1181	case ATNR_ACID:
1203	{	1182	{
1204	int flag = 0;	1183	int flag = 0;
1205		1184
1206	/* Items only get corroded if you're not on a battleground and	1185	/* Items only get corroded if you're not on a battleground and
1207	* if your acid resistance is below 50%. */	1186	* if your acid resistance is below 50%. */
1208	if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))	1187	if (!op_on_battleground (op, NULL, NULL) && (op->resist[ATNR_ACID] < 50))
1209	{	1188	{
1210	object *tmp;
1211
1212	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1189	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1213	{	1190	{
1214	if (tmp->invisible)	1191	if (tmp->invisible)
1215	continue;	1192	continue;
1216	if (!QUERY_FLAG (tmp, FLAG_APPLIED) \|\| (tmp->resist[ATNR_ACID] >= 10))	1193	if (!QUERY_FLAG (tmp, FLAG_APPLIED) \|\| (tmp->resist[ATNR_ACID] >= 10))
1217	/* >= 10% acid res. on itmes will protect these */	1194	/* >= 10% acid res. on items will protect these */
1218	continue;	1195	continue;
1219	if (!(tmp->material & M_IRON))	1196	if (!(tmp->materials & M_IRON))
1220	continue;	1197	continue;
1221	if (tmp->magic < -4) /* Let's stop at -5 */	1198	if (tmp->magic < -4) /* Let's stop at -5 */
1222	continue;	1199	continue;
1223	if (tmp->type == RING \|\|	1200	if (tmp->type == RING
1224	/* removed boots and gloves from exclusion list in	1201	/* removed boots and gloves from exclusion list in PR */
1225	PR */	1202	\|\| tmp->type == GIRDLE
1226	tmp->type == GIRDLE \|\| tmp->type == AMULET \|\| tmp->type == WAND \|\| tmp->type == ROD \|\| tmp->type == HORN)	1203	\|\| tmp->type == AMULET
		1204	\|\| tmp->type == WAND
		1205	\|\| tmp->type == ROD
		1206	\|\| tmp->type == HORN)
1227	continue; /* To avoid some strange effects */	1207	continue; /* To avoid some strange effects */
1228		1208
1229	/* High damage acid has better chance of corroding	1209	/* High damage acid has better chance of corroding
1230	objects */	1210	objects */
1231	if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)	1211	if (rndm (0, dam + 4) > random_roll (0, 39, op, PREFER_HIGH) + 2 * tmp->magic)
1232	{	1212	{
1233	if (op->type == PLAYER)	1213	if (op->type == PLAYER)
1234	/* Make this more visible */	1214	/* Make this more visible */
1235	new_draw_info_format (NDI_UNIQUE \| NDI_RED, 0, op,	1215	new_draw_info_format (NDI_UNIQUE \| NDI_RED, 0, op,
1236	"The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));	1216	"The %s's acid corrodes your %s!", query_name (hitter), query_name (tmp));
1237	flag = 1;	1217	flag = 1;
1238	tmp->magic--;	1218	tmp->magic--;
1239	if (op->type == PLAYER)	1219	if (op->type == PLAYER)
1240	esrv_send_item (op, tmp);	1220	esrv_send_item (op, tmp);
1241	}	1221	}
1242	}	1222	}
		1223
1243	if (flag)	1224	if (flag)
1244	op->update_stats (); /* Something was corroded */	1225	op->update_stats (); /* Something was corroded */
1245	}	1226	}
1246	}	1227	}
1247	break;	1228	break;
		1229
1248	case ATNR_DRAIN:	1230	case ATNR_DRAIN:
1249	{	1231	{
1250	/* rate is the proportion of exp drained. High rate means	1232	/* rate is the proportion of exp drained. High rate means
1251	* not much is drained, low rate means a lot is drained.	1233	* not much is drained, low rate means a lot is drained.
1252	*/	1234	*/
1253	int rate;	1235	int rate;
1254		1236
1255	if (op->resist[ATNR_DRAIN] >= 0)	1237	if (op->resist[ATNR_DRAIN] >= 0)
1256	rate = 400 + op->resist[ATNR_DRAIN] * 3;	1238	rate = 400 + op->resist[ATNR_DRAIN] * 3;
1257	else	1239	else
1258	rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);	1240	rate = 400 * 100 / (100 - op->resist[ATNR_DRAIN]);
1259		1241
1260	if (op->stats.exp <= rate)	1242	if (op->stats.exp <= rate)
1261	{	1243	{
1262	if (op->type == GOLEM)	1244	if (op->type == GOLEM)
1263	dam = 999; /* Its force is "sucked" away. 8) */	1245	dam = 999; /* Its force is "sucked" away. 8) */
1264	else	1246	else
1265	/* If we can't drain, lets try to do physical damage */	1247	/* If we can't drain, lets try to do physical damage */
1266	dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);	1248	dam = hit_player_attacktype (op, hitter, dam, ATNR_PHYSICAL, magic);
1267	}	1249	}
1268	else	1250	else
1269	{	1251	{
1270	/* Randomly give the hitter some hp */	1252	/* Randomly give the hitter some hp */
1271	if (hitter->stats.hp < hitter->stats.maxhp &&	1253	if (hitter->stats.hp < hitter->stats.maxhp &&
1272	(op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)	1254	(op->level > hitter->level) && random_roll (0, (op->level - hitter->level + 2), hitter, PREFER_HIGH) > 3)
1273	hitter->stats.hp++;	1255	hitter->stats.hp++;
1274		1256
1275	/* Can't do drains on battleground spaces.	1257	/* Can't do drains on battleground spaces.
1276	* Move the wiz check up here - before, the hitter wouldn't gain exp	1258	* Move the wiz check up here - before, the hitter wouldn't gain exp
1277	* exp, but the wiz would still lose exp! If drainee is a wiz,	1259	* exp, but the wiz would still lose exp! If drainee is a wiz,
1278	* nothing happens.	1260	* nothing happens.
1279	* Try to credit the owner. We try to display player -> player drain	1261	* Try to credit the owner. We try to display player -> player drain
1280	* attacks, hence all the != PLAYER checks.	1262	* attacks, hence all the != PLAYER checks.
1281	*/	1263	*/
1282	if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WAS_WIZ))	1264	if (!op_on_battleground (hitter, NULL, NULL) && !QUERY_FLAG (op, FLAG_WIZ))
1283	{	1265	{
1284	object *owner = hitter->owner;	1266	object *owner = hitter->owner;
1285		1267
1286	if (owner && owner != hitter)	1268	if (owner && owner != hitter)
1287	{	1269	{
1288	if (op->type != PLAYER \|\| owner->type != PLAYER)	1270	if (op->type != PLAYER \|\| owner->type != PLAYER)
1289	change_exp (owner, op->stats.exp / (rate * 2),	1271	change_exp (owner, op->stats.exp / (rate * 2),
1290	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);	1272	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, SK_EXP_TOTAL);
1291	}	1273	}
1292	else if (op->type != PLAYER \|\| hitter->type != PLAYER)	1274	else if (op->type != PLAYER \|\| hitter->type != PLAYER)
1293	{
1294	change_exp (hitter, op->stats.exp / (rate * 2),	1275	change_exp (hitter, op->stats.exp / (rate * 2),
1295	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);	1276	hitter->chosen_skill ? hitter->chosen_skill->skill : (const char *) 0, 0);
1296	}	1277
1297	change_exp (op, -op->stats.exp / rate, NULL, 0);	1278	change_exp (op, -op->stats.exp / rate, NULL, 0);
1298	}	1279	}
		1280
1299	dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure	1281	dam = 1; /* Drain is an effect. Still return 1 - otherwise, if you have pure
1300	* drain attack, you won't know that you are actually sucking out EXP,	1282	* drain attack, you won't know that you are actually sucking out EXP,
1301	* as the messages will say you missed	1283	* as the messages will say you missed
1302	*/	1284	*/
1303	}	1285	}
1304	}	1286	}
1305	break;	1287	break;
		1288
1306	case ATNR_TURN_UNDEAD:	1289	case ATNR_TURN_UNDEAD:
1307	{	1290	{
1308	if (QUERY_FLAG (op, FLAG_UNDEAD))	1291	if (QUERY_FLAG (op, FLAG_UNDEAD))
1309	{	1292	{
1310	object owner = hitter->owner ? (object )hitter->owner : hitter;	1293	object owner = hitter->owner ? (object )hitter->owner : hitter;
1311	object *god = find_god (determine_god (owner));	1294	object *god = find_god (determine_god (owner));
1312	int div = 1;	1295	int div = 1;
1313		1296
1314	/* if undead are not an enemy of your god, you turn them	1297	/* if undead are not an enemy of your god, you turn them
1315	* at half strength */	1298	* at half strength */
1316	if (!god \|\| !god->slaying \|\| strstr (god->slaying, undead_name) == NULL)	1299	if (!god \|\| !god->slaying \|\| strstr (god->slaying, shstr_undead) == NULL)
1317	div = 2;	1300	div = 2;
		1301
1318	/* Give a bonus if you resist turn undead */	1302	/* Give a bonus if you resist turn undead */
1319	if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))	1303	if (op->level * div < (turn_bonus[owner->stats.Wis] + owner->level + (op->resist[ATNR_TURN_UNDEAD] / 100)))
1320	scare_creature (op, owner);	1304	scare_creature (op, owner);
1321	}	1305	}
1322	else	1306	else
1323	dam = 0; /* don't damage non undead - should we damage	1307	dam = 0; /* don't damage non undead - should we damage
1324	undead? */	1308	undead? */
1325	}	1309	}
1326	break;	1310	break;
		1311
1327	case ATNR_DEATH:	1312	case ATNR_DEATH:
1328	deathstrike_player (op, hitter, &dam);	1313	deathstrike_player (op, hitter, &dam);
1329	break;	1314	break;
		1315
1330	case ATNR_CHAOS:	1316	case ATNR_CHAOS:
1331	LOG (llevError, "%s was hit by %s with non-specific chaos.\n", query_name (op), query_name (hitter));	1317	LOG (llevError, "%s was hit by %s with non-specific chaos.\n", op->debug_desc (), hitter->debug_desc ());
1332	dam = 0;	1318	dam = 0;
1333	break;	1319	break;
		1320
1334	case ATNR_COUNTERSPELL:	1321	case ATNR_COUNTERSPELL:
1335	LOG (llevError, "%s was hit by %s with counterspell attack.\n", query_name (op), query_name (hitter));	1322	LOG (llevError, "%s was hit by %s with counterspell attack.\n", op->debug_desc (), hitter->debug_desc ());
1336	dam = 0;	1323	dam = 0;
1337	/* This should never happen. Counterspell is handled	1324	/* This should never happen. Counterspell is handled
1338	* seperately and filtered out. If this does happen,	1325	* seperately and filtered out. If this does happen,
1339	* Counterspell has no effect on anything but spells, so it	1326	* Counterspell has no effect on anything but spells, so it
1340	* does no damage. */	1327	* does no damage. */
1341	break;	1328	break;
		1329
1342	case ATNR_HOLYWORD:	1330	case ATNR_HOLYWORD:
1343	{	1331	{
1344	/* This has already been handled by hit_player,	1332	/* This has already been handled by hit_player,
1345	* no need to check twice -- DAMN */	1333	* no need to check twice -- DAMN */
1346	object owner = hitter->owner ? (object )hitter->owner : hitter;	1334	object owner = hitter->owner ? (object )hitter->owner : hitter;
1347		1335
1348	/* As with turn undead above, give a bonus on the saving throw */	1336	/* As with turn undead above, give a bonus on the saving throw */
1349	if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])	1337	if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1350	scare_creature (op, owner);	1338	scare_creature (op, owner);
1351	}	1339	}
1352	break;	1340	break;
		1341
1353	case ATNR_LIFE_STEALING:	1342	case ATNR_LIFE_STEALING:
1354	{	1343	{
1355	int new_hp;	1344	int new_hp;
1356		1345
1357	/* this is replacement to drain for players, instead of taking	1346	/* this is replacement to drain for players, instead of taking
1358	* exp it takes hp. It is geared for players, probably not	1347	* exp it takes hp. It is geared for players, probably not
1359	* much use giving it to monsters	1348	* much use giving it to monsters
1360	*	1349	*
1361	* life stealing doesn't do a lot of damage, but it gives the	1350	* life stealing doesn't do a lot of damage, but it gives the
1362	* damage it does do to the player. Given that,	1351	* damage it does do to the player. Given that,
1363	* it only does 1/10'th normal damage (hence the divide by	1352	* it only does 1/10'th normal damage (hence the divide by
1364	* 1000).	1353	* 1000).
1365	*/	1354	*/
1366	/* You can't steal life from something undead */	1355	/* You can't steal life from something undead */
1367	if ((op->type == GOLEM) \|\| (QUERY_FLAG (op, FLAG_UNDEAD)))	1356	if ((op->type == GOLEM) \|\| (QUERY_FLAG (op, FLAG_UNDEAD)))
1368	return 0;	1357	return 0;
		1358
1369	/* If drain protection is higher than life stealing, use that */	1359	/* If drain protection is higher than life stealing, use that */
1370	if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])	1360	if (op->resist[ATNR_DRAIN] >= op->resist[ATNR_LIFE_STEALING])
1371	dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;	1361	dam = (dam * (100 - op->resist[ATNR_DRAIN])) / 3000;
1372	else	1362	else
1373	dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;	1363	dam = (dam * (100 - op->resist[ATNR_LIFE_STEALING])) / 3000;
		1364
1374	/* You die at -1 hp, not zero. */	1365	/* You die at -1 hp, not zero. */
1375	if (dam > (op->stats.hp + 1))	1366	if (dam > (op->stats.hp + 1))
1376	dam = op->stats.hp + 1;	1367	dam = op->stats.hp + 1;
		1368
1377	new_hp = hitter->stats.hp + dam;	1369	new_hp = hitter->stats.hp + dam;
1378	if (new_hp > hitter->stats.maxhp)	1370	if (new_hp > hitter->stats.maxhp)
1379	new_hp = hitter->stats.maxhp;	1371	new_hp = hitter->stats.maxhp;
		1372
1380	if (new_hp > hitter->stats.hp)	1373	if (new_hp > hitter->stats.hp)
1381	hitter->stats.hp = new_hp;	1374	hitter->stats.hp = new_hp;
1382	}	1375	}
1383	}	1376	}
		1377
1384	return dam;	1378	return dam;
1385	}	1379	}
1386
1387		1380
1388	/* GROS: This code comes from hit_player. It has been made external to	1381	/* GROS: This code comes from hit_player. It has been made external to
1389	* allow script procedures to "kill" objects in a combat-like fashion.	1382	* allow script procedures to "kill" objects in a combat-like fashion.
1390	* It was initially used by (kill-object) developed for the Collector's	1383	* It was initially used by (kill-object) developed for the Collector's
1391	* Sword. Note that nothing has been changed from the original version	1384	* Sword. Note that nothing has been changed from the original version
…		…
1406	char buf[MAX_BUF];	1399	char buf[MAX_BUF];
1407	const char *skill;	1400	const char *skill;
1408	int maxdam = 0;	1401	int maxdam = 0;
1409	int battleg = 0; /* true if op standing on battleground */	1402	int battleg = 0; /* true if op standing on battleground */
1410	int pk = 0; /* true if op and what controls hitter are both players */	1403	int pk = 0; /* true if op and what controls hitter are both players */
1411	object *owner = NULL;	1404	object *owner = 0;
1412	object *skop = NULL;	1405	object *skop = 0;
1413		1406
1414	if (op->stats.hp >= 0)	1407	if (op->stats.hp >= 0)
1415	return -1;	1408	return -1;
1416		1409
1417	if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))	1410	if (INVOKE_OBJECT (KILL, op, ARG_OBJECT (hitter)))
…		…
1426	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))	1419	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW))
1427	update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */	1420	update_all_los (op->map, op->x, op->y); /* makes sure los will be recalculated */
1428		1421
1429	if (op->type == DOOR)	1422	if (op->type == DOOR)
1430	{	1423	{
1431	op->set_speed (0.1);	1424	op->set_speed (0.1f);
1432	op->speed_left = -0.05;	1425	op->speed_left = -0.05f;
1433	return maxdam;	1426	return maxdam;
1434	}	1427	}
1435		1428
1436	if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)	1429	if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1437	{	1430	{
1438	remove_friendly_object (op);
1439
1440	if (op->owner && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1441	op->owner->contr->ranges[range_golem] = 0;
1442
1443	op->destroy ();	1431	op->destroy ();
1444	return maxdam;	1432	return maxdam;
1445	}	1433	}
1446		1434
1447	/* Now lets start dealing with experience we get for killing something */	1435	/* Now lets start dealing with experience we get for killing something */
…		…
1491	else	1479	else
1492	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));	1480	new_draw_info_format (NDI_BLACK, 0, owner, "You killed %s.", query_name (op));
1493		1481
1494	/* Only play sounds for melee kills */	1482	/* Only play sounds for melee kills */
1495	if (hitter->type == PLAYER)	1483	if (hitter->type == PLAYER)
1496	play_sound_map (owner->map, owner->x, owner->y, SOUND_PLAYER_KILLS);	1484	owner->play_sound (sound_find ("player_kills"));
1497	}	1485	}
1498		1486
1499	/* If a player kills another player, not on	1487	/* If a player kills another player, not on
1500	* battleground, the "killer" looses 1 luck. Since this is	1488	* battleground, the "killer" looses 1 luck. Since this is
1501	* not reversible, it's actually quite a pain IMHO. -AV	1489	* not reversible, it's actually quite a pain IMHO. -AV
…		…
1506	*/	1494	*/
1507	if (op->type == PLAYER && owner != op && !battleg)	1495	if (op->type == PLAYER && owner != op && !battleg)
1508	owner->change_luck (-settings.pk_luck_penalty);	1496	owner->change_luck (-settings.pk_luck_penalty);
1509		1497
1510	/* This code below deals with finding the appropriate skill	1498	/* This code below deals with finding the appropriate skill
1511	* to credit exp to. This is a bit problematic - we should	1499	* to credit exp to. This is a bit problematic - we should
1512	* probably never really have to look at current_weapon->skill	1500	* probably never really have to look at current_weapon->skill
1513	*/	1501	*/
1514	skill = 0;	1502	skill = 0;
1515		1503
1516	if (hitter->skill && hitter->type != PLAYER)	1504	if (hitter->skill && hitter->type != PLAYER)
1517	skill = hitter->skill;	1505	skill = hitter->skill;
1518	else if (owner->chosen_skill)	1506	else if (owner->chosen_skill)
1519	{	1507	{
1520	skill = owner->chosen_skill->skill;
1521	skop = owner->chosen_skill;	1508	skop = owner->chosen_skill;
		1509	skill = skop->skill;
1522	}	1510	}
1523	else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))	1511	else if (QUERY_FLAG (owner, FLAG_READY_WEAPON))
1524	skill = owner->current_weapon->skill;	1512	skill = owner->current_weapon->skill;
1525	else	1513	else
1526	LOG (llevError, "kill_object - unable to find skill that killed monster\n");	1514	LOG (llevError, "kill_object - unable to find skill that killed monster\n");
1527		1515
1528	/* We have the skill we want to credit to - now find the object this goes	1516	/* 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!	1517	* to. Make sure skop is an actual skill, and not a skill tool!
1530	*/	1518	*/
1531	if ((!skop \|\| skop->type != SKILL) && skill)	1519	if ((!skop \|\| skop->type != SKILL) && skill)
1532	{	1520	{
1533	int i;	1521	int i;
1534		1522
…		…
1560	skill = skop->skill;	1548	skill = skop->skill;
1561		1549
1562	new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);	1550	new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf);
1563		1551
1564	/* If you didn't kill yourself, and your not the wizard */	1552	/* If you didn't kill yourself, and your not the wizard */
1565	if (owner != op && !QUERY_FLAG (op, FLAG_WAS_WIZ))	1553	if (owner != op && !QUERY_FLAG (op, FLAG_WIZ))
1566	{	1554	{
1567	int exp;	1555	int exp;
1568		1556
1569	/* Really don't give much experience for killing other players */	1557	/* Really don't give much experience for killing other players */
1570	// schmorp: temporarily? reduce the amount of exp gained for pking enourmously	1558	// schmorp: temporarily? reduce the amount of exp gained for pking enourmously
…		…
1597	if (owner->type != PLAYER \|\| owner->contr->party == NULL)	1585	if (owner->type != PLAYER \|\| owner->contr->party == NULL)
1598	change_exp (owner, exp, skill, 0);	1586	change_exp (owner, exp, skill, 0);
1599	else	1587	else
1600	{	1588	{
1601	int shares = 0, count = 0;	1589	int shares = 0, count = 0;
1602	player *pl;
1603	partylist *party = owner->contr->party;	1590	partylist *party = owner->contr->party;
1604		1591
1605	add_kill_to_party (party, query_name (owner), query_name (op), exp);	1592	add_kill_to_party (party, query_name (owner), query_name (op), exp);
1606		1593
1607	for_all_players (pl)	1594	for_all_players (pl)
…		…
1638	{	1625	{
1639	object *owner1 = op->owner;	1626	object *owner1 = op->owner;
1640		1627
1641	if (owner1 && owner1->type == PLAYER)	1628	if (owner1 && owner1->type == PLAYER)
1642	{	1629	{
1643	play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0);	1630	owner1->contr->play_sound (sound_find ("pet_is_killed"));
1644	/* Maybe we should include the owner that killed this, maybe not */	1631	/* Maybe we should include the owner that killed this, maybe not */
1645	new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);	1632	new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name);
1646	}	1633	}
1647		1634
1648	remove_friendly_object (op);	1635	remove_friendly_object (op);
…		…
1666	}	1653	}
1667		1654
1668	/* Find out if this is friendly fire (PVP and attacker is peaceful) or not	1655	/* Find out if this is friendly fire (PVP and attacker is peaceful) or not
1669	* Returns 0 this is not friendly fire	1656	* Returns 0 this is not friendly fire
1670	*/	1657	*/
1671
1672	int	1658	int
1673	friendly_fire (object op, object hitter)	1659	friendly_fire (object op, object hitter)
1674	{	1660	{
1675	object *owner;	1661	object *owner;
1676	int friendlyfire;	1662	int friendlyfire;
…		…
1695	}	1681	}
1696		1682
1697	if (hitter->type == SPELL \|\| hitter->type == POISONING \|\| hitter->type == DISEASE \|\| hitter->type == RUNE)	1683	if (hitter->type == SPELL \|\| hitter->type == POISONING \|\| hitter->type == DISEASE \|\| hitter->type == RUNE)
1698	friendlyfire = 0;	1684	friendlyfire = 0;
1699	}	1685	}
		1686
1700	return friendlyfire;	1687	return friendlyfire;
1701	}	1688	}
1702
1703		1689
1704	/* This isn't used just for players, but in fact most objects.	1690	/* This isn't used just for players, but in fact most objects.
1705	* op is the object to be hit, dam is the amount of damage, hitter	1691	* op is the object to be hit, dam is the amount of damage, hitter
1706	* is what is hitting the object, type is the attacktype, and	1692	* is what is hitting the object, type is the attacktype, and
1707	* full_hit is set if monster area does not matter.	1693	* full_hit is set if monster area does not matter.
1708	* dam is base damage - protections/vulnerabilities/slaying matches can	1694	* dam is base damage - protections/vulnerabilities/slaying matches can
1709	* modify it.	1695	* modify it.
1710	*/	1696	*/
1711
1712	/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack	1697	/* Oct 95 - altered the following slightly for MULTIPLE_GODS hack
1713	* which needs new attacktype AT_HOLYWORD to work . b.t. */	1698	* which needs new attacktype AT_HOLYWORD to work . b.t. */
1714
1715	int	1699	int
1716	hit_player (object op, int dam, object hitter, int type, int full_hit)	1700	hit_player (object op, int dam, object hitter, int type, int full_hit)
1717	{	1701	{
1718	int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);	1702	int maxdam = 0, ndam = 0, attacktype = 1, magic = (type & AT_MAGIC);
1719	int maxattacktype, attacknum;	1703	int maxattacktype, attacknum;
…		…
1727		1711
1728	/* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */	1712	/* very simple: if our target has no_damage 1 set or is wiz, we can't hurt him */
1729	if (QUERY_FLAG (op, FLAG_WIZ) \|\| QUERY_FLAG (op, FLAG_NO_DAMAGE))	1713	if (QUERY_FLAG (op, FLAG_WIZ) \|\| QUERY_FLAG (op, FLAG_NO_DAMAGE))
1730	return 0;	1714	return 0;
1731		1715
1732	#ifdef PROHIBIT_PLAYERKILL	1716	// only allow pk for hostile players
1733	if (op->type == PLAYER)	1717	if (op->type == PLAYER)
1734	{	1718	{
1735	object *owner = hitter->owner;	1719	object *owner = hitter->owner;
1736		1720
1737	if (!owner)	1721	if (!owner)
1738	owner = hitter;	1722	owner = hitter;
1739		1723
1740	if (owner->type == PLAYER && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful \|\| owner->contr->peaceful)) && op != owner)	1724	if (owner->type == PLAYER
		1725	&& (!op_on_battleground (op, 0, 0)
		1726	&& (op->contr->peaceful \|\| owner->contr->peaceful))
		1727	&& op != owner)
1741	return 0;	1728	return 0;
1742	}	1729	}
1743	#endif
1744		1730
1745	if (body_attack)	1731	if (body_attack)
1746	{	1732	{
1747	/* slow and paralyze must hit the head. But we don't want to just	1733	/* slow and paralyze must hit the head. But we don't want to just
1748	* return - we still need to process other attacks the spell still	1734	* return - we still need to process other attacks the spell still
…		…
1762	}	1748	}
1763	}	1749	}
1764		1750
1765	if (!simple_attack && op->type == DOOR)	1751	if (!simple_attack && op->type == DOOR)
1766	{	1752	{
1767	object *tmp;
1768
1769	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1753	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1770	if (tmp->type == RUNE \|\| tmp->type == TRAP)	1754	if (tmp->type == RUNE \|\| tmp->type == TRAP)
1771	{	1755	{
1772	spring_trap (tmp, hitter);	1756	spring_trap (tmp, hitter);
1773		1757
1774	if (hitter->destroyed () \|\| op->destroyed () \|\| abort_attack (op, hitter, simple_attack))	1758	if (hitter->destroyed () \|\| op->destroyed () \|\| abort_attack (op, hitter, simple_attack))
…		…
1781	if (!QUERY_FLAG (op, FLAG_ALIVE) \|\| op->stats.hp < 0)	1765	if (!QUERY_FLAG (op, FLAG_ALIVE) \|\| op->stats.hp < 0)
1782	{	1766	{
1783	/* FIXME: If a player is killed by a rune in a door, the	1767	/* FIXME: If a player is killed by a rune in a door, the
1784	* destroyed() check above doesn't return, and might get here.	1768	* destroyed() check above doesn't return, and might get here.
1785	*/	1769	*/
		1770
		1771	/* FIXME: This for example happens when a dead door is on a mover and
		1772	gets it's speed_left raised on each mover-tick.
		1773	Doors are removed in a kinda funny way by giving them speed and speed_left
		1774	and waiting for that to run out.
		1775	*/
1786	LOG (llevDebug, "victim (arch %s, name %s) already dead in " "hit_player()\n", &op->arch->name, &op->name);	1776	LOG (llevDebug, "victim %s (%d) already dead in hit_player()\n", op->debug_desc (), op->stats.hp);
1787	return 0;	1777	return 0;
1788	}	1778	}
1789		1779
1790	#ifdef ATTACK_DEBUG	1780	#ifdef ATTACK_DEBUG
1791	LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);	1781	LOG (llevDebug, "hit player: attacktype %d, dam %d\n", type, dam);
…		…
1797	* in case 0>dam>1, we try to "simulate" a float value-effect */	1787	* in case 0>dam>1, we try to "simulate" a float value-effect */
1798	dam = dam * (100 - op->resist[ATNR_MAGIC]);	1788	dam = dam * (100 - op->resist[ATNR_MAGIC]);
1799	if (dam >= 100)	1789	if (dam >= 100)
1800	dam /= 100;	1790	dam /= 100;
1801	else	1791	else
1802	dam = (dam > (rndm (0, 99))) ? 1 : 0;	1792	dam = (dam > rndm (0, 99)) ? 1 : 0;
1803	}	1793	}
1804		1794
1805	/* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map	1795	/* AT_CHAOS here is a weapon or monster. Spells are handled by hit_map
1806	* If the attacktype still has chaos, shuffle it, then clear the Chaos bit	1796	* If the attacktype still has chaos, shuffle it, then clear the Chaos bit
1807	*/	1797	*/
…		…
1823	if ((!hitter->slaying \|\|	1813	if ((!hitter->slaying \|\|
1824	(!(op->race && strstr (hitter->slaying, op->race)) &&	1814	(!(op->race && strstr (hitter->slaying, op->race)) &&
1825	!(op->name && strstr (hitter->slaying, op->name)))) &&	1815	!(op->name && strstr (hitter->slaying, op->name)))) &&
1826	(!QUERY_FLAG (op, FLAG_UNDEAD) \|\|	1816	(!QUERY_FLAG (op, FLAG_UNDEAD) \|\|
1827	(hitter->title != NULL	1817	(hitter->title != NULL
1828	&& (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, undead_name) != NULL)))	1818	&& (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL)))
1829	return 0;	1819	return 0;
1830	}	1820	}
1831		1821
1832	maxattacktype = type; /* initialise this to something */	1822	maxattacktype = type; /* initialise this to something */
1833	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)	1823	for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)
…		…
1865	*/	1855	*/
1866	friendlyfire = friendly_fire (op, hitter);	1856	friendlyfire = friendly_fire (op, hitter);
1867	if (friendlyfire && maxdam)	1857	if (friendlyfire && maxdam)
1868	{	1858	{
1869	maxdam = ((dam * settings.set_friendly_fire) / 100);	1859	maxdam = ((dam * settings.set_friendly_fire) / 100);
1870	#ifndef COZY_SERVER
1871	maxdam++;
1872	#endif
1873		1860
1874	#ifdef ATTACK_DEBUG	1861	#ifdef ATTACK_DEBUG
1875	LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",	1862	LOG (llevDebug, "Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1876	friendlyfire, settings.set_friendly_fire, dam, maxdam);	1863	friendlyfire, settings.set_friendly_fire, dam, maxdam);
1877	#endif	1864	#endif
1878	}	1865	}
1879		1866
1880	if (!full_hit)	1867	if (!full_hit)
1881	{	1868	{
1882	archetype *at;
1883	int area;	1869	int area;
1884	int remainder;	1870	int remainder;
1885		1871
1886	area = 0;	1872	area = 0;
1887	for (at = op->arch; at != NULL; at = at->more)	1873
		1874	for (archetype at = op->arch; at; at = (archetype )at->more)
1888	area++;	1875	area++;
		1876
1889	assert (area > 0);	1877	assert (area > 0);
1890		1878
1891	/* basically: maxdam /= area; we try to "simulate" a float	1879	/* basically: maxdam /= area; we try to "simulate" a float
1892	value-effect */	1880	value-effect */
1893	remainder = 100 * (maxdam % area) / area;	1881	remainder = 100 * (maxdam % area) / area;
1894	maxdam /= area;	1882	maxdam /= area;
1895	if (RANDOM () % 100 < remainder)	1883	if (rndm (100) < remainder)
1896	maxdam++;	1884	maxdam++;
1897	}	1885	}
1898		1886
1899	#ifdef ATTACK_DEBUG	1887	#ifdef ATTACK_DEBUG
1900	LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);	1888	LOG (llevDebug, "Attacktype %d did %d damage\n", type, maxdam);
1901	#endif	1889	#endif
1902		1890
		1891	// for now, only do this for active objects, otherwise they
		1892	// keep a refcount for a long time and I see no usefulness
		1893	// for an non-active objetc to know its enemy.
		1894	if (op->active)
1903	if (hitter->owner)	1895	if (hitter->owner)
1904	op->enemy = hitter->owner;	1896	op->enemy = hitter->owner;
1905	else if (QUERY_FLAG (hitter, FLAG_ALIVE))	1897	else if (QUERY_FLAG (hitter, FLAG_ALIVE))
1906	op->enemy = hitter;	1898	op->enemy = hitter;
1907		1899
1908	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)	1900	if (QUERY_FLAG (op, FLAG_UNAGGRESSIVE) && op->type != PLAYER)
1909	{	1901	{
1910	/* The unaggressives look after themselves 8) */	1902	/* The unaggressives look after themselves 8) */
1911	CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);	1903	CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
…		…
1948	/* Used to be ghosthit removal - we now use the ONE_HIT flag. Note	1940	/* Used to be ghosthit removal - we now use the ONE_HIT flag. Note
1949	* that before if the player was immune to ghosthit, the monster	1941	* that before if the player was immune to ghosthit, the monster
1950	* remained - that is no longer the case.	1942	* remained - that is no longer the case.
1951	*/	1943	*/
1952	if (QUERY_FLAG (hitter, FLAG_ONE_HIT))	1944	if (QUERY_FLAG (hitter, FLAG_ONE_HIT))
1953	{
1954	if (QUERY_FLAG (hitter, FLAG_FRIENDLY))
1955	remove_friendly_object (hitter);
1956
1957	hitter->destroy ();	1945	hitter->destroy ();
1958	}	1946
1959	/* Lets handle creatures that are splitting now */	1947	/* Lets handle creatures that are splitting now */
1960	else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))	1948	else if (type & AT_PHYSICAL && !QUERY_FLAG (op, FLAG_FREED) && QUERY_FLAG (op, FLAG_SPLITTING))
1961	{	1949	{
1962	int i;	1950	int i;
1963	int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);	1951	int friendly = QUERY_FLAG (op, FLAG_FRIENDLY);
…		…
1979		1967
1980	tmp->stats.hp = op->stats.hp;	1968	tmp->stats.hp = op->stats.hp;
1981		1969
1982	if (friendly)	1970	if (friendly)
1983	{	1971	{
1984	SET_FLAG (tmp, FLAG_FRIENDLY);
1985	add_friendly_object (tmp);	1972	add_friendly_object (tmp);
1986	tmp->attack_movement = PETMOVE;	1973	tmp->attack_movement = PETMOVE;
		1974
1987	if (owner != NULL)	1975	if (owner)
1988	tmp->set_owner (owner);	1976	tmp->set_owner (owner);
1989	}	1977	}
1990		1978
1991	if (unaggressive)	1979	if (unaggressive)
1992	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);	1980	SET_FLAG (tmp, FLAG_UNAGGRESSIVE);
…		…
2007	else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)	1995	else if (type & AT_DRAIN && hitter->type == GRIMREAPER && hitter->value++ > 10)
2008	hitter->destroy ();	1996	hitter->destroy ();
2009		1997
2010	return maxdam;	1998	return maxdam;
2011	}	1999	}
2012
2013		2000
2014	void	2001	void
2015	poison_player (object op, object hitter, int dam)	2002	poison_player (object op, object hitter, int dam)
2016	{	2003	{
2017	archetype *at = archetype::find ("poisoning");	2004	archetype *at = archetype::find ("poisoning");
…		…
2053	tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);	2040	tmp->stats.Dex = MAX (-(dam / 6 + 1), -10);
2054	tmp->stats.Int = MAX (-dam / 7, -10);	2041	tmp->stats.Int = MAX (-dam / 7, -10);
2055	SET_FLAG (tmp, FLAG_APPLIED);	2042	SET_FLAG (tmp, FLAG_APPLIED);
2056	op->update_stats ();	2043	op->update_stats ();
2057	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");	2044	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very ill.");
		2045	op->play_sound (tmp->sound);
2058	}	2046	}
		2047
2059	if (hitter->type == PLAYER)	2048	if (hitter->type == PLAYER)
2060	new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);	2049	new_draw_info_format (NDI_UNIQUE, 0, hitter, "You poison %s.", &op->name);
2061	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)	2050	else if (hitter->owner != NULL && hitter->owner->type == PLAYER)
2062	new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);	2051	new_draw_info_format (NDI_UNIQUE, 0, hitter->owner, "Your %s poisons %s.", &hitter->name, &op->name);
2063	}	2052	}
		2053
2064	tmp->speed_left = 0;	2054	tmp->speed_left = 0;
2065	}	2055	}
2066	else	2056	else
2067	tmp->stats.food++;	2057	tmp->stats.food++;
2068	}	2058	}
…		…
2072	{	2062	{
2073	archetype *at = archetype::find ("slowness");	2063	archetype *at = archetype::find ("slowness");
2074	object *tmp;	2064	object *tmp;
2075		2065
2076	if (at == NULL)	2066	if (at == NULL)
2077	{
2078	LOG (llevError, "Can't find slowness archetype.\n");	2067	LOG (llevError, "Can't find slowness archetype.\n");
2079	}	2068
2080	if ((tmp = present_arch_in_ob (at, op)) == NULL)	2069	if ((tmp = present_arch_in_ob (at, op)) == NULL)
2081	{	2070	{
2082	tmp = arch_to_object (at);	2071	tmp = arch_to_object (at);
2083	tmp = insert_ob_in_ob (tmp, op);	2072	tmp = insert_ob_in_ob (tmp, op);
2084	new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");	2073	new_draw_info (NDI_UNIQUE, 0, op, "The world suddenly moves very fast!");
2085	}	2074	}
2086	else	2075	else
2087	tmp->stats.food++;	2076	tmp->stats.food++;
		2077
2088	SET_FLAG (tmp, FLAG_APPLIED);	2078	SET_FLAG (tmp, FLAG_APPLIED);
2089	tmp->speed_left = 0;	2079	tmp->speed_left = 0;
2090	op->update_stats ();	2080	op->update_stats ();
2091	}	2081	}
2092		2082
…		…
2109	tmp->speed = 0.05;	2099	tmp->speed = 0.05;
2110	tmp->subtype = FORCE_CONFUSION;	2100	tmp->subtype = FORCE_CONFUSION;
2111	tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);	2101	tmp->duration = 8 + MAX (1, 5 * (100 - op->resist[ATNR_CONFUSION]) / 100);
2112	tmp->name = "confusion";	2102	tmp->name = "confusion";
2113	maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);	2103	maxduration = MAX (2, 30 * (100 - op->resist[ATNR_CONFUSION]) / 100);
		2104
2114	if (tmp->duration > maxduration)	2105	if (tmp->duration > maxduration)
2115	tmp->duration = maxduration;	2106	tmp->duration = maxduration;
2116		2107
2117	if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))	2108	if (op->type == PLAYER && !QUERY_FLAG (op, FLAG_CONFUSED))
2118	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");	2109	new_draw_info (NDI_UNIQUE, 0, op, "You suddenly feel very confused!");
		2110
2119	SET_FLAG (op, FLAG_CONFUSED);	2111	SET_FLAG (op, FLAG_CONFUSED);
2120	}	2112	}
2121		2113
2122	void	2114	void
2123	blind_player (object op, object hitter, int dam)	2115	blind_player (object op, object hitter, int dam)
…		…
2189	op->speed_left = (float) -(FABS (op->speed) * max);	2181	op->speed_left = (float) -(FABS (op->speed) * max);
2190		2182
2191	/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */	2183	/* tmp->stats.food = (signed short) (max/FABS(op->speed)); */
2192	}	2184	}
2193		2185
2194
2195	/* Attempts to kill 'op'. hitter is the attack object, dam is	2186	/* Attempts to kill 'op'. hitter is the attack object, dam is
2196	* the computed damaged.	2187	* the computed damaged.
2197	*/	2188	*/
2198	void	2189	void
2199	deathstrike_player (object op, object hitter, int *dam)	2190	deathstrike_player (object op, object hitter, int *dam)
…		…
2207	** field of the deathstriking object */	2198	** field of the deathstriking object */
2208		2199
2209	int atk_lev, def_lev, kill_lev;	2200	int atk_lev, def_lev, kill_lev;
2210		2201
2211	if (hitter->slaying)	2202	if (hitter->slaying)
2212	if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, undead_name)) \|\| (op->race && strstr (hitter->slaying, op->race))))	2203	if (!((QUERY_FLAG (op, FLAG_UNDEAD) && strstr (hitter->slaying, shstr_undead)) \|\| (op->race && strstr (hitter->slaying, op->race))))
2213	return;	2204	return;
2214		2205
2215	def_lev = op->level;	2206	def_lev = op->level;
2216	if (def_lev < 1)	2207	if (def_lev < 1)
2217	{	2208	{
2218	LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name);	2209	LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name);
2219	def_lev = 1;	2210	def_lev = 1;
2220	}	2211	}
		2212
2221	atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;	2213	atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2;
2222	/* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",	2214	/* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n",
2223	atk_lev, def_lev); */	2215	atk_lev, def_lev); */
2224		2216
2225	if (atk_lev >= def_lev)	2217	if (atk_lev >= def_lev)
…		…
2240	*/	2232	*/
2241	dam = kill_lev / def_lev;	2233	dam = kill_lev / def_lev;
2242	}	2234	}
2243	}	2235	}
2244	else	2236	else
2245	{
2246	dam = 0; / no harm done */	2237	dam = 0; / no harm done */
2247	}
2248	}	2238	}
2249		2239
2250	/* thrown_item_effect() - handles any special effects of thrown	2240	/* thrown_item_effect() - handles any special effects of thrown
2251	* items (like attacking living creatures--a potion thrown at a	2241	* items (like attacking living creatures--a potion thrown at a
2252	* monster).	2242	* monster).
…		…
2281	}	2271	}
2282	}	2272	}
2283	}	2273	}
2284		2274
2285	/* adj_attackroll() - adjustments to attacks by various conditions */	2275	/* adj_attackroll() - adjustments to attacks by various conditions */
2286
2287	int	2276	int
2288	adj_attackroll (object hitter, object target)	2277	adj_attackroll (object hitter, object target)
2289	{	2278	{
2290	object *attacker = hitter;	2279	object *attacker = hitter;
2291	int adjust = 0;	2280	int adjust = 0;
…		…
2356	#endif	2345	#endif
2357		2346
2358	return adjust;	2347	return adjust;
2359	}	2348	}
2360		2349
2361
2362	/* determine if the object is an 'aimed' missile */	2350	/* determine if the object is an 'aimed' missile */
2363	int	2351	int
2364	is_aimed_missile (object *op)	2352	is_aimed_missile (object *op)
2365	{	2353	{
2366		2354
2367	/* I broke what used to be one big if into a few nested	2355	/* I broke what used to be one big if into a few nested
2368	* ones so that figuring out the logic is at least possible.	2356	* ones so that figuring out the logic is at least possible.
2369	*/	2357	*/
2370	if (op && (op->move_type & MOVE_FLYING))	2358	if (op && (op->move_type & MOVE_FLYING))
2371	{
2372	if (op->type == ARROW \|\| op->type == THROWN_OBJ)	2359	if (op->type == ARROW \|\| op->type == THROWN_OBJ)
2373	return 1;	2360	return 1;
2374	else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET \|\| op->subtype == SP_EXPLOSION))	2361	else if (op->type == SPELL_EFFECT && (op->subtype == SP_BULLET \|\| op->subtype == SP_EXPLOSION))
2375	return 1;	2362	return 1;
2376	}	2363
2377	return 0;	2364	return 0;
2378	}	2365	}

Diff Legend

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

Comparing deliantra/server/server/attack.C (file contents): Revision 1.36 by pippijn, Wed Jan 3 00:21:36 2007 UTC vs. Revision 1.75 by root, Mon Aug 27 05:10:51 2007 UTC

Diff Legend

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.36 by pippijn, Wed Jan 3 00:21:36 2007 UTC vs.
Revision 1.75 by root, Mon Aug 27 05:10:51 2007 UTC